diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index d2b6949..9d1074a 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -128,13 +128,21 @@ pkClick(Getproperties.value); } console.log("GetcomIDs.value", GetcomIDs.value); - // 去除排水体系泵站通用弹框 + // 去除排水体系泵站通用弹框,通过ReturnPSTX来判断是否不打开公共弹窗 console.log("arrid.value", arrid.value); + // debugger; if ( type == "rain_water_pump_station_info" && - router.currentRoute.value.fullPath == "/DrainageSystem" - ) + router.currentRoute.value.fullPath == "/DrainageSystem" && + localStorage.getItem("ReturnPSTX") == "off" + ) { + // 使用一次后恢复默认值:false + localStorage.setItem("ReturnPSTX", "off"); //On打开公共弹窗 off不打开公共弹窗 默认为On return; + } + + // 使用一次后恢复默认值:false + localStorage.setItem("ReturnPSTX", "off"); //On打开公共弹窗 off不打开公共弹窗 默认为On if (arrid.value.includes(type)) { dialogConfig.visible = true; dialogConfig.dataCode = type; @@ -312,7 +320,7 @@ moduleName: "PointAndLine", }, ]; - + // debugger; // dialogConfig.dataID = '0371000003'; dialogConfig.comIDs = ["PointAndLine"]; dialogConfig.RefName = "PointAndLine"; @@ -501,7 +509,7 @@ dialogConfig.visible = is; }; function anotherMeht(item) { - debugger; + // debugger; let properties = {}; Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; @@ -536,6 +544,7 @@ allScreen(); useStore.getsewageData(); bus.on("DynamicBus", (item) => { + // debugger; console.log("item", item); dialogConfig.RefName = item.RefName || ""; dialogConfig.title = item.stName || item.name; diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index d2b6949..9d1074a 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -128,13 +128,21 @@ pkClick(Getproperties.value); } console.log("GetcomIDs.value", GetcomIDs.value); - // 去除排水体系泵站通用弹框 + // 去除排水体系泵站通用弹框,通过ReturnPSTX来判断是否不打开公共弹窗 console.log("arrid.value", arrid.value); + // debugger; if ( type == "rain_water_pump_station_info" && - router.currentRoute.value.fullPath == "/DrainageSystem" - ) + router.currentRoute.value.fullPath == "/DrainageSystem" && + localStorage.getItem("ReturnPSTX") == "off" + ) { + // 使用一次后恢复默认值:false + localStorage.setItem("ReturnPSTX", "off"); //On打开公共弹窗 off不打开公共弹窗 默认为On return; + } + + // 使用一次后恢复默认值:false + localStorage.setItem("ReturnPSTX", "off"); //On打开公共弹窗 off不打开公共弹窗 默认为On if (arrid.value.includes(type)) { dialogConfig.visible = true; dialogConfig.dataCode = type; @@ -312,7 +320,7 @@ moduleName: "PointAndLine", }, ]; - + // debugger; // dialogConfig.dataID = '0371000003'; dialogConfig.comIDs = ["PointAndLine"]; dialogConfig.RefName = "PointAndLine"; @@ -501,7 +509,7 @@ dialogConfig.visible = is; }; function anotherMeht(item) { - debugger; + // debugger; let properties = {}; Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; @@ -536,6 +544,7 @@ allScreen(); useStore.getsewageData(); bus.on("DynamicBus", (item) => { + // debugger; console.log("item", item); dialogConfig.RefName = item.RefName || ""; dialogConfig.title = item.stName || item.name; diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index 6ada224..8d14263 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -1253,7 +1253,6 @@ }; // 打开公共弹窗 const OpenGongGongDialog = () => { - debugger; let params = { stName: AllData.ClicksiteName, dataCode: "", @@ -1263,6 +1262,7 @@ id: AllData.RightShowID, dataId: "", }; + localStorage.setItem("ReturnPSTX", "On"); //On打开公共弹窗 off不打开公共弹窗 默认为On bus.emit("DynamicBus", params); }; onMounted(() => { @@ -1273,6 +1273,7 @@ getData3(); getData7(); clearInterval(initeGLTimer); + localStorage.setItem("ReturnPSTX", "off"); //On打开公共弹窗 off不打开公共弹窗 默认为On }, 100); }); diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index d2b6949..9d1074a 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -128,13 +128,21 @@ pkClick(Getproperties.value); } console.log("GetcomIDs.value", GetcomIDs.value); - // 去除排水体系泵站通用弹框 + // 去除排水体系泵站通用弹框,通过ReturnPSTX来判断是否不打开公共弹窗 console.log("arrid.value", arrid.value); + // debugger; if ( type == "rain_water_pump_station_info" && - router.currentRoute.value.fullPath == "/DrainageSystem" - ) + router.currentRoute.value.fullPath == "/DrainageSystem" && + localStorage.getItem("ReturnPSTX") == "off" + ) { + // 使用一次后恢复默认值:false + localStorage.setItem("ReturnPSTX", "off"); //On打开公共弹窗 off不打开公共弹窗 默认为On return; + } + + // 使用一次后恢复默认值:false + localStorage.setItem("ReturnPSTX", "off"); //On打开公共弹窗 off不打开公共弹窗 默认为On if (arrid.value.includes(type)) { dialogConfig.visible = true; dialogConfig.dataCode = type; @@ -312,7 +320,7 @@ moduleName: "PointAndLine", }, ]; - + // debugger; // dialogConfig.dataID = '0371000003'; dialogConfig.comIDs = ["PointAndLine"]; dialogConfig.RefName = "PointAndLine"; @@ -501,7 +509,7 @@ dialogConfig.visible = is; }; function anotherMeht(item) { - debugger; + // debugger; let properties = {}; Getproperties.value.stCode = item.stCode || item.siteCode || item.lakeCode; Getproperties.value.dataCode = item.dataCode; @@ -536,6 +544,7 @@ allScreen(); useStore.getsewageData(); bus.on("DynamicBus", (item) => { + // debugger; console.log("item", item); dialogConfig.RefName = item.RefName || ""; dialogConfig.title = item.stName || item.name; diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index 6ada224..8d14263 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -1253,7 +1253,6 @@ }; // 打开公共弹窗 const OpenGongGongDialog = () => { - debugger; let params = { stName: AllData.ClicksiteName, dataCode: "", @@ -1263,6 +1262,7 @@ id: AllData.RightShowID, dataId: "", }; + localStorage.setItem("ReturnPSTX", "On"); //On打开公共弹窗 off不打开公共弹窗 默认为On bus.emit("DynamicBus", params); }; onMounted(() => { @@ -1273,6 +1273,7 @@ getData3(); getData7(); clearInterval(initeGLTimer); + localStorage.setItem("ReturnPSTX", "off"); //On打开公共弹窗 off不打开公共弹窗 默认为On }, 100); }); diff --git a/vite.config.js b/vite.config.js index 4ddbb34..bdfa4ec 100644 --- a/vite.config.js +++ b/vite.config.js @@ -136,3 +136,4 @@ }, }; }); + \ No newline at end of file