diff --git a/src/components/Map/popup.vue b/src/components/Map/popup.vue index e12e1c2..2ed0f7d 100644 --- a/src/components/Map/popup.vue +++ b/src/components/Map/popup.vue @@ -3,7 +3,7 @@
- {{ AllData.dataList.name }} + {{ AllData.dataList.roadName }}
@@ -31,10 +31,9 @@ }); //街景弹框点击事件 const showStreetLayer = () => { - let dataList = {}; - dataList.RefName = "zhoubianjiejing"; - dataList.NoPromise = true; - dataList.Getmenuarr = [ + AllData.dataList.RefName = "zhoubianjiejing"; + AllData.dataList.NoPromise = true; + AllData.dataList.Getmenuarr = [ { menuName: "周边全景", moduleName: "zhoubianjiejing", @@ -43,8 +42,8 @@ show: true, }, ]; - dataList.comIDs = ["zhoubianjiejing"]; - bus.emit("DynamicBus", dataList); + AllData.dataList.comIDs = ["zhoubianjiejing"]; + bus.emit("DynamicBus", AllData.dataList); }; onMounted(() => { bus.on("popupcontent", (params) => { @@ -54,22 +53,24 @@ if (params.popupInfo.type == "paishuiSupervise") { AllData.popupShow = false; let data = { - title:'水位计:'+ params.popupInfo.name, - comIDs: ["JC_dialog",'JC_oldList'], + title: "水位计:" + params.popupInfo.name, + comIDs: ["JC_dialog", "JC_oldList"], SiteNo: params.popupInfo.siteNo, }; bus.emit("publicDialog", data); - return + return; } AllData.streetPosition = params.point; AllData.dataList = params.popupInfo; let pipePopupDiv = document.getElementById("cesiumPopupID"); - let popupCenter, center, offsets = null; + let popupCenter, + center, + offsets = null; if (AllData.dataList.geometry) { if (AllData.dataList.geometry.includes("LINESTRING")) { popupCenter = turf.center( - turf.feature(Terraformer.WKT.parse(AllData.dataList.geometry)) + turf.feature(Terraformer.WKT.parse(AllData.dataList.geometry)) ).geometry.coordinates; } else { popupCenter = Terraformer.WKT.parse(AllData.dataList.geometry).coordinates; diff --git a/src/components/Map/popup.vue b/src/components/Map/popup.vue index e12e1c2..2ed0f7d 100644 --- a/src/components/Map/popup.vue +++ b/src/components/Map/popup.vue @@ -3,7 +3,7 @@
- {{ AllData.dataList.name }} + {{ AllData.dataList.roadName }}
@@ -31,10 +31,9 @@ }); //街景弹框点击事件 const showStreetLayer = () => { - let dataList = {}; - dataList.RefName = "zhoubianjiejing"; - dataList.NoPromise = true; - dataList.Getmenuarr = [ + AllData.dataList.RefName = "zhoubianjiejing"; + AllData.dataList.NoPromise = true; + AllData.dataList.Getmenuarr = [ { menuName: "周边全景", moduleName: "zhoubianjiejing", @@ -43,8 +42,8 @@ show: true, }, ]; - dataList.comIDs = ["zhoubianjiejing"]; - bus.emit("DynamicBus", dataList); + AllData.dataList.comIDs = ["zhoubianjiejing"]; + bus.emit("DynamicBus", AllData.dataList); }; onMounted(() => { bus.on("popupcontent", (params) => { @@ -54,22 +53,24 @@ if (params.popupInfo.type == "paishuiSupervise") { AllData.popupShow = false; let data = { - title:'水位计:'+ params.popupInfo.name, - comIDs: ["JC_dialog",'JC_oldList'], + title: "水位计:" + params.popupInfo.name, + comIDs: ["JC_dialog", "JC_oldList"], SiteNo: params.popupInfo.siteNo, }; bus.emit("publicDialog", data); - return + return; } AllData.streetPosition = params.point; AllData.dataList = params.popupInfo; let pipePopupDiv = document.getElementById("cesiumPopupID"); - let popupCenter, center, offsets = null; + let popupCenter, + center, + offsets = null; if (AllData.dataList.geometry) { if (AllData.dataList.geometry.includes("LINESTRING")) { popupCenter = turf.center( - turf.feature(Terraformer.WKT.parse(AllData.dataList.geometry)) + turf.feature(Terraformer.WKT.parse(AllData.dataList.geometry)) ).geometry.coordinates; } else { popupCenter = Terraformer.WKT.parse(AllData.dataList.geometry).coordinates; diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index 2610c42..6097fd9 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -671,7 +671,7 @@ }; AllData.refreshRight++; GetRightCharts(Row.properties); - }, 500); + }, 900); } } };