调整图层

public/config.js

@@ -121,7 +121,7 @@ window.threeMapConfig = {
                 id: 'xldqxsy',   //小浪底倾斜摄影
                 url: iserverConfig.baseUrl + 'services/3D-XLDQXSY/rest/realspace',
                 height: 0,
-                flyTo: false,
+                flyTo: true,
                 show: false,
                 type: 'S3M',
             },
@@ -137,16 +137,16 @@ window.threeMapConfig = {
                 id: 'XLD_CF_BIM',  //小浪底厂房BIM模型
                 url: iserverConfig.baseUrl + 'services/3D-BIM_XLD_L2_DZCFDQSJ_202205/rest/realspace',
                 height: 0,
-                flyTo: true,
+                flyTo: false,
                 show: false,
                 type: 'S3M',
             },
-            
+
             {
                 id: 'DEM0304',  //地形DEM
                 url: iserverConfig.baseUrl + 'services/3D-BIM_XLD_L2_DZCFDQSJ_202205/rest/realspace',
                 height: 0,
-                flyTo: true,
+                flyTo: false,
                 show: false,
                 type: 'S3M',
             },
@@ -178,7 +178,7 @@ window.threeMapConfig = {
             children: [],
             disabled: true,
             isLeaf: false,
-            uper:'basic_map',
+            uper: 'basic_map',
         },
         {
             title: "库区航拍影像",
@@ -186,7 +186,7 @@ window.threeMapConfig = {
             children: [],
             disabled: true,
             isLeaf: false,
-            uper:'basic_map',
+            uper: 'basic_map',
         },
 
         {
@@ -195,7 +195,7 @@ window.threeMapConfig = {
             children: [],
             disabled: true,
             isLeaf: false,
-            uper:'basic_map',
+            uper: 'basic_map',
         },
 
         {
@@ -206,7 +206,8 @@ window.threeMapConfig = {
             fusionLayers: {
                 model: 'DEM0304'
             },
-            isEdit:false,
+            isEdit: false,
+            type:'DEM',
         },
 
 
@@ -228,7 +229,7 @@ window.threeMapConfig = {
             fusionLayers: {
                 model: 'xldqxsy'
             },
-            isEdit:false,
+            isEdit: false,
         },
 
         {
@@ -239,7 +240,7 @@ window.threeMapConfig = {
             fusionLayers: {
                 model: 'xxyqxsy'
             },
-            isEdit:false,
+            isEdit: false,
         },
         {
             title: "小浪底厂房BIM模型",
@@ -249,7 +250,7 @@ window.threeMapConfig = {
             fusionLayers: {
                 model: 'XLD_CF_BIM'
             },
-            isEdit:false,
+            isEdit: false,
         },
         {
             title: "西霞院厂房BIM模型(暂无)",
@@ -259,7 +260,7 @@ window.threeMapConfig = {
             fusionLayers: {
                 model: 'XLD_CF_BIM'
             },
-            isEdit:false,
+            isEdit: false,
         },
 
         {
@@ -270,7 +271,7 @@ window.threeMapConfig = {
             fusionLayers: {
                 layer2d: ['satellite']
             },
-            isEdit:false,
+            isEdit: false,
         },
         {
             title: "库区航拍影像202406", //卫星遥感影像
@@ -280,7 +281,7 @@ window.threeMapConfig = {
             fusionLayers: {
                 layer2d: ['kq_hp_06']
             },
-            isEdit:false,
+            isEdit: false,
         },
         {
             title: "库区航拍影像202407", //卫星遥感影像
@@ -290,7 +291,7 @@ window.threeMapConfig = {
             fusionLayers: {
                 layer2d: ['kq_hp_07']
             },
-            isEdit:false,
+            isEdit: false,
         },
     ],
     // 视角配置

src/assets/bussinessMapConfig/floodDispatch.ts

@@ -1,5 +1,5 @@
 /**
- * 基础服务配置
+ * 防汛调度一张图
 */
 const base_url = '192.168.119.192';
 const baseUrl = `http://${base_url}:8090/iserver/`;
@@ -26,47 +26,70 @@ export const bussinessMapConfig = {
                 show: false,
                 type: 'SCP',  //S3M  SCP 
             },
+            // {
+            //     id: 'fd_shuiku1Label',
+            //     url: baseUrl + 'services/3D-TCGL/rest/realspace/datas/shuikuL1Lable',
+            //     height: 1000,
+            //     flyTo: false,
+            //     show: false,
+            //     type: 'SCP',  //S3M  SCP 
+            // },
+            // {
+            //     id: 'fd_shuiku2',
+            //     url: baseUrl + 'services/3D-TCGL/rest/realspace/datas/shuikuL2',
+            //     height: 1000,
+            //     flyTo: false,
+            //     show: false,
+            //     type: 'SCP',  //S3M  SCP 
+            // },
+            // {
+            //     id: 'fd_shuiku1Labe2',
+            //     url: baseUrl + 'services/3D-TCGL/rest/realspace/datas/shuikuL2Lable',
+            //     height: 1000,
+            //     flyTo: false,
+            //     show: false,
+            //     type: 'SCP',  //S3M  SCP 
+            // },
             {
-                id: 'fd_shuiku1Label',
-                url: baseUrl + 'services/3D-TCGL/rest/realspace/datas/shuikuL1Lable',
+                id: 'fd_ylz',
+                url: baseUrl + 'services/3D-TCGL/rest/realspace/datas/yuliangzhan',
                 height: 1000,
                 flyTo: false,
                 show: false,
                 type: 'SCP',  //S3M  SCP 
             },
             {
-                id: 'fd_shuiku2',
-                url: baseUrl + 'services/3D-TCGL/rest/realspace/datas/shuikuL2',
+                id: 'fd_kq_spjz',
+                url: baseUrl + 'services/3D-TCGL/rest/realspace/datas/shipinjiancedianL1',
                 height: 1000,
                 flyTo: false,
                 show: false,
                 type: 'SCP',  //S3M  SCP 
             },
             {
-                id: 'fd_shuiku1Labe2',
-                url: baseUrl + 'services/3D-TCGL/rest/realspace/datas/shuikuL2Lable',
+                id: 'fd_kq_jcd_zdtw',
+                url: baseUrl + 'services/3D-TCGL/rest/realspace/datas/dizhendian',
                 height: 1000,
                 flyTo: false,
                 show: false,
                 type: 'SCP',  //S3M  SCP 
             },
             {
-                id: 'fd_ylz',
-                url: baseUrl + 'services/3D-TCGL/rest/realspace/datas/yuliangzhan',
-                height: 1000,
+                id: 'fd_kq_jcd_ssjcz',
+                url: baseUrl + 'services/3D-TCGL/rest/realspace/datas/shipinjiancedianL1',
+                height: 3000,
                 flyTo: false,
                 show: false,
                 type: 'SCP',  //S3M  SCP 
             },
             {
-                id: 'fd_ylzLabe2',
-                url: baseUrl + 'services/3D-TCGL/rest/realspace/datas/yuliangzhanLable',
+                id: 'fd_kq_jcd_szjcz',
+                url: baseUrl + 'services/3D-TCGL/rest/realspace/datas/shuizhijiancezhan',
                 height: 1000,
                 flyTo: false,
                 show: false,
                 type: 'SCP',  //S3M  SCP 
             },
-            
         ],
         asyncLayer3D: [
             
@@ -89,6 +112,7 @@ export const bussinessMapConfig = {
             isLeaf: false,
             uper: 'fd',
         },
+
         {
             title: "库区",
             key: "fd_kq",
@@ -97,6 +121,16 @@ export const bussinessMapConfig = {
             isLeaf: false,
             uper: 'fd',
         },
+        {
+            title: "流域地形(暂无服务)",
+            key: "fd_ly_dx",
+            isLeaf: true,
+            uper: 'fd_ly',
+            fusionLayers: {
+                model: 'fd_ly_dx'
+            },
+            isEdit:true,
+        },
         {
             title: "流域行政区",
             key: "fd_lyzxq",
@@ -107,8 +141,9 @@ export const bussinessMapConfig = {
             },
             isEdit:false,
         },
+        
         {
-            title: "一级骨干水库",
+            title: "骨干水库",
             key: "fd_shuiku1",
             isLeaf: true,
             uper: 'fd_ly',
@@ -118,55 +153,134 @@ export const bussinessMapConfig = {
             isEdit:false,
         },
         {
-            title: "一级骨干水库标注",
-            key: "fd_shuiku1Label",
+            title: "水文站(暂无服务)",
+            key: "fd_shuiwenzhan",
             isLeaf: true,
             uper: 'fd_ly',
             fusionLayers: {
-                model: 'fd_shuiku1Label'
+                model: 'fd_shuiwenzhan'
             },
             isEdit:false,
         },
+        
+        // {
+        //     title: "一级骨干水库标注",
+        //     key: "fd_shuiku1Label",
+        //     isLeaf: true,
+        //     uper: 'fd_ly',
+        //     fusionLayers: {
+        //         model: 'fd_shuiku1Label'
+        //     },
+        //     isEdit:false,
+        // },
+        // {
+        //     title: "二级骨干水库",
+        //     key: "fd_shuiku2",
+        //     isLeaf: true,
+        //     uper: 'fd_ly',
+        //     fusionLayers: {
+        //         model: 'fd_shuiku2'
+        //     },
+        //     isEdit:false,
+        // },
+        // {
+        //     title: "二级骨干水库标注",
+        //     key: "fd_shuiku1Labe2",
+        //     isLeaf: true,
+        //     uper: 'fd_ly',
+        //     fusionLayers: {
+        //         model: 'fd_shuiku1Labe2'
+        //     }
+        // },
         {
-            title: "二级骨干水库",
-            key: "fd_shuiku2",
+            title: "雨量站",
+            key: "fd_ylz",
             isLeaf: true,
             uper: 'fd_ly',
             fusionLayers: {
-                model: 'fd_shuiku2'
+                model: 'fd_ylz'
             },
-            isEdit:false,
+            isEdit:true,
         },
+        
         {
-            title: "二级骨干水库标注",
-            key: "fd_shuiku1Labe2",
+            title: "流域水位站(暂无服务)",
+            key: "fd_lyswz",
             isLeaf: true,
             uper: 'fd_ly',
             fusionLayers: {
-                model: 'fd_shuiku1Labe2'
-            }
+                model: 'fd_lyswz'
+            },
+            isEdit:true,
         },
         {
-            title: "雨量站",
-            key: "fd_ylz",
+            title: "水陆地形(暂无服务)",
+            key: "fd_kq_sldx",
             isLeaf: true,
-            uper: 'fd_ly',
+            uper: 'fd_kq',
             fusionLayers: {
-                model: 'fd_ylz'
+                model: 'fd_kq_sldx'
             },
             isEdit:true,
         },
         {
-            title: "雨量站标注",
-            key: "fd_ylzLabe2",
+            title: "视频监控(暂无)",
+            key: "fd_kq_spjz",
             isLeaf: true,
-            uper: 'fd_ly',
+            uper: 'fd_kq',
             fusionLayers: {
-                model: 'fd_ylzLabe2'
+                model: 'fd_kq_spjz'
             },
-            isEdit:true,
+            isEdit:false,
+        },
+        {
+            title: "监测站点",
+            key: "fd_kq_jcd",
+            children: [],
+            disabled: true,
+            isLeaf: false,
+            uper: 'fd_kq',
+        },
+        {
+            title: "水位站(暂无服务)",
+            key: "fd_kq_jcd_swz",
+            isLeaf: true,
+            uper: 'fd_kq_jcd',
+            fusionLayers: {
+                model: 'fd_kq_jcd_swz'
+            },
+            isEdit:false,
+        },
+        {
+            title: "地震台网",
+            key: "fd_kq_jcd_zdtw",
+            isLeaf: true,
+            uper: 'fd_kq_jcd',
+            fusionLayers: {
+                model: 'fd_kq_jcd_zdtw'
+            },
+            isEdit:false,
+        },
+        {
+            title: "水沙监测站",
+            key: "fd_kq_jcd_ssjcz",
+            isLeaf: true,
+            uper: 'fd_kq_jcd',
+            fusionLayers: {
+                model: 'fd_kq_jcd_ssjcz'
+            },
+            isEdit:false,
+        },
+        {
+            title: "水质监测站",
+            key: "fd_kq_jcd_szjcz",
+            isLeaf: true,
+            uper: 'fd_kq_jcd',
+            fusionLayers: {
+                model: 'fd_kq_jcd_szjcz'
+            },
+            isEdit:false,
         },
-
     ],
     // 视角配置
     layerView: {

src/hooks/web/useGatewayToken.ts

@@ -2,7 +2,7 @@
  * @Author: tengmingxue 1473375109@qq.com
  * @Date: 2023-08-03 09:15:55
  * @LastEditors: tengmingxue 1473375109@qq.com
- * @LastEditTime: 2023-08-04 20:54:13
+ * @LastEditTime: 2024-08-27 15:11:57
  * @FilePath: \xld_web\src\hooks\web\useGatewayToken.ts
  * @Description: 获取门户token
  */
@@ -56,13 +56,13 @@ export const storeGatewayInfo = () => {
  * 
 */
 const gatewayAuthenticate = async () => {
-    const res = await getGatewayAuthenticate()
-    if (res && res.code === 1) {
-        return
-    }
-    else {
-        gotoDoor()
-    }
+    // const res = await getGatewayAuthenticate()
+    // if (res && res.code === 1) {
+    //     return
+    // }
+    // else {
+    //     gotoDoor()
+    // }
 }
 /***
  * 跳转到门户

src/router/routes/index.ts

@@ -2,7 +2,7 @@
  * @Author: tengmingxue 1473375109@qq.com
  * @Date: 2024-08-23 22:08:09
  * @LastEditors: tengmingxue 1473375109@qq.com
- * @LastEditTime: 2024-08-25 11:24:45
+ * @LastEditTime: 2024-08-27 14:57:45
  * @FilePath: \xld_twoThree_map\src\router\routes\index.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -66,6 +66,15 @@ export const MapRoutes: AppRouteRecordRaw = {
 };
 
 export const bussinessMenu = [
+  {
+    path: '/overview',
+    name: 'Overview',
+    meta: {
+      title: '综合展示',
+      screen: true,
+      type: 'left',
+    },
+  },
   {
     path: '/floodDispatch',
     name: 'FloodDispatch',
@@ -90,15 +99,6 @@ export const bussinessMenu = [
     meta: {
       title: '安全保卫',
       screen: true,
-      type: 'left',
-    },
-  },
-  {
-    path: '/other',
-    name: 'Other',
-    meta: {
-      title: '其他',
-      screen: true,
       type: 'right',
     },
   },

src/store/modules/panel.ts

@@ -2,7 +2,7 @@
  * @Author: tengmingxue 1473375109@qq.com
  * @Date: 2023-10-11 09:24:11
  * @LastEditors: tengmingxue 1473375109@qq.com
- * @LastEditTime: 2024-08-25 09:15:25
+ * @LastEditTime: 2024-08-27 15:42:47
  * @FilePath: \xld_web\src\store\modules\panel.ts
  * @Description: 屏幕左右面板的位置
  */
@@ -31,7 +31,7 @@ export const usePanelStore = defineStore({
   id: 'panel',
   state: (): PanelState => ({
     //当前打开的菜单
-    activeMenu:'',
+    activeMenu:'/overview',
     //顶部面板宽度
     topPanelHeight: '2.678rem',
     //左边面板宽度

src/views/components/LayerControl/index.vue

@@ -23,7 +23,12 @@
               v-if="item.isLeaf && item.isFlyTo"
               @click="handleModelPos($event, item)"
             ></span>
-            <span class="edit-btn" v-if="item?.isEdit" title="矢量数据维护" @click="editVector(item)"></span>
+            <span
+              class="edit-btn"
+              v-if="item?.isEdit"
+              title="矢量数据维护"
+              @click="editVector(item)"
+            ></span>
           </template>
         </a-directory-tree>
       </div>
@@ -55,7 +60,7 @@ export default defineComponent({
     const panelStore = usePanelStore();
     const activeMenu = ref(panelStore.activeMenu);
     const treeData = ref([]);
-    const checkedKeys = ref([]);
+    const checkedKeys = ref(['DEM0304']);  //默认勾选上地形
     const defaultExpandAll = ref(false);
     watch(
       () => panelStore.activeMenu,
@@ -109,30 +114,39 @@ export default defineComponent({
       treeData.value = [];
       defaultExpandAll.value = false;
       let { layerView, layerControl } = threeMapConfig;
-      let config = null;
+      let layersControl = [];
       switch (activeMenu.value) {
+        case '/overview':
+          layersControl = [
+            ...fdConfig.layerControl,
+            ...eaConfig.layerControl,
+            ...hmConfig.layerControl,
+            ...sapConfig.layerControl,
+            ...sepConfig.layerControl,
+          ];
+          break;
         case '/floodDispatch':
-          config = fdConfig;
+          layersControl = fdConfig.layerControl;
           break;
         case '/equipmentAssets':
-          config = eaConfig;
+          layersControl = eaConfig.layerControl;
           break;
         case '/houseAreaMonitoring':
-          config = hmConfig;
+          layersControl = hmConfig.layerControl;
           break;
         case '/safeProduction':
-          config = sapConfig;
+          layersControl = sapConfig.layerControl;
           break;
         case '/securityProtection':
-          config = sepConfig;
+          layersControl = sepConfig.layerControl;
           break;
         default:
           break;
       }
       let layers = [];
       //合并图层
-      if (config && config.layerControl)
-        layers = [...JSON.parse(JSON.stringify(layerControl)), ...config.layerControl];
+      if (layersControl.length > 0)
+        layers = [...JSON.parse(JSON.stringify(layerControl)),...layersControl];
       else layers = JSON.parse(JSON.stringify(layerControl));
 
       layerControl.forEach((item) => {
@@ -145,13 +159,13 @@ export default defineComponent({
       treeData.value = buildTreeRecursively(layers);
       defaultExpandAll.value = true;
     };
-    
+
     /**
      * 编辑数据集
-    */
-    const editVector = (vector)=> {
-      let { key , title } = vector
-    }
+     */
+    const editVector = (vector) => {
+      let { key, title } = vector;
+    };
 
     onMounted(() => {
       setLayerConfig();
@@ -173,7 +187,11 @@ export default defineComponent({
       }
       // 子节点
       else {
-        if (node.dataRef.fusionLayers) {
+        if(node.dataRef?.type && node.dataRef.type === 'DEM'){
+          window.map.showTerrain(!node.checked)  //设置DEM地形显示
+          //map.showTerrain(url)
+        }
+        else if (node.dataRef.fusionLayers) {
           let { model, layer2d } = node.dataRef.fusionLayers;
           // 这是有dem的配置
           // let {dem, layer2d} = node.dataRef.fusionLayers
@@ -244,7 +262,7 @@ export default defineComponent({
     width: 100%;
     //height: 80%;
     height: 100%;
-    padding: 10px;
+    padding: 10px 0;
     border-radius: 8px;
     opacity: 1;
     // background: rgba(0, 22, 44, 0.7);