From c38e9d31693f3436a0e5f305daa1075f33ae4b7a Mon Sep 17 00:00:00 2001 From: qyt <123456> Date: Mon, 14 Oct 2024 12:00:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=A7=BB=E6=A4=8D=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E6=98=BE=E7=A4=BA=E5=92=8C=E6=8E=A5=E5=8F=A3=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98=20=E5=92=8C=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=88=E7=9B=AE=E5=89=8D=E6=98=AF=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E6=A0=B7=E5=BC=8F=E5=B0=8F=E4=BA=86=E3=80=81=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=9C=AA=E5=B1=85=E4=B8=AD=E6=9C=AA=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/daping/home/center-map.vue | 56 ++++++++++---------- src/views/daping/hosp2/corpItem.vue | 4 +- src/views/daping/hosp2/corpTypeItem.vue | 4 +- src/views/daping/hosp2/dialogCorpProduct.vue | 6 ++- src/views/daping/hosp2/fuMaItem.vue | 4 +- src/views/daping/hosp2/index.vue | 4 +- src/views/daping/hosp2/jiCaiItem.vue | 4 +- src/views/daping/hosp2/jinKouItem.vue | 4 +- src/views/daping/hosp2/pinZhongItem.vue | 4 +- src/views/daping/hosp2/qiXieItem.vue | 4 +- src/views/daping/hosp2/right-top.vue | 4 +- src/views/daping/hosp2/yiBaoItem.vue | 4 +- src/views/daping/inout/center-bottom.vue | 4 +- src/views/daping/inout/center-top.vue | 4 +- src/views/daping/inout/dialogInoutInfo.vue | 6 ++- src/views/daping/inout/index.vue | 6 ++- src/views/daping/inout/left-bottom.vue | 4 +- src/views/daping/inout/left-top.vue | 4 +- src/views/daping/inout/right-bottom.vue | 4 +- src/views/daping/inout/right-full.vue | 4 +- src/views/daping/inout/right-top.vue | 5 +- src/views/daping/inout/right-top1.vue | 4 +- src/views/daping/inout/right-top2.vue | 4 +- src/views/daping/inout/right-top3.vue | 4 +- src/views/daping/inout/right-top4.vue | 4 +- src/views/daping/inout/right-ttop.vue | 6 ++- src/views/daping/manu/center-bottom.vue | 2 +- src/views/daping/manu/dialogCorpProduct.vue | 6 ++- src/views/daping/manu/dialogWarnInfo.vue | 2 +- src/views/daping/manu/jiCaiItem.vue | 2 +- src/views/daping/manu/left-bottom.vue | 2 +- src/views/daping/manu/right-bottom.vue | 2 +- src/views/daping/manu/right-top.vue | 2 +- src/views/daping/manu/yiBaoItem.vue | 2 +- src/views/daping/mapIndex.vue | 16 +++++- src/views/daping/product/center-bottom.vue | 4 +- src/views/daping/product/center-top.vue | 4 +- src/views/daping/product/left-bottom.vue | 6 ++- src/views/daping/product/left-top.vue | 6 ++- src/views/daping/product/left-tt.vue | 4 +- src/views/daping/product/right-bottom.vue | 6 ++- src/views/daping/product/right-top.vue | 4 +- src/views/daping/product/right-top1.vue | 4 +- src/views/daping/product/right-top2.vue | 4 +- src/views/daping/product/right-top3.vue | 4 +- src/views/daping/product/right-top4.vue | 4 +- src/views/daping/product/top1.vue | 2 +- src/views/daping/product/traceIndex.vue | 8 ++- src/views/daping/sup3/corpItem.vue | 4 ++ src/views/daping/sup3/dialogCorpProduct.vue | 7 ++- src/views/daping/sup3/fuMaItem.vue | 7 ++- src/views/daping/sup3/index.vue | 7 ++- src/views/daping/sup3/jiCaiItem.vue | 5 +- src/views/daping/sup3/jinKouItem.vue | 2 +- src/views/daping/sup3/pinZhongItem.vue | 5 +- src/views/daping/sup3/qiXieItem.vue | 4 +- src/views/daping/sup3/right-top.vue | 7 ++- src/views/daping/sup3/yiBaoItem.vue | 5 +- src/views/daping/trace/dialogAdverseMsg.vue | 4 +- src/views/daping/trace/traceIndex.vue | 4 ++ src/views/daping/trace/traceMap.vue | 2 + src/views/daping/warn2/center-bottom.vue | 4 +- src/views/daping/warn2/center-top.vue | 4 +- src/views/daping/warn2/checkCorpItem.vue | 4 +- src/views/daping/warn2/checkProductItem.vue | 4 +- src/views/daping/warn2/corpTypeItem.vue | 4 +- src/views/daping/warn2/dialogCorpProduct.vue | 4 +- src/views/daping/warn2/jiCaiItem.vue | 4 +- src/views/daping/warn2/jinKouItem.vue | 4 +- src/views/daping/warn2/jinkou.vue | 4 +- src/views/daping/warn2/left-bottom.vue | 4 +- src/views/daping/warn2/left-top.vue | 4 +- src/views/daping/warn2/left-top2.vue | 4 +- src/views/daping/warn2/right-bottom.vue | 4 +- src/views/daping/warn2/right-top.vue | 4 +- src/views/daping/warn2/yiBaoItem.vue | 4 +- 76 files changed, 275 insertions(+), 109 deletions(-) diff --git a/src/views/daping/home/center-map.vue b/src/views/daping/home/center-map.vue index 8c4a3a6..908df10 100644 --- a/src/views/daping/home/center-map.vue +++ b/src/views/daping/home/center-map.vue @@ -32,21 +32,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -148,7 +148,6 @@ export default { }, methods: { getData(code) { - console.log("地图中间部分请求") if (code == "350000") this.curLoaction = "福建省" currentGET("big8", {regionCode: code}).then((res) => { @@ -169,21 +168,22 @@ export default { * @return {*} */ async getGeojson(name, mydata) { - // console.log("开始搜索地图楼{}",mydata) - console.log("开始搜索地图楼{}",name) this.regionCode = name; //如果要展示南海群岛并且展示的是中国的话 let geoname = name if (this.isSouthChinaSea && name == "china") { geoname = "chinaNanhai"; } - console.log('11', echarts.getMap(name)) //如果有注册地图的话就不用再注册 了 let mapjson = echarts.getMap(name); + if (mapjson) { + console.log('1111') + mapjson = mapjson.geoJSON; } else { mapjson = await GETNOBASE(`./map-geojson/${geoname}.json`).then((res) => { + res = res.data console.log("获取地图的信息{}",res) return res; }); @@ -191,11 +191,13 @@ export default { } let cityCenter = {}; let arr = mapjson.features; + console.log('mapjson===',mapjson) + //根据geojson获取省份中心点 - // arr.map((item) => { - // cityCenter[item.properties.name] = - // item.properties.centroid || item.properties.center; - // }); + arr.map((item) => { + cityCenter[item.properties.name] = + item.properties.centroid || item.properties.center; + }); let newData = []; mydata.map((item) => { if (cityCenter[item.cityName]) { @@ -452,10 +454,10 @@ export default { font-weight: 900; letter-spacing: 6px; background: linear-gradient( - 92deg, - #0072ff 0%, - #00eaff 48.8525390625%, - #01aaff 100% + 92deg, + #0072ff 0%, + #00eaff 48.8525390625%, + #01aaff 100% ); -webkit-background-clip: text; -webkit-text-fill-color: transparent; diff --git a/src/views/daping/hosp2/corpItem.vue b/src/views/daping/hosp2/corpItem.vue index 3cea966..e0a3e9f 100644 --- a/src/views/daping/hosp2/corpItem.vue +++ b/src/views/daping/hosp2/corpItem.vue @@ -55,7 +55,7 @@