diff --git a/src/views/oneMap/LayerControl/LayerControl.vue b/src/views/oneMap/LayerControl/LayerControl.vue index cb2d83f..37d0576 100644 --- a/src/views/oneMap/LayerControl/LayerControl.vue +++ b/src/views/oneMap/LayerControl/LayerControl.vue @@ -2,24 +2,28 @@
-
{{ item.title }}
-
-
- -
- - - +
{{ item.title }}
+ +
+
+
+ +
+ + + -
- {{ item2.layerName }} +
+ {{ item2.layerName }} +
+
@@ -62,6 +66,7 @@ LayerData: [ { title: "基本信息", + Show: true, children: [ { layerName: "中心城区", @@ -137,6 +142,7 @@ }, { title: "燃气系统", + Show: true, children: [ { layerName: "燃气管网", @@ -178,6 +184,7 @@ }, { title: "雨水系统", + Show: true, children: [ { layerName: "雨水分区", @@ -216,6 +223,7 @@ }, { title: "污水系统", + Show: true, children: [ { layerName: "污水分区", @@ -252,6 +260,7 @@ }, { title: "感知设备", + Show: true, children: [ { layerName: "内涝易涝点", @@ -487,45 +496,50 @@ font-size: 14px; color: #ffffff; text-align: center; - } - .TCList { - width: 100%; - height: 14px; - margin-top: 10px; - display: flex; - color: #fff; cursor: pointer; - flex-direction: row; - flex-wrap: nowrap; - align-content: center; - justify-content: flex-start; - align-items: center; - box-sizing: border-box; - padding-left: 20px; - - .TCList_Select { - width: 14px; - height: 14px; - box-sizing: border-box; - border: 1px solid #fff; - } - .TCList_Icon { - width: 14px; - height: 14px; - margin: 0 10px; - } - .TCList_Name { - font-family: Source Han Sans CN; - font-weight: 500; - font-size: 14px; - height: 14px; - line-height: 14px; - } } - .TCList_Check { - color: #12f3ff; - .TCList_Select { - border: 1px solid #12f3ff; + .TCListBox { + width: 100%; + height: auto; + .TCList { + width: 100%; + height: 14px; + margin-top: 10px; + display: flex; + color: #fff; + cursor: pointer; + flex-direction: row; + flex-wrap: nowrap; + align-content: center; + justify-content: flex-start; + align-items: center; + box-sizing: border-box; + padding-left: 20px; + + .TCList_Select { + width: 14px; + height: 14px; + box-sizing: border-box; + border: 1px solid #fff; + } + .TCList_Icon { + width: 14px; + height: 14px; + margin: 0 10px; + } + .TCList_Name { + font-family: Source Han Sans CN; + font-weight: 500; + font-size: 14px; + height: 14px; + line-height: 14px; + } + } + .TCList_Check { + color: #12f3ff; + .TCList_Select { + border: 1px solid #12f3ff; + } } } } @@ -545,4 +559,13 @@ height: 0px; opacity: 0; } +.Group-enter-active, +.Group-leave-active { + transition: all 1s ease; +} + +.Group-enter-from, +.Group-leave-to { + height: 0px; +} diff --git a/src/views/oneMap/LayerControl/LayerControl.vue b/src/views/oneMap/LayerControl/LayerControl.vue index cb2d83f..37d0576 100644 --- a/src/views/oneMap/LayerControl/LayerControl.vue +++ b/src/views/oneMap/LayerControl/LayerControl.vue @@ -2,24 +2,28 @@
-
{{ item.title }}
-
-
- -
- - - +
{{ item.title }}
+ +
+
+
+ +
+ + + -
- {{ item2.layerName }} +
+ {{ item2.layerName }} +
+
@@ -62,6 +66,7 @@ LayerData: [ { title: "基本信息", + Show: true, children: [ { layerName: "中心城区", @@ -137,6 +142,7 @@ }, { title: "燃气系统", + Show: true, children: [ { layerName: "燃气管网", @@ -178,6 +184,7 @@ }, { title: "雨水系统", + Show: true, children: [ { layerName: "雨水分区", @@ -216,6 +223,7 @@ }, { title: "污水系统", + Show: true, children: [ { layerName: "污水分区", @@ -252,6 +260,7 @@ }, { title: "感知设备", + Show: true, children: [ { layerName: "内涝易涝点", @@ -487,45 +496,50 @@ font-size: 14px; color: #ffffff; text-align: center; - } - .TCList { - width: 100%; - height: 14px; - margin-top: 10px; - display: flex; - color: #fff; cursor: pointer; - flex-direction: row; - flex-wrap: nowrap; - align-content: center; - justify-content: flex-start; - align-items: center; - box-sizing: border-box; - padding-left: 20px; - - .TCList_Select { - width: 14px; - height: 14px; - box-sizing: border-box; - border: 1px solid #fff; - } - .TCList_Icon { - width: 14px; - height: 14px; - margin: 0 10px; - } - .TCList_Name { - font-family: Source Han Sans CN; - font-weight: 500; - font-size: 14px; - height: 14px; - line-height: 14px; - } } - .TCList_Check { - color: #12f3ff; - .TCList_Select { - border: 1px solid #12f3ff; + .TCListBox { + width: 100%; + height: auto; + .TCList { + width: 100%; + height: 14px; + margin-top: 10px; + display: flex; + color: #fff; + cursor: pointer; + flex-direction: row; + flex-wrap: nowrap; + align-content: center; + justify-content: flex-start; + align-items: center; + box-sizing: border-box; + padding-left: 20px; + + .TCList_Select { + width: 14px; + height: 14px; + box-sizing: border-box; + border: 1px solid #fff; + } + .TCList_Icon { + width: 14px; + height: 14px; + margin: 0 10px; + } + .TCList_Name { + font-family: Source Han Sans CN; + font-weight: 500; + font-size: 14px; + height: 14px; + line-height: 14px; + } + } + .TCList_Check { + color: #12f3ff; + .TCList_Select { + border: 1px solid #12f3ff; + } } } } @@ -545,4 +559,13 @@ height: 0px; opacity: 0; } +.Group-enter-active, +.Group-leave-active { + transition: all 1s ease; +} + +.Group-enter-from, +.Group-leave-to { + height: 0px; +} diff --git a/src/views/oneMap/index.vue b/src/views/oneMap/index.vue index 4ec8be4..c8aecec 100644 --- a/src/views/oneMap/index.vue +++ b/src/views/oneMap/index.vue @@ -404,9 +404,11 @@ bus.off("publicDialog_Close"); bus.off("OpenRY"); bus.off("ChangeZhuanTiTu"); + bus.off("checkRainL"); }); // 菜单点击 const MenuClick = (item, index) => { + showRainFlow.value = false; showPanel.value = false; // 改变菜单选中索引 AllData.AC_MenuIndex = item.id; @@ -427,6 +429,7 @@ }; // 二级菜单点击 const ErJiMenuClick = (item, item2) => { + showRainFlow.value = false; console.log(22); // 改变菜单选中索引 AllData.AC_MenuIndex = item.id; diff --git a/src/views/oneMap/LayerControl/LayerControl.vue b/src/views/oneMap/LayerControl/LayerControl.vue index cb2d83f..37d0576 100644 --- a/src/views/oneMap/LayerControl/LayerControl.vue +++ b/src/views/oneMap/LayerControl/LayerControl.vue @@ -2,24 +2,28 @@
-
{{ item.title }}
-
-
- -
- - - +
{{ item.title }}
+ +
+
+
+ +
+ + + -
- {{ item2.layerName }} +
+ {{ item2.layerName }} +
+
@@ -62,6 +66,7 @@ LayerData: [ { title: "基本信息", + Show: true, children: [ { layerName: "中心城区", @@ -137,6 +142,7 @@ }, { title: "燃气系统", + Show: true, children: [ { layerName: "燃气管网", @@ -178,6 +184,7 @@ }, { title: "雨水系统", + Show: true, children: [ { layerName: "雨水分区", @@ -216,6 +223,7 @@ }, { title: "污水系统", + Show: true, children: [ { layerName: "污水分区", @@ -252,6 +260,7 @@ }, { title: "感知设备", + Show: true, children: [ { layerName: "内涝易涝点", @@ -487,45 +496,50 @@ font-size: 14px; color: #ffffff; text-align: center; - } - .TCList { - width: 100%; - height: 14px; - margin-top: 10px; - display: flex; - color: #fff; cursor: pointer; - flex-direction: row; - flex-wrap: nowrap; - align-content: center; - justify-content: flex-start; - align-items: center; - box-sizing: border-box; - padding-left: 20px; - - .TCList_Select { - width: 14px; - height: 14px; - box-sizing: border-box; - border: 1px solid #fff; - } - .TCList_Icon { - width: 14px; - height: 14px; - margin: 0 10px; - } - .TCList_Name { - font-family: Source Han Sans CN; - font-weight: 500; - font-size: 14px; - height: 14px; - line-height: 14px; - } } - .TCList_Check { - color: #12f3ff; - .TCList_Select { - border: 1px solid #12f3ff; + .TCListBox { + width: 100%; + height: auto; + .TCList { + width: 100%; + height: 14px; + margin-top: 10px; + display: flex; + color: #fff; + cursor: pointer; + flex-direction: row; + flex-wrap: nowrap; + align-content: center; + justify-content: flex-start; + align-items: center; + box-sizing: border-box; + padding-left: 20px; + + .TCList_Select { + width: 14px; + height: 14px; + box-sizing: border-box; + border: 1px solid #fff; + } + .TCList_Icon { + width: 14px; + height: 14px; + margin: 0 10px; + } + .TCList_Name { + font-family: Source Han Sans CN; + font-weight: 500; + font-size: 14px; + height: 14px; + line-height: 14px; + } + } + .TCList_Check { + color: #12f3ff; + .TCList_Select { + border: 1px solid #12f3ff; + } } } } @@ -545,4 +559,13 @@ height: 0px; opacity: 0; } +.Group-enter-active, +.Group-leave-active { + transition: all 1s ease; +} + +.Group-enter-from, +.Group-leave-to { + height: 0px; +} diff --git a/src/views/oneMap/index.vue b/src/views/oneMap/index.vue index 4ec8be4..c8aecec 100644 --- a/src/views/oneMap/index.vue +++ b/src/views/oneMap/index.vue @@ -404,9 +404,11 @@ bus.off("publicDialog_Close"); bus.off("OpenRY"); bus.off("ChangeZhuanTiTu"); + bus.off("checkRainL"); }); // 菜单点击 const MenuClick = (item, index) => { + showRainFlow.value = false; showPanel.value = false; // 改变菜单选中索引 AllData.AC_MenuIndex = item.id; @@ -427,6 +429,7 @@ }; // 二级菜单点击 const ErJiMenuClick = (item, item2) => { + showRainFlow.value = false; console.log(22); // 改变菜单选中索引 AllData.AC_MenuIndex = item.id; diff --git a/vite.config.js b/vite.config.js index ea2e86d..afb2c95 100644 --- a/vite.config.js +++ b/vite.config.js @@ -7,8 +7,8 @@ const Timestamp = new Date().getTime(); //随机时间戳 // const targetUrl = 'http://192.168.48.145:13000'; //张鸿志 -const targetUrl = 'http://192.168.16.105:13000'; //张亚辉 -// const targetUrl = 'https://server2.wh-nf.cn:8088/prod-api'; //线上 +// const targetUrl = 'http://192.168.16.105:13000'; //张亚辉 +const targetUrl = 'https://server2.wh-nf.cn:8088/prod-api'; //线上 // https://vitejs.dev/config/ export default defineConfig(({ mode, command }) => {