diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index d5e8a4c..1b5ff9c 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -1085,7 +1085,7 @@ }; const cadToMap = () => { -/* const mode = "SharedArrayBuffer" in window ? "2d" : "2d-st" + const mode = "SharedArrayBuffer" in window ? "2d" : "2d-st" let mapOrigin = [114.574109195774, 30.4194314468947]; let cadOrigin = [12754331.4937665, 3557578.58417769]; let map = newfiberMap.map; @@ -1098,7 +1098,7 @@ fileUrl: 'https://dhgx12.wh-nf.cn:7081/resource/v4/kexuedao.dwg.mxweb', viewBackgroundColor: {red: 0, green: 0, blue: 0} }); - window.mx_map = mx_map;*/ + window.mx_map = mx_map; } const events_params = { removeMapDatas: { key: "removeMapDatas" }, diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index d5e8a4c..1b5ff9c 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -1085,7 +1085,7 @@ }; const cadToMap = () => { -/* const mode = "SharedArrayBuffer" in window ? "2d" : "2d-st" + const mode = "SharedArrayBuffer" in window ? "2d" : "2d-st" let mapOrigin = [114.574109195774, 30.4194314468947]; let cadOrigin = [12754331.4937665, 3557578.58417769]; let map = newfiberMap.map; @@ -1098,7 +1098,7 @@ fileUrl: 'https://dhgx12.wh-nf.cn:7081/resource/v4/kexuedao.dwg.mxweb', viewBackgroundColor: {red: 0, green: 0, blue: 0} }); - window.mx_map = mx_map;*/ + window.mx_map = mx_map; } const events_params = { removeMapDatas: { key: "removeMapDatas" }, diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue index 3f9c691..9ef92eb 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue @@ -118,6 +118,7 @@ }); }) onBeforeUnmount(() => { + bus.emit(events_params.removeMapDatas.key,events_params.beansToMap.id); bus.off("showZSdispatch"); }) diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index d5e8a4c..1b5ff9c 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -1085,7 +1085,7 @@ }; const cadToMap = () => { -/* const mode = "SharedArrayBuffer" in window ? "2d" : "2d-st" + const mode = "SharedArrayBuffer" in window ? "2d" : "2d-st" let mapOrigin = [114.574109195774, 30.4194314468947]; let cadOrigin = [12754331.4937665, 3557578.58417769]; let map = newfiberMap.map; @@ -1098,7 +1098,7 @@ fileUrl: 'https://dhgx12.wh-nf.cn:7081/resource/v4/kexuedao.dwg.mxweb', viewBackgroundColor: {red: 0, green: 0, blue: 0} }); - window.mx_map = mx_map;*/ + window.mx_map = mx_map; } const events_params = { removeMapDatas: { key: "removeMapDatas" }, diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue index 3f9c691..9ef92eb 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue @@ -118,6 +118,7 @@ }); }) onBeforeUnmount(() => { + bus.emit(events_params.removeMapDatas.key,events_params.beansToMap.id); bus.off("showZSdispatch"); }) diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/index.vue index d01f9a3..871abb3 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/index.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/index.vue @@ -28,8 +28,8 @@ const tabData=[ {label:'防汛检查',value:'1'}, {label:'车辆跟踪',value:'2',keys:'泵车离线,泵车在线'}, - {label:'泵站调度',value:'3', keys:"rainPumpStation"}, - {label:'排渍调度',value:'4',keys:"waterlogging"}, + {label:'泵站调度',value:'3', keys:"rain_water_pump_station_info"}, + {label:'排渍调度',value:'4',keys:""}, ] const tabActive=ref(1) const tabClickFun=(item)=>{ @@ -45,6 +45,10 @@ tabData.map((i) => (i.keys || '').split(',')).flat().filter(Boolean).flat().forEach((i) => bus.emit(setLayerVisible.key, { layername: i, isCheck: false })); bus.emit(setHighlight.key, []); }; + + onBeforeUnmount(() => { + closeAllLayer(); + })