diff --git a/dist.zip b/dist.zip deleted file mode 100644 index afc2dea..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/view/echart_analyze/PieMt2.vue b/src/view/echart_analyze/PieMt2.vue index 8770c4e..b4593bd 100644 --- a/src/view/echart_analyze/PieMt2.vue +++ b/src/view/echart_analyze/PieMt2.vue @@ -50,9 +50,8 @@ data.list.forEach((item) => { legendData.push(item.name); }); data.list.push({ - name: "总数", + name: "", value: sum, - tooltip: { formatter: () => "" }, itemStyle: { normal: { color: "rgba(0, 0, 0, 0)" } }, }); const colorList = [ @@ -149,9 +148,9 @@ const getOption = () => { var arr = [ "{a|" + params + "}", "{b|" +num + "人}", - "{c|" + value + "% }", + "{c|" + value + "%}", ]; - if (params == "总数") { + if (params == "") { return '' }else{ return arr.join(" "); diff --git a/src/view/echart_analyze/pieMt.vue b/src/view/echart_analyze/pieMt.vue index dcaae6d..b208336 100644 --- a/src/view/echart_analyze/pieMt.vue +++ b/src/view/echart_analyze/pieMt.vue @@ -59,9 +59,8 @@ data.list.forEach((item) => { legendData.push(item.name); }); data.list.push({ - name: "总数", + name: "", value: sum, - tooltip: { formatter: () => "" }, itemStyle: { normal: { color: "rgba(0, 0, 0, 0)" } }, }); const colorList = [ @@ -113,7 +112,8 @@ const getOption = () => { value = data.list[i].value; } } - if (params == "总数") { + if (params == "") { + return '' } else { return `${params};${value}%`; } diff --git a/src/view/guide.vue b/src/view/guide.vue index 9c76dd4..eaab711 100644 --- a/src/view/guide.vue +++ b/src/view/guide.vue @@ -142,7 +142,7 @@ const login = () => { // console.log( 555,res, auth__code); if (res.auth_code) { http - .post(`/api/ggfwyth/ding/one_click_login?authCode=${res.auth_code}`) + .post(`/api/ggfwyth/ding/one_click_login/${res.auth_code}`) .then((response) => { if (response.code == 200) { console.log("response", response); diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue index 9d2a51e..983efdd 100644 --- a/src/view/sy_map.vue +++ b/src/view/sy_map.vue @@ -1076,10 +1076,14 @@ const pagination = reactive({ //地图初始化 const initMap = () => { map = new BMapGL.Map("map", { minZoom: 8, maxZoom: 20 }); - map.setMapType(BMAP_SATELLITE_MAP); + let type = tools.data.get("type"); + if(type==1){ + + }else{ + map.setMapType(BMAP_SATELLITE_MAP); + } map.enableScrollWheelZoom(true); goMapCenter([119.178783, 29.034583], 11); - //加载乡镇信息 loadTown(); //渲染地块 @@ -2534,13 +2538,13 @@ const getDataBqs3 = async (jd, cs, bq) => { }); }); - cs_dd_arr.value = [...xuanzhongCs.value]; + // cs_dd_arr.value = [...xuanzhongCs.value]; if (choose.value.person == "") { cs_dd_arr.value.map((item, index) => { DGcreateCs(item, index); }); } else { - console.log(cs_dd_arr.value); + console.log(666666,cs_dd_arr.value); cs_dd_arr.value.map((item, index) => { DGcreateCs2(item, index); }); @@ -3624,6 +3628,7 @@ const addPolygonCounty = () => { // townName.value = item.name; if (item.name == cfJd.value) { } else { + console.log('街道1'); loadingss.value = true; clear(); xkzDk.length = 0; @@ -3638,16 +3643,20 @@ const addPolygonCounty = () => { } }); goMapCenter(jdCenter, 13); + console.log('街道2'); await getDataBq(cfJd.value, ""); if (choose.value.person == "") { + console.log('街道3'); await getDatas(cfJd.value, ""); loadingss.value = false; } if (tsbq_pp.value.includes(choose.value.person)) { + console.log('街道4'); await getDatas(cfJd.value, "", false); //使用await把loading放外面,没效果,所以把loading放接口里面 getDataBqs4(cfJd.value, cfCs.value, choose.value.person); } else if (choose.value.person != "") { + console.log('街道5'); if (choose.value.person == "9999") { await getDatas(cfJd.value, ""); loadingss.value = false; @@ -3658,7 +3667,12 @@ const addPolygonCounty = () => { } if (title_jd.value == item.name) { } else { - title_jd.value = item.name; + console.log('街道6'); + setTimeout(() => { + console.log('街道7'); + title_jd.value = item.name; + },1000) + } } }); @@ -3864,15 +3878,15 @@ const addPolygonCountyCs = () => { }); map.addOverlay(cs_qk_arr.value[index]); cs_qk_arr.value[index].addEventListener("click", async () => { - // if(item.name == '士元村' || item.name == '茶场新村' || item.name == '前江新村' || item.name=='虎龙村' || item.name=='白马村' || item.name=='凤基坤村'){ - // isclick.value=item.name; - // }else{ - // isclick.value=item.name; - // } - + console.log('村社1'); if (drawing.value) { return; } + if(!title_jd.value){ + console.log('村社2'); + return + } + console.log('村社3'); loadingss.value = true; cs_dd_arr.value = []; xuanzhongCs.value = [];