From 36a6a97f35541735c1137ac33b8618668a806aed Mon Sep 17 00:00:00 2001 From: yaoyuhao Date: Tue, 12 Nov 2024 09:06:38 +0800 Subject: [PATCH 1/4] 1 --- src/components/header.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/header.vue b/src/components/header.vue index 8bdcfcf..8736ec8 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -109,7 +109,9 @@ const to = (url) => { }); if (url == "/home/index/map") { let menu = tools.data.get("menu"); - if(menu && menu.indexOf('ggfw:ystp') != -1){ + if(!menu || menu.indexOf('ggfw:ystp') == -1){ + + }else{ data.nowTab = url; data.menushow = false; } From 559a343ad77854214f5527babc590c47f9a64156 Mon Sep 17 00:00:00 2001 From: yaoyuhao Date: Tue, 12 Nov 2024 13:04:30 +0800 Subject: [PATCH 2/4] gx --- src/assets/images/map/bmfwzx_map.png | Bin 0 -> 5397 bytes src/assets/images/map/j8_map.png | Bin 0 -> 2547 bytes src/router/index.js | 20 ++++-- src/utils/request.js | 2 +- src/view/img_map/map.js | 4 ++ src/view/sy_map.vue | 98 ++++++++++++++------------- 6 files changed, 70 insertions(+), 54 deletions(-) create mode 100644 src/assets/images/map/bmfwzx_map.png create mode 100644 src/assets/images/map/j8_map.png diff --git a/src/assets/images/map/bmfwzx_map.png b/src/assets/images/map/bmfwzx_map.png new file mode 100644 index 0000000000000000000000000000000000000000..ba16146a997df8cd2843f612cf33973b47cbe5ec GIT binary patch literal 5397 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 literal 0 HcmV?d00001 diff --git a/src/assets/images/map/j8_map.png b/src/assets/images/map/j8_map.png new file mode 100644 index 0000000000000000000000000000000000000000..a246033aa619ddd91e3a527ae8f9bedfecdb9b7e GIT binary patch literal 2547 zcmXw42{@E%8`iN#WXW<7F(m#{*(#JUGsc=NVlp(A>`pagChFM7Ok~ZLeTjw=#yYZ| z4pFuo%R!bDT108zVV5esi(5xQJ$L?d}6I7Em#OX8Bk^MguAuFf1R#-m;7pH;((YW+BmJ zFrom40!T8TSaugMDgOumk3t4?G#LN;)|ARdI+wFq-j!?^i^VQS2ID9&xeGVyz#P8!88Ga8^AIN&L;qo0Ui(8V5{U`YriL8ox%>RazY*WRKT?w@T~-I zR>DVMmkwqL;9kmB$kN6-KvtW1f3ZJM)ezJS!^k4Md82>=&E6C`C#5TCy z0E=r-)(hF)>>f#Us2PDjnjoqUyh>nh1tvej#4?O7!q9uj>x0;4AT8G zUa;f%sV;iRL`PZZx}Viigflwuyv$FpQ<4YV@UBh{7Djr<#koE9MuY|1Dagv~u6F0& zCkMK^XgLe+eA`@I`MkU^H#S&NQka{VK#jVJb+WY3Q+ZmPa{J2ho$uS*Tc1CDcsDyU zI?~zR+}KcEMZV?li?=gS>+i3+DYia9=iuOZX^Jwu=-Bls?XtOy;eqf)*LB>QLl4rx z+D7E|Fh4adUE)^RVEXVapFW-%{~E5ECVz=h;UTO$eM40H;#=`L?mAzvAINgQslo7z zuTT7O=4Fl!p&yfi^Mq}^Y;q{MIlrNSPCw6-`ydVarF=M6z0nJ?eg z%fgZmYy4=HK7NV#HA=(lsmn3uLNu=e>3ekr{0-#`h_&& z1M}$~ z+*pm|qAciA)6Ze~YBn88bKCxZ5;l)Ggdz?2LWnP8HSe~o-bJCQx~xzrd{HIBnw z3KoxerHK9e?|{|A_Q&V_Ocx2l^chbk5ut$cyQV9Gz=m; zBfh%zsetI?{JTaZ(?{ZS*c8lngPt;OF-!J ze0gzPP>n|bFYk+#$3{=r@NvmtFPBl)Kh=B=XYM>4$07r@FWWk%z`bkZGBd zvx@zp6HV$|R9x@gLfMaBgiE^xLzh&?wB^@xq_9_xNE?-PjqUhba_e5>*3QKC{T+tT zbd~jq$MSTf#+1i=WtwJNO$E(yBaA!3(nXrJBFme7)wksP)Y3C#>-Y}Bjj_;hsp&OR zI$5$!arvNRKpf+Bi}3k0{nv5|5rzNBDpj8G+N>I{mCRqEY#zN9}} z3BNemY9zDZ+qIjE7qp%74ZPV|hZ`H^PoljEBKV9dAgi+~2%K3o!AqUjWm}v_%8i6d zW4nZA1z*-Xh)jcciINy4lIKc&sY=>}aE8mZ`3Yld)=DdUyYDWX3VE zR4sMIM8CI<)`M!}a`#AS7F=~V%C5ZprarEnE6dY5;5fG+A)cx<|F$q;Nc;O5!Gr8` zRVOBqxA_T;hPNn-9)IE|rjaYn6E?iDXH%fNcX&|l_VM7Lh-YfC*i2ipAzHh~ylRY@ z;VGnE$!R&Tn4%Lo_RY8s!O+|R=q&!}(PF^D|d(EctWtr_wD#e{fr3tjH_pZ?8L fdbof7nCEqMkwp1!mOf_vTRBY87f?@(u0;M9wHHF3 literal 0 HcmV?d00001 diff --git a/src/router/index.js b/src/router/index.js index 608bcf6..9b8913c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -140,6 +140,7 @@ const router = createRouter({ router.beforeEach((to, form, next) => { let menu = tools.data.get("menu"); + let token = tools.data.get("token"); // var token = getCookie('lytoken') // // console.log('token', token) // if (token == '') { @@ -161,16 +162,21 @@ router.beforeEach((to, form, next) => { // next(); // } // console.log(55555, to.fullPath); - if (to.fullPath == '/home/index/map' ) { - if(!menu || menu.indexOf('ggfw:ystp') == -1){ - ElMessage.error("您无权限访问该模块，若有需求请联系大数据中心！"); - }else{ + if (!token) { + next(); + } else { + if (to.fullPath == '/home/index/map') { + if (!menu || menu.indexOf('ggfw:ystp') == -1) { + ElMessage.error("您无权限访问该模块，若有需求请联系大数据中心！"); + } else { + next(); + } + } else { next(); } - } else { - next(); } - + + // next(); }); diff --git a/src/utils/request.js b/src/utils/request.js index 02a9252..ab56c12 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -2,7 +2,7 @@ import axios from "axios"; import { ElMessage } from "element-plus"; import tools from "@/utils/tools"; import router from "../router"; -axios.defaults.baseURL = 'https://jzzf.longyou.gov.cn:998/' +// axios.defaults.baseURL = 'https://jzzf.longyou.gov.cn:998/' axios.defaults.timeout = 120000; // HTTP request 拦截器 diff --git a/src/view/img_map/map.js b/src/view/img_map/map.js index a62d7b5..d0c7e88 100644 --- a/src/view/img_map/map.js +++ b/src/view/img_map/map.js @@ -2,6 +2,7 @@ import zcd from "@/assets/images/map/zcd.png"; import dqfwzx from "@/assets/images/map/dqfwzx.png"; import bxjsf from "@/assets/images/map/bxjsf.png"; import bmfwzx from "@/assets/images/map/bmfwzx.png"; +import bmfwzx_map from "@/assets/images/map/bmfwzx_map.png"; import csc from "@/assets/images/map/csc.png"; import tcc from "@/assets/images/map/tcc.png"; import lnhds from "@/assets/images/map/lnhds.png"; @@ -35,6 +36,7 @@ import j3_map from "@/assets/images/map/j3_map.png"; import j4_map from "@/assets/images/map/j4_map.png"; import j5_map from "@/assets/images/map/j5_map.png"; import j7_map from "@/assets/images/map/j7_map.png"; +import j8_map from "@/assets/images/map/j8_map.png"; import j9_map from "@/assets/images/map/j9_map.png"; import j10_map from "@/assets/images/map/j10_map.png"; import j11_map from "@/assets/images/map/j11_map.png"; @@ -74,9 +76,11 @@ export { j4_map, j5_map, j7_map, + j8_map, j9_map, j10_map, j11_map, xqwy_map, cjrzj_map, + bmfwzx_map, } \ No newline at end of file diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue index 13375ee..d887291 100644 --- a/src/view/sy_map.vue +++ b/src/view/sy_map.vue @@ -125,7 +125,7 @@ wz: item.wz == true, Tsactive: !item.click, }" - @click="item.click ? changeys(item.name) : ''" + @click="item.click ? changeys(item.name,item.img_width) : ''" :key="index" > { yaosuIcon.value[name].sj.forEach((item, index) => { map.removeOverlay(item.overlay); }); - yaosuIcon.value[name]={} + yaosuIcon.value[name] = {}; }); zyys_dk.value.forEach((item, index) => { @@ -3181,7 +3192,7 @@ const changeRs = (id) => { //----------资源要素------------ const zyys_choose_cs = ref(""); -const changeys = (name) => { +const changeys = (name,img_width) => { if (yaosuList.value.includes(name)) { yaosuList.value = yaosuList.value.filter((ch) => ch !== name); if (yaosuIcon.value[name]) { @@ -3226,20 +3237,22 @@ const changeys = (name) => { name == "高中" || name == "医院" || name == "卫生服务中心" || - name == "残疾人之家" + name == "残疾人之家" || + name == "汽车充电桩" || + name == "便民服务中心" ) { - getZyys(url, name, img, img_map, tooltip); + getZyys(url, name, img, img_map, tooltip,img_width); } else if (name == "养老机构") { - getZyys2(name, img, img_map, tooltip); + getZyys2(name, img, img_map, tooltip,img_width); } else if (name == "小区物业") { - getZyys3(url, name, img, img_map, tooltip); + getZyys3(url, name, img, img_map, tooltip,img_width); } else { loadingss.value = false; } } }; //线上接口资源要素 -const getZyys = (url, name, img, img_map, tooltip) => { +const getZyys = (url, name, img, img_map, tooltip,img_width) => { http.get(url).then((res) => { if (res.code == 200) { yaosuIcon.value[name] = {}; @@ -3270,14 +3283,14 @@ const getZyys = (url, name, img, img_map, tooltip) => { // }; }); yaosuIcon.value[name].sj.forEach((itemm, indexx) => { - createZyys(itemm, indexx, name, tooltip); + createZyys(itemm, indexx, name, tooltip,img_width); }); } loadingss.value = false; }); }; //本地存储资源要素 -const getZyys2 = (name, img, img_map, tooltip) => { +const getZyys2 = (name, img, img_map, tooltip,img_width) => { if (name == "养老机构") { yaosuIcon.value[name] = {}; yaosuIcon.value[name]["sj"] = []; @@ -3288,13 +3301,13 @@ const getZyys2 = (name, img, img_map, tooltip) => { item.overlay = null; }); yaosuIcon.value[name].sj.forEach((itemm, indexx) => { - createZyys(itemm, indexx, name, tooltip); + createZyys(itemm, indexx, name, tooltip,img_width); }); loadingss.value = false; } }; //线上接口资源要素(无坐标，需自己匹配) -const getZyys3 = (url, name, img, img_map, tooltip) => { +const getZyys3 = (url, name, img, img_map, tooltip,img_width) => { http.get(url).then((res) => { if (res.code == 200) { let zyys_jd = []; @@ -3303,9 +3316,9 @@ const getZyys3 = (url, name, img, img_map, tooltip) => { zyys_jd.push(itemN.ssjd); } }); - zyys_total_center[name]=[]; + zyys_total_center[name] = []; zyys_jd.forEach((item) => { - loadCs_zyys2(item,name); + loadCs_zyys2(item, name); }); yaosuIcon.value[name] = {}; yaosuIcon.value[name]["sj"] = []; @@ -3322,14 +3335,14 @@ const getZyys3 = (url, name, img, img_map, tooltip) => { }); }); yaosuIcon.value[name].sj.forEach((itemm, indexx) => { - createZyys(itemm, indexx, name, tooltip); + createZyys(itemm, indexx, name, tooltip,img_width); }); } loadingss.value = false; }); }; // 添加资源要素的图标(overlay存放标记点) -const createZyys = (polygon, indexx, name, tooltip) => { +const createZyys = (polygon, indexx, name, tooltip,img_width) => { let properties_change = {}; if (name == "小区物业") { properties_change = { @@ -3400,8 +3413,8 @@ const createZyys = (polygon, indexx, name, tooltip) => { title.appendChild(document.createTextNode(this.properties.title)); content.appendChild(title); } - if(name=='残疾人之家'){ - img2.style.width = "24px"; + if (img_width) { + img2.style.width = `${img_width}px`; } img2.src = this.properties.imgSrc2; // 添加 title 属性作为简单的文字提示 @@ -3440,7 +3453,7 @@ const createZyys = (polygon, indexx, name, tooltip) => { break; case "汽车充电桩": break; - case "残疾人之家": + case "残疾人之家": break; case "小区物业": console.log(polygon); @@ -3463,7 +3476,7 @@ const createZyys = (polygon, indexx, name, tooltip) => { } else { zyys_total_center[name] = []; zyys_total_dk[name] = []; - await get_dk_zyys(polygon.fgfwrs, polygon.lb, polygon.ssly,name); + await get_dk_zyys(polygon.fgfwrs, polygon.lb, polygon.ssly, name); xr_dk_center_zyys(); } @@ -3500,17 +3513,17 @@ const zyys_data = ref({ // const zyysCenter = reactive([]); // const zyysDk = reactive([]); //存放资源要素要匹配的地块中心点和地块，通过name来分类 -const zyys_total_center=reactive({}) -const zyys_total_dk=reactive({}) +const zyys_total_center = reactive({}); +const zyys_total_dk = reactive({}); //小学，初中等 -const loadCs_zyys = async (jdname,name) => { +const loadCs_zyys = async (jdname, name) => { cssj.forEach((item, index) => { if (item.name == jdname) { csqk.value = item.sj; } }); - console.log(zyys_total_dk[name],typeof zyys_total_dk[name]); - + console.log(zyys_total_dk[name], typeof zyys_total_dk[name]); + for (let v of csqk.value.features) { if (v.geometry.coordinates.length > 1) { // for (let w in v.geometry.coordinates) { @@ -3542,7 +3555,7 @@ const loadCs_zyys = async (jdname,name) => { } }; //小区物业等 -const loadCs_zyys2 = async (jdname,name) => { +const loadCs_zyys2 = async (jdname, name) => { cssj.forEach((item, index) => { if (item.name == jdname) { csqk.value = item.sj; @@ -3562,7 +3575,7 @@ const loadCs_zyys2 = async (jdname,name) => { } } }; -const get_dk_zyys = async (sj, xd, ssly,name) => { +const get_dk_zyys = async (sj, xd, ssly, name) => { zyys_dk.value.length = 0; zyys_center.value.length = 0; zyys_data.value.point.length = 0; @@ -3573,10 +3586,10 @@ const get_dk_zyys = async (sj, xd, ssly,name) => { zyys_jd.push(itemN.town); } }); - zyys_total_dk[name]= []; - zyys_total_center[name]=[] + zyys_total_dk[name] = []; + zyys_total_center[name] = []; zyys_jd.forEach((item) => { - loadCs_zyys(item,name); + loadCs_zyys(item, name); }); // zyysDk.forEach((dk) => { // let pdK = true; //判断sj有没有对应地块，没有就赋值0 @@ -4610,13 +4623,6 @@ const addPolygonCounty = () => { map.addOverlay(polygon); polygon.addEventListener("click", async () => { - // if (cfJd.value == "湖镇镇" && item.name == "模环乡") { - // if (isclick.value=='') { - // return; - // } else { - - // } - // } if (showEdit.value) { return; } From cb9ea999ab8f8b74ca90685f9fc7f95d68f22457 Mon Sep 17 00:00:00 2001 From: yaoyuhao Date: Tue, 12 Nov 2024 14:31:20 +0800 Subject: [PATCH 3/4] 1 --- src/router/index.js | 2 ++ src/view/sy_map.vue | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/router/index.js b/src/router/index.js index 9b8913c..6a07ba0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -162,10 +162,12 @@ router.beforeEach((to, form, next) => { // next(); // } // console.log(55555, to.fullPath); + //没有token直接放行 if (!token) { next(); } else { if (to.fullPath == '/home/index/map') { + //当未重新登录时，menu为空或没有权限标识，无法访问， if (!menu || menu.indexOf('ggfw:ystp') == -1) { ElMessage.error("您无权限访问该模块，若有需求请联系大数据中心！"); } else { diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue index d887291..340c7a3 100644 --- a/src/view/sy_map.vue +++ b/src/view/sy_map.vue @@ -3455,6 +3455,10 @@ const createZyys = (polygon, indexx, name, tooltip,img_width) => { break; case "残疾人之家": break; + case "便民服务中心": + break; + case "残疾人之家": + break; case "小区物业": console.log(polygon); open_detail_zyys_xqwy(polygon.ssjd, polygon.sssq); From a5e613a8f3d6d4cb9feb432cf58d884e71e63a09 Mon Sep 17 00:00:00 2001 From: yaoyuhao Date: Tue, 12 Nov 2024 16:50:20 +0800 Subject: [PATCH 4/4] gx --- src/router/index.js | 2 +- src/view/sy_details.vue | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 6a07ba0..6422bec 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -167,7 +167,7 @@ router.beforeEach((to, form, next) => { next(); } else { if (to.fullPath == '/home/index/map') { - //当未重新登录时，menu为空或没有权限标识，无法访问， + //当未重新登录时，menu为空，或没有权限标识，无法访问， if (!menu || menu.indexOf('ggfw:ystp') == -1) { ElMessage.error("您无权限访问该模块，若有需求请联系大数据中心！"); } else { diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue index f7710b0..6ed50f9 100644 --- a/src/view/sy_details.vue +++ b/src/view/sy_details.vue @@ -37,6 +37,7 @@ :prop="item.property" :show-overflow-tooltip="item.tooltip" :width="item.width || ''" + :align="item.align || 'left'" > @@ -104,6 +106,7 @@ :label="item.label" :width="item.width || ''" :prop="item.property" + :align="item.align || 'left'" /> @@ -228,6 +231,7 @@ :width="item.width || ''" :prop="item.property" :show-overflow-tooltip="item.tooltip" + :align="item.align || 'left'" /> @@ -318,7 +322,8 @@ const data = reactive({ { label: "姓名", property: "xm", - width: "90", + width: "100", + align: "center", }, { label: "地址", @@ -329,6 +334,7 @@ const data = reactive({ label: "年龄", property: "nl", width: "80", + align: "center", }, { label: "人口标签", @@ -364,8 +370,9 @@ const data = reactive({ { label: "姓名", property: "xm", - width: "90", + width: "100", type: "slot", + align: "center", }, { label: "状态", @@ -383,6 +390,7 @@ const data = reactive({ label: "年龄", property: "nl", width: "80", + align: "center", }, { label: "人口标签", @@ -467,7 +475,8 @@ const lampScreen = (val) => { { label: "姓名", property: "xm", - width: "90", + width: "100", + align: "center", type: "slot", }, { @@ -485,6 +494,7 @@ const lampScreen = (val) => { { label: "年龄", property: "nl", + align: "center", width: "80", }, { @@ -496,6 +506,8 @@ const lampScreen = (val) => { label: "推送次数", property: "pushSendTotal", type: "slot", + width: "80", + align: "center", }, ]; } else { @@ -503,7 +515,8 @@ const lampScreen = (val) => { { label: "姓名", property: "xm", - width: "90", + width: "100", + align: "center", type: "slot", }, { @@ -521,6 +534,7 @@ const lampScreen = (val) => { { label: "年龄", property: "nl", + align: "center", width: "80", }, {