diff --git a/index.html b/index.html index f75d9c4..a94b4bf 100644 --- a/index.html +++ b/index.html @@ -249,7 +249,6 @@ } } - diff --git a/index.html b/index.html index f75d9c4..a94b4bf 100644 --- a/index.html +++ b/index.html @@ -249,7 +249,6 @@ } } - diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 3a6d7b1..f6f3e2f 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -345,6 +345,7 @@ )()); function areaToMap(properties) { + bus.emit('set_area_parent',{name:properties.p_name}); let isYS = properties.type == "YS"; clearRouteMethod(); districtMask(properties); @@ -737,6 +738,7 @@ let prevObj = null; const panelDataToMap = (obj) => { + debugger; let isUp = Object.keys(obj).includes("isUp") ? obj.isUp : true; //是否触发地图点击事件 默认触发 const { setLayerVisible, setHighlight } = events_params; // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false }); diff --git a/index.html b/index.html index f75d9c4..a94b4bf 100644 --- a/index.html +++ b/index.html @@ -249,7 +249,6 @@ } } - diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 3a6d7b1..f6f3e2f 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -345,6 +345,7 @@ )()); function areaToMap(properties) { + bus.emit('set_area_parent',{name:properties.p_name}); let isYS = properties.type == "YS"; clearRouteMethod(); districtMask(properties); @@ -737,6 +738,7 @@ let prevObj = null; const panelDataToMap = (obj) => { + debugger; let isUp = Object.keys(obj).includes("isUp") ? obj.isUp : true; //是否触发地图点击事件 默认触发 const { setLayerVisible, setHighlight } = events_params; // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false }); diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index a476434..e1af227 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -4,7 +4,7 @@ class="layericon" @click="allData.showControlBox = !allData.showControlBox" > - +
返回
恢复默认
+
@@ -35,10 +36,11 @@ const appStore = useUserStore(); import { getImageUrl } from "@/utils/ruoyi"; -import { nextTick } from "vue"; +import { nextTick,computed } from "vue"; const { proxy } = getCurrentInstance(); const Show = ref(true); const selectList = ref([]); +const backObj = ref(null); const TXtYPE = ref(""); const dataSource = ref([ { @@ -235,6 +237,14 @@ showControlBox: false, //控制图层控制是否展示和隐藏 }); +function areaBack() { + backObj.value.name == '1'? (bus.emit("clearTemporaryData"),bus.emit(mapInitBusName),backObj.value = null) : bus.emit("panelDataToMap", backObj.value); +} + +const isShowBack = computed(()=>{ + return !proxy.$route.fullPath.includes('DrainageSystem') && backObj.value != null; +}) + // 这个方法会出现当前已勾选节点，或者半节点的状态 function check(data, node) { setLayerVisible([], selectList.value); @@ -316,10 +326,13 @@ Show.value = true; } }); + + bus.on("set_area_parent", (val) => backObj.value=val) }); onBeforeUnmount(() => { bus.off("YQ_head"); + bus.off("set_area_parent"); }); function reset() { @@ -439,6 +452,20 @@ background: url("@/assets/images/NewLayercontrol/layerIcon.png") no-repeat; background-size: 100% 100%; } +.layericon-back { + z-index: 0; + position: absolute; + cursor: pointer; + width: 35px; + height: 35px; + left: 487px; + top: 168px; + background: rgba(29, 175, 255, 1); + display: flex; + justify-content: center; + align-items: center; + border-radius: 4px; +} ::v-deep .LayerControlBox { z-index: 0; diff --git a/index.html b/index.html index f75d9c4..a94b4bf 100644 --- a/index.html +++ b/index.html @@ -249,7 +249,6 @@ } } - diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 3a6d7b1..f6f3e2f 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -345,6 +345,7 @@ )()); function areaToMap(properties) { + bus.emit('set_area_parent',{name:properties.p_name}); let isYS = properties.type == "YS"; clearRouteMethod(); districtMask(properties); @@ -737,6 +738,7 @@ let prevObj = null; const panelDataToMap = (obj) => { + debugger; let isUp = Object.keys(obj).includes("isUp") ? obj.isUp : true; //是否触发地图点击事件 默认触发 const { setLayerVisible, setHighlight } = events_params; // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false }); diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index a476434..e1af227 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -4,7 +4,7 @@ class="layericon" @click="allData.showControlBox = !allData.showControlBox" > - +
返回
恢复默认
+
@@ -35,10 +36,11 @@ const appStore = useUserStore(); import { getImageUrl } from "@/utils/ruoyi"; -import { nextTick } from "vue"; +import { nextTick,computed } from "vue"; const { proxy } = getCurrentInstance(); const Show = ref(true); const selectList = ref([]); +const backObj = ref(null); const TXtYPE = ref(""); const dataSource = ref([ { @@ -235,6 +237,14 @@ showControlBox: false, //控制图层控制是否展示和隐藏 }); +function areaBack() { + backObj.value.name == '1'? (bus.emit("clearTemporaryData"),bus.emit(mapInitBusName),backObj.value = null) : bus.emit("panelDataToMap", backObj.value); +} + +const isShowBack = computed(()=>{ + return !proxy.$route.fullPath.includes('DrainageSystem') && backObj.value != null; +}) + // 这个方法会出现当前已勾选节点，或者半节点的状态 function check(data, node) { setLayerVisible([], selectList.value); @@ -316,10 +326,13 @@ Show.value = true; } }); + + bus.on("set_area_parent", (val) => backObj.value=val) }); onBeforeUnmount(() => { bus.off("YQ_head"); + bus.off("set_area_parent"); }); function reset() { @@ -439,6 +452,20 @@ background: url("@/assets/images/NewLayercontrol/layerIcon.png") no-repeat; background-size: 100% 100%; } +.layericon-back { + z-index: 0; + position: absolute; + cursor: pointer; + width: 35px; + height: 35px; + left: 487px; + top: 168px; + background: rgba(29, 175, 255, 1); + display: flex; + justify-content: center; + align-items: center; + border-radius: 4px; +} ::v-deep .LayerControlBox { z-index: 0; diff --git a/src/views/pictureOnMap/TopTab/index.vue b/src/views/pictureOnMap/TopTab/index.vue index da0d4ac..6f2babf 100644 --- a/src/views/pictureOnMap/TopTab/index.vue +++ b/src/views/pictureOnMap/TopTab/index.vue @@ -118,6 +118,7 @@ appStore.Set_TiXiType(""); newfiberMap.map.easeTo(newfiberMap.config_.params.init); bus.emit("clearTemporaryData"); + bus.emit('set_area_parent',null); if (item.link == "/WaterAssets") { lastActived.value = activeName.value; } diff --git a/index.html b/index.html index f75d9c4..a94b4bf 100644 --- a/index.html +++ b/index.html @@ -249,7 +249,6 @@ } } - diff --git a/src/components/Map/MapBox.vue b/src/components/Map/MapBox.vue index 3a6d7b1..f6f3e2f 100644 --- a/src/components/Map/MapBox.vue +++ b/src/components/Map/MapBox.vue @@ -345,6 +345,7 @@ )()); function areaToMap(properties) { + bus.emit('set_area_parent',{name:properties.p_name}); let isYS = properties.type == "YS"; clearRouteMethod(); districtMask(properties); @@ -737,6 +738,7 @@ let prevObj = null; const panelDataToMap = (obj) => { + debugger; let isUp = Object.keys(obj).includes("isUp") ? obj.isUp : true; //是否触发地图点击事件 默认触发 const { setLayerVisible, setHighlight } = events_params; // if (prevObj != null) busEmit(setLayerVisible.key, { layername: prevObj.type, isCheck: false }); diff --git a/src/views/pictureOnMap/LayerControl.vue b/src/views/pictureOnMap/LayerControl.vue index a476434..e1af227 100644 --- a/src/views/pictureOnMap/LayerControl.vue +++ b/src/views/pictureOnMap/LayerControl.vue @@ -4,7 +4,7 @@ class="layericon" @click="allData.showControlBox = !allData.showControlBox" > - +
返回
恢复默认
+
@@ -35,10 +36,11 @@ const appStore = useUserStore(); import { getImageUrl } from "@/utils/ruoyi"; -import { nextTick } from "vue"; +import { nextTick,computed } from "vue"; const { proxy } = getCurrentInstance(); const Show = ref(true); const selectList = ref([]); +const backObj = ref(null); const TXtYPE = ref(""); const dataSource = ref([ { @@ -235,6 +237,14 @@ showControlBox: false, //控制图层控制是否展示和隐藏 }); +function areaBack() { + backObj.value.name == '1'? (bus.emit("clearTemporaryData"),bus.emit(mapInitBusName),backObj.value = null) : bus.emit("panelDataToMap", backObj.value); +} + +const isShowBack = computed(()=>{ + return !proxy.$route.fullPath.includes('DrainageSystem') && backObj.value != null; +}) + // 这个方法会出现当前已勾选节点，或者半节点的状态 function check(data, node) { setLayerVisible([], selectList.value); @@ -316,10 +326,13 @@ Show.value = true; } }); + + bus.on("set_area_parent", (val) => backObj.value=val) }); onBeforeUnmount(() => { bus.off("YQ_head"); + bus.off("set_area_parent"); }); function reset() { @@ -439,6 +452,20 @@ background: url("@/assets/images/NewLayercontrol/layerIcon.png") no-repeat; background-size: 100% 100%; } +.layericon-back { + z-index: 0; + position: absolute; + cursor: pointer; + width: 35px; + height: 35px; + left: 487px; + top: 168px; + background: rgba(29, 175, 255, 1); + display: flex; + justify-content: center; + align-items: center; + border-radius: 4px; +} ::v-deep .LayerControlBox { z-index: 0; diff --git a/src/views/pictureOnMap/TopTab/index.vue b/src/views/pictureOnMap/TopTab/index.vue index da0d4ac..6f2babf 100644 --- a/src/views/pictureOnMap/TopTab/index.vue +++ b/src/views/pictureOnMap/TopTab/index.vue @@ -118,6 +118,7 @@ appStore.Set_TiXiType(""); newfiberMap.map.easeTo(newfiberMap.config_.params.init); bus.emit("clearTemporaryData"); + bus.emit('set_area_parent',null); if (item.link == "/WaterAssets") { lastActived.value = activeName.value; } diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue index 804d7d9..8f6c043 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue @@ -34,6 +34,7 @@ value: "Jianceyujin", keys: [ { key: "waterlogging", visible: true }, + { key: "雨水分区", visible: true }, { key: "lake_water_level", visible: false }, { key: "rainPumpStation", visible: false }, { key: "dirtyPumpStation", visible: false }, @@ -45,6 +46,7 @@ value: "Fuzhujuece", keys: [ { key: "雨水系统流向", visible: true }, + { key: "雨水分区", visible: true }, { key: "雨水系统流向1", visible: true }, { key: "waterlog_community", visible: false }, { key: "rain_water_pump_station_info", visible: true }, @@ -55,6 +57,7 @@ label: "排涝调度", value: "Pailaodiaodu", keys: [ + { key: "雨水分区", visible: true }, { key: "waterlogging", visible: false }, { key: "泵车离线", visible: true }, { key: "泵车在线", visible: true }, @@ -65,6 +68,7 @@ label: "排涝回顾", value: "Pailaohuigu", keys: [ + { key: "雨水分区", visible: true }, { key: "雨水系统流向", visible: true }, { key: "雨水系统流向1", visible: true }, { key: "waterlogging", visible: true }, @@ -83,6 +87,7 @@ }; const TabClick = (item) => { const { setLayerVisible } = events_params; + newfiberMap.map.easeTo(newfiberMap.config_.params.init); activeSublevel.value = item.value; closeAllLayer(); item.keys && @@ -101,7 +106,9 @@ bus.emit(setHighlight.key, []); }; onMounted(() => { - bus.on(mapInitBusName,()=> TabClick(tabArr.value.filter(i => i.value == activeSublevel.value)[0])); + const init = ()=> TabClick(tabArr.value.filter(i => i.value == activeSublevel.value)[0]); + init(); + bus.on(mapInitBusName,init); }); onBeforeUnmount(() => { closeAllLayer();