修改样式

public/config.js

@@ -1,4 +1,4 @@
-/**
+/**
  * 基础服务配置
 */
 const BASE_IP = 'http://192.168.119.192';
@@ -192,7 +192,39 @@ window.threeMapConfig = {
                 url: iserverConfig.baseUrl + 'services/3D-DEM_XLDBQLDQ_L2_202312_050dm/rest/realspace/datas/DEM_XLDBQLDQ_L2_202312_050dm_OrthoImage',
                 subdomains:iserverConfig.subdomains
             },
-    
+            {
+                id: 'base_kq_dbs_2024_xq',
+                title: "小浪底2024坝前漏斗区水下地形数据",
+                epsg: 4326,
+                type: 'SUPER_3D',
+                show: false,
+                minimumLevel: 0,
+                maximumLevel: 18,
+                url: iserverConfig.baseUrl + 'services/3D-XLD_2024/rest/realspace/datas/xld2024_1@DBS',
+                subdomains:iserverConfig.subdomains
+            },
+            {
+                id: 'base_kq_dbs_2024_xxybq',
+                title: "西霞院2024坝前水下地形数据",
+                epsg: 4326,
+                type: 'SUPER_3D',
+                show: false,
+                minimumLevel: 0,
+                maximumLevel: 18,
+                url: iserverConfig.baseUrl + 'services/3D-xxy_2024_bq/rest/realspace/datas/xxy_2024_bq@DBS',
+                subdomains:iserverConfig.subdomains
+            },
+            {
+                id: 'base_kq_dbs_2024_xxybx',
+                title: "西霞院2024坝下水下地形数据",
+                epsg: 4326,
+                type: 'SUPER_3D',
+                show: false,
+                minimumLevel: 0,
+                maximumLevel: 18,
+                url: iserverConfig.baseUrl + 'services/3D-xxy_2024_bx/rest/realspace/datas/xxy_2024_bx@DBS',
+                subdomains:iserverConfig.subdomains
+            },
         ],
         layers3D: [
             // {
@@ -224,7 +256,7 @@ window.threeMapConfig = {
             {
                 id: 'XLD_CF_BIM_1',  //小浪底厂房BIM模型
                 url: iserverConfig.baseUrl + 'services/3D-BIM_XLD_L2_DZCFDQSJ_202205/rest/realspace',
-                height: 100,
+                height: 0,
                 flyTo: false,
                 show: false,
                 type: 'S3M',
@@ -233,7 +265,7 @@ window.threeMapConfig = {
             {
                 id: 'XLD_CF_BIM',  //小浪底厂房BIM模型
                 url: iserverConfig.baseUrl + 'services/3D-local3DCache-xldsj20240827/rest/realspace',
-                height: 100,
+                height: 0,
                 flyTo: false,
                 show: false,
                 type: 'S3M',
@@ -409,6 +441,36 @@ window.threeMapConfig = {
             },
             isEdit: false,
         },
+        {
+            title: "小浪底2024坝前漏斗区水下地形数据",
+            key: "base_kq_dbs_2024_xq",
+            isLeaf: true,
+            uper: 'base_kq_dbs',
+            fusionLayers: {
+                layer2d: ['base_kq_dbs_2024_xq']
+            },
+            isEdit: false,
+        },
+        {
+            title: "西霞院2024坝前水下地形数据",
+            key: "base_kq_dbs_2024_xxybq",
+            isLeaf: true,
+            uper: 'base_kq_dbs',
+            fusionLayers: {
+                layer2d: ['base_kq_dbs_2024_xxybq']
+            },
+            isEdit: false,
+        },
+        {
+            title: "西霞院2024坝下水下地形数据",
+            key: "base_kq_dbs_2024_xxybx",
+            isLeaf: true,
+            uper: 'base_kq_dbs',
+            fusionLayers: {
+                layer2d: ['base_kq_dbs_2024_xxybx']
+            },
+            isEdit: false,
+        },
         {
             title: "库区航拍影像202406",
             key: "kq_hp_06",

public/config1.js

@@ -0,0 +1,497 @@
+/**
+ * 基础服务配置
+*/
+const BASE_IP = 'http://192.168.119.192';
+const iserverConfig = {
+    baseUrl: `${BASE_IP}:8090/iserver/`,
+    // subdomains: [
+    //     `8090`,
+    //     `7001`,
+    //     `7002`,
+    //     `7003`,
+    //     `7004`,
+    //     `7005`,
+    //   ],
+};
+window.threeMapConfig = {
+    initDestination: {
+        x: 112.39415697775746,
+        y: 34.91332337135989,
+        z: 1557.5457612960613
+    },
+    initOrientation: {
+        heading: 5.126025171871763,
+        pitch: -0.41165893655816665,
+        roll: 3.108624468950438e-14
+    },
+    mapConfig: {
+        demUrl: iserverConfig.baseUrl + 'services/3D-local3DCache-DEM0304/rest/realspace/datas/DEM0304',
+        isSct: true,
+        defaultView: {
+            destination: {
+                x: 112.39415697775746,
+                y: 34.91332337135989,
+                z: 1557.5457612960613
+            },
+            orientation: {
+                heading: 5.126025171871763,
+                pitch: -0.41165893655816665,
+                roll: 3.108624468950438e-14
+            }
+        },
+        //类型type  GD高德，BDBD百度本地，BD百度，GOOGLE谷歌，TX腾讯，SUPER超图，SUPER_3D超图三维，WEBP超图webp
+        layers2D: [
+            // {
+            //     id: 'yx',
+            //     title: '天地图影像地图',
+            //     epsg: 4326,
+            //     show: true,
+            //     minimumLevel: 0,
+            //     maximumLevel: 18,
+            //     type: 'TDT',
+            //     url: [
+            //         'http://t{s}.tianditu.com/img_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=img&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default&format=tiles&tk=15f7b01aababbb39ab568f4ba12ea21c',
+            //     ],
+            //     subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
+            // },
+            {
+                id: 'yx',
+                title: '天地图影像地图',
+                epsg: 4326,
+                show: true,
+                minimumLevel: 0,
+                maximumLevel: 18,
+                type: 'SUPER',
+                url: iserverConfig.baseUrl + 'services/map-ugcv5-YRGPGLOBALDOM2/rest/maps/YRGP_GLOBAL_DOM',
+                
+            },
+            {
+                id: 'yx1',
+                title: '天地图影像地图',
+                epsg: 4326,
+                show: true,
+                minimumLevel: 0,
+                maximumLevel: 18,
+                type: 'SUPER',
+                url: iserverConfig.baseUrl + 'services/map-ugcv5-YRGCXLDDOM1m/rest/maps/YRGC_XLD_DOM_1m',
+                
+            },
+
+            {
+                id: 'f_swx',
+                title: '水位线',
+                epsg: 4326,
+                show: true,
+                minimumLevel: 0,
+                maximumLevel: 18,
+                type: 'SUPER',
+                flyTo:true,
+                url: 'http://192.168.119.13:8084/iserver/services/map-ugcv5-sx2D/rest/maps/sx2D',
+                
+            },
+
+            {
+                id: 'sl',
+                title: '天地矢量地图',
+                epsg: 4326,
+                type: 'TDT',
+                show: false,
+                minimumLevel: 0,
+                maximumLevel: 18,
+                url: [
+                    'http://t{s}.tianditu.gov.cn/vec_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=vec&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default&format=tiles&tk=15f7b01aababbb39ab568f4ba12ea21c',
+                ],
+                subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
+            },
+            {
+                id: 'satellite',
+                title: "库区遥感影像", //卫星遥感影像
+                epsg: 4326,
+                type: 'SUPER',
+                show: false,
+                minimumLevel: 0,
+                maximumLevel: 18,
+                //url: iserverConfig.baseUrl + 'services/3D-local3DCache-YRGPHHLYDOM1m/rest/realspace/datas/YRGP_HHLY_DOM_1m'
+                url: iserverConfig.baseUrl + 'services/3D-local3DCache-DOMXLDKQ2022080d2m01/rest/realspace/datas/DOM_XLD_KQ_202208_0d2m_01',
+                
+            },
+            {
+                id: 'kq_hp_06',
+                title: '库区航拍影像2024年6月',
+                epsg: 4326,
+                type: 'SUPER_3D',
+                show: false,
+                minimumLevel: 0,
+                maximumLevel: 18,
+                url: iserverConfig.baseUrl + 'services/DOM_XLDKQ_L2_202406_050cm_WGS84/rest/maps/小浪底库区202406期影像_WGS84',
+                
+            },
+            {
+                id: 'kq_hp_07',
+                title: '库区航拍影像2024年7月',
+                epsg: 4326,
+                type: 'SUPER_3D',
+                show: false,
+                minimumLevel: 0,
+                maximumLevel: 18,
+                url: iserverConfig.baseUrl + 'services/DOM_XLDKQ_L2_202407_050cm_WGS84/rest/maps/小浪底库区202407期影像_WGS84',
+                
+            },
+            {
+                id: 'base_kq_dbs_2021_xq',
+                title: "2021汛前坝前漏斗区水下地形数据",
+                epsg: 4326,
+                type: 'SUPER_3D',
+                show: false,
+                minimumLevel: 0,
+                maximumLevel: 18,
+                url: iserverConfig.baseUrl + 'services/3D-2021XQDBS/rest/realspace/datas/T2021年汛前小浪底汛前1%40SXDX',
+                
+            },
+            {
+                id: 'base_kq_dbs_2021_xh',
+                title: "2021汛后坝前漏斗区水下地形数据",
+                epsg: 4326,
+                type: 'SUPER_3D',
+                show: false,
+                minimumLevel: 0,
+                maximumLevel: 18,
+                url: iserverConfig.baseUrl + 'services/3D-2021XHDBS/rest/realspace/datas/T2021年汛后小浪底汛后0d1m1%40SXDX',
+                
+            },
+            {
+                id: 'base_kq_dbs_2022_xq',
+                title: "2022汛前坝前漏斗区水下地形数据",
+                epsg: 4326,
+                type: 'SUPER_3D',
+                show: false,
+                minimumLevel: 0,
+                maximumLevel: 18,
+                url: iserverConfig.baseUrl + 'services/3D-XLD_2022-DBS/rest/realspace/datas/XLD_2022@DBS',
+                
+            },
+            {
+                id: 'base_kq_dbs_2023_xq',
+                title: "2023汛前坝前漏斗区水下地形数据",
+                epsg: 4326,
+                type: 'SUPER_3D',
+                show: false,
+                minimumLevel: 0,
+                maximumLevel: 18,
+                url: iserverConfig.baseUrl + 'services/3D-2023XQBQLDQ/rest/realspace/datas/T2023dem_OrthoImage_1@123',
+                
+            },
+            {
+                id: 'base_kq_dbs_2023_xh',
+                title: "2023汛后坝前漏斗区水下地形数据",
+                epsg: 4326,
+                type: 'SUPER_3D',
+                show: false,
+                minimumLevel: 0,
+                maximumLevel: 18,
+                url: iserverConfig.baseUrl + 'services/3D-DEM_XLDBQLDQ_L2_202312_050dm/rest/realspace/datas/DEM_XLDBQLDQ_L2_202312_050dm_OrthoImage',
+                
+            },
+    
+        ],
+        layers3D: [
+            // {
+            //     id: 'db_model',
+            //     url: iserverConfig.baseUrl + 'services/3D-local3DCache-YRGPXLDDAM/rest/realspace',
+            //     height: 0,
+            //     flyTo: false,
+            //     show: false,
+            //     type: 'S3M',
+            // },
+            {
+                id: 'xldqxsy',   //小浪底倾斜摄影
+                url: iserverConfig.baseUrl + 'services/3D-XLDQXSY/rest/realspace',
+                height: 100,
+                flyTo: false,
+                show: false,
+                type: 'S3M',
+            },
+            {
+                id: 'xxyqxsy', //西霞院倾斜摄影
+                url: iserverConfig.baseUrl + 'services/3D-local3DCache-xxyqxsy/rest/realspace',
+                height: 100,
+                flyTo: false,
+                show: false,
+                type: 'S3M',
+            },
+            {
+                id: 'XLD_CF_BIM_1',  //小浪底厂房BIM模型
+                url: iserverConfig.baseUrl + 'services/3D-BIM_XLD_L2_DZCFDQSJ_202205/rest/realspace',
+                height: 0,
+                flyTo: false,
+                show: false,
+                type: 'S3M',
+            },
+            {
+                id: 'XLD_CF_BIM',  //小浪底厂房BIM模型
+                url: iserverConfig.baseUrl + 'services/3D-local3DCache-xldsj20240827/rest/realspace',
+                height: 0,
+                flyTo: false,
+                show: false,
+                type: 'S3M',
+            },
+            
+            {
+                id: 'base_kq_dbs_2021_xq',
+                title: "2021汛前坝前漏斗区水下地形数据",
+                url: iserverConfig.baseUrl + 'services/3D-2021XQDBS/rest/realspace',
+                height: 0,
+                flyTo: false,
+                show: false,
+                type: 'S3M',
+            },
+            
+            
+        ],
+        asyncLayer3D: [
+
+        ]
+    },
+    // 图层树
+    layerControl: [
+        {
+            title: "基础底图",
+            key: "basic_map",
+            children: [],
+            disabled: false,
+            isLeaf: false
+        },
+        {
+            title: "倾斜摄影",
+            key: "base_scene",
+            children: [],
+            disabled: false,
+            isLeaf: false,
+            uper: 'basic_map',
+        },
+        {
+            title: "库区水下地形",  //库区多波束
+            key: "base_kq_dbs",
+            children: [],
+            disabled: false,
+            isLeaf: false,
+            uper: 'basic_map',
+        },
+        {
+            title: "库区航拍影像",
+            key: "base_kq_hp",
+            children: [],
+            disabled: false,
+            isLeaf: false,
+            uper: 'basic_map',
+        },
+
+        {
+            title: "BIM模型",
+            key: "bim_model",
+            children: [],
+            disabled: false,
+            isLeaf: false,
+            uper: 'basic_map',
+        },
+        {
+            title: "小浪底倾斜摄影",
+            key: "xldqxsy",
+            isLeaf: true,
+            uper: 'base_scene',
+            fusionLayers: {
+                model: 'xldqxsy'
+            },
+            isEdit: false,
+        },
+
+        {
+            title: "西霞院倾斜摄影",
+            key: "xxyqxsy",
+            isLeaf: true,
+            uper: 'base_scene',
+            fusionLayers: {
+                model: 'xxyqxsy'
+            },
+            isEdit: false,
+        },
+        {
+            title: "小浪底",
+            key: "XLD_CF_BIM",
+            isLeaf: true,
+            uper: 'bim_model',
+            fusionLayers: {
+                model: 'XLD_CF_BIM'
+            },
+            isEdit: false,
+        },
+        {
+            title: "小浪底厂房",
+            key: "XLD_CF_BIM_1",
+            isLeaf: true,
+            uper: 'bim_model',
+            fusionLayers: {
+                model: 'XLD_CF_BIM_1'
+            },
+            isEdit: false,
+        },
+        {
+            title: "西霞院",
+            key: "XXY_CF_BIM",
+            isLeaf: true,
+            uper: 'bim_model',
+            fusionLayers: {
+                model: 'XLD_CF_BIM'
+            },
+            isEdit: false,
+        },
+
+        {
+            title: "库区遥感影像", //卫星遥感影像
+            key: "satellite",
+            isLeaf: true,
+            uper: 'basic_map',
+            fusionLayers: {
+                layer2d: ['satellite']
+            },
+            isEdit: false,
+        },
+        {
+            title: "2021汛前坝前漏斗区水下地形数据",
+            key: "base_kq_dbs_2021_xq",
+            isLeaf: true,
+            uper: 'base_kq_dbs',
+            fusionLayers: {
+                layer2d: ['base_kq_dbs_2021_xq']
+            },
+            isEdit: false,
+        },
+        {
+            title: "2021汛后坝前漏斗区水下地形数据",
+            key: "base_kq_dbs_2021_xh",
+            isLeaf: true,
+            uper: 'base_kq_dbs',
+            fusionLayers: {
+                layer2d: ['base_kq_dbs_2021_xh']
+            },
+            isEdit: false,
+        },
+        {
+            title: "2022汛前坝前漏斗区水下地形数据",
+            key: "base_kq_dbs_2022_xq",
+            isLeaf: true,
+            uper: 'base_kq_dbs',
+            fusionLayers: {
+                layer2d: ['base_kq_dbs_2022_xq']
+            },
+            isEdit: false,
+        },
+        {
+            title: "2023汛前坝前漏斗区水下地形数据",
+            key: "base_kq_dbs_2023_xq",
+            isLeaf: true,
+            uper: 'base_kq_dbs',
+            fusionLayers: {
+                layer2d: ['base_kq_dbs_2023_xq']
+            },
+            isEdit: false,
+        },
+        {
+            title: "2023汛后坝前漏斗区水下地形数据",
+            key: "base_kq_dbs_2023_xh",
+            isLeaf: true,
+            uper: 'base_kq_dbs',
+            fusionLayers: {
+                layer2d: ['base_kq_dbs_2023_xh']
+            },
+            isEdit: false,
+        },
+        {
+            title: "库区航拍影像202406",
+            key: "kq_hp_06",
+            isLeaf: true,
+            uper: 'base_kq_hp',
+            fusionLayers: {
+                layer2d: ['kq_hp_06']
+            },
+            isEdit: false,
+        },
+        {
+            title: "库区航拍影像202407", //卫星遥感影像
+            key: "kq_hp_07",
+            isLeaf: true,
+            uper: 'base_kq_hp',
+            fusionLayers: {
+                layer2d: ['kq_hp_07']
+            },
+            isEdit: false,
+        },
+    ],
+    // 视角配置
+    layerView: {
+        qxsy1: {
+            isFlyTo: true, //是否支持定位
+            viewExtent: {
+                destination: {
+                    x: 112.39415697775746,
+                    y: 34.91332337135989,
+                    z: 1557.5457612960613
+                },
+                orientation: {
+                    heading: 5.126025171871763,
+                    pitch: -0.41165893655816665,
+                    roll: 3.108624468950438e-14
+                }
+            }// 定位默认范围，如果没配置的话则使用中心坐标去定位
+        },
+        dem: {
+            isFlyTo: true, //是否支持定位
+            viewExtent: {
+                destination: {
+                    x: 112.39415697775746,
+                    y: 34.91332337135989,
+                    z: 1557.5457612960613
+                },
+                orientation: {
+                    heading: 5.126025171871763,
+                    pitch: -0.41165893655816665,
+                    roll: 3.108624468950438e-14
+                }
+            }// 定位默认范围，如果没配置的话则使用中心坐标去定位
+        },
+        dam: {
+            isFlyTo: true, //是否支持定位
+            viewExtent: {
+                "destination": {
+                    "x": 112.5262240096781,
+                    "y": 34.863677273837936,
+                    "z": 1880.2777799562828
+                },
+                "orientation": {
+                    "heading": 0.06743990496026964,
+                    "pitch": -0.6999909887287021,
+                    "roll": 5.1514348342607263e-14
+                }
+            }// 定位默认范围，如果没配置的话则使用中心坐标去定位
+        }
+    },
+    dataService: {
+        name: '数据服务',
+        url: iserverConfig.baseUrl + 'services/data-XLD_KQYG_R2D/rest/data',
+        dataSource: 'XLD_KQYG_R2D',
+        dataSet: ['psmap'], //暂不用
+        dataSetInfo: [
+            {
+                name: 'XLD_FDSB_R2D',
+                title: '发电设备',
+                label: '发电设备'
+            },
+        ]
+        // XLD_FDSB_R2D
+        // XLD_SCAQSB_R2D
+        // XLD_SGSB_R2D
+        // XLD_SPJK_R2D
+    },
+    // 用于加载项目静态资源
+    sourceUrl: 'http://192.168.119.192:12002/twoThreeMap', //本地运行
+};

src/assets/bussinessMapConfig/comprehensive.ts

@@ -264,24 +264,24 @@ export const bussinessMapConfig = {
                 type: 'SCP',  //S3M  SCP 
                 subdomains:iserverConfig.subdomains
             },
-            {
-                id: 'fd_kq_ls_gldm',
-                url: iserverConfig.baseUrl + 'services/3D-TCGL/rest/realspace/datas/duanmian',
-                height: 0,
-                flyTo: false,
-                show: false,
-                type: 'SCP',  //S3M  SCP 
-                subdomains:iserverConfig.subdomains
-            },
-            {
-                id: 'fd_kq_ls_ldqdm',
-                url: iserverConfig.baseUrl + 'services/3D-TCGL/rest/realspace/datas/duanmian3',
-                height: 0,
-                flyTo: false,
-                show: false,
-                type: 'SCP',  //S3M  SCP
-                subdomains:iserverConfig.subdomains 
-            },
+            // {
+            //     id: 'fd_kq_ls_gldm',
+            //     url: iserverConfig.baseUrl + 'services/3D-TCGL/rest/realspace/datas/duanmian',
+            //     height: 0,
+            //     flyTo: false,
+            //     show: false,
+            //     type: 'SCP',  //S3M  SCP 
+            //     subdomains:iserverConfig.subdomains
+            // },
+            // {
+            //     id: 'fd_kq_ls_ldqdm',
+            //     url: iserverConfig.baseUrl + 'services/3D-TCGL/rest/realspace/datas/duanmian3',
+            //     height: 0,
+            //     flyTo: false,
+            //     show: false,
+            //     type: 'SCP',  //S3M  SCP
+            //     subdomains:iserverConfig.subdomains 
+            // },
             {
                 id: 'fd_kq_dz_hpt',
                 url: iserverConfig.baseUrl + 'services/3D-TCGL/rest/realspace/datas/huapo',

src/views/components/LayerControl/index.vue

@@ -16,19 +16,21 @@
           @check="onCheck"
         >
           <template #title="item">
-            <span>{{ item.title }}</span>
-            <span
-              class="pos-btn"
-              title="定位"
-              v-if="item.isLeaf && item.isFlyTo"
-              @click="handleModelPos($event, item)"
-            ></span>
-            <span
-              class="edit-btn"
-              v-if="item?.isEdit"
-              title="矢量数据维护"
-              @click="editVector(item)"
-            ></span>
+            <div class="layer-name" :title="item.title">{{ item.title }}</div>
+            <div class="tools-box">
+              <div
+                class="edit-btn"
+                v-if="item?.isEdit"
+                title="矢量数据维护"
+                @click="editVector($event,item)"
+              ></div>
+              <div
+                class="pos-btn"
+                title="定位"
+                v-if="item.isLeaf"
+                @click="handleModelPos($event, item)"
+              ></div>
+            </div>
           </template>
         </a-directory-tree>
       </div>
@@ -52,7 +54,6 @@ import { useMarker } from '/@/hooks/mapTool/useMarker';
 import { useMapToolsStore } from '/@/store/modules/mapTools';
 const mapToolsStore = useMapToolsStore();
 const { queryLayerBySql } = useLayerModify();
-const { removeMarker } = useMarker();
 
 export default defineComponent({
   components: {
@@ -142,20 +143,22 @@ export default defineComponent({
     };
 
     /**
-     * 编辑数据集
+     * 空间数据维护
      */
-    const editVector = (vector) => {
+    const editVector = (e, vector) => {
+      e.stopPropagation();
       let { dataRef, title } = vector;
       let model = dataRef.fusionLayers.model; //数据集
-      //删除之前打开的图层点
-      if (mapToolsStore.currentLayerName && mapToolsStore.currentLayerName !== '')
-        removeMarker(mapToolsStore.currentLayerName);
-      //removeMarker
-      mapToolsStore.setLayerToolsShow(!flag.value);
-      flag.value = !flag.value;
-      mapToolsStore.setCurrentLayerName(model);
-      //查询图层
-      queryLayerBySql(model);
+
+      let layerName = mapToolsStore.getCurrentLayerName;
+      // 如果点击相同图层，则关闭图层编辑
+      if (layerName === model) {
+        mapToolsStore.setLayerToolsShow(false);
+        mapToolsStore.setCurrentLayerName('');
+      } else {
+        mapToolsStore.setLayerToolsShow(true);
+        mapToolsStore.setCurrentLayerName(model);
+      }
     };
 
     onMounted(() => {
@@ -192,6 +195,16 @@ export default defineComponent({
           // }else{
           //     dem && addTerrain(dem)
           // }
+          // 如果是编辑图层
+          if (node.dataRef.isEdit && model) {
+            if (!node.checked) {
+              queryLayerBySql(model);
+            } else {
+              const { removeMarker } = useMarker();
+              removeMarker(model);
+            }
+            return;
+          }
           if (model) {
             window.map.showS3M(model, !node.checked);
           }
@@ -215,18 +228,23 @@ export default defineComponent({
 
     const handleModelPos = (e, item) => {
       e.stopPropagation();
-      if (item.data?.key) {
-        if (item.data.viewExtent) {
-          window.map.flyTo(item.data.viewExtent, 1.5);
-          return;
-        }
-        let layer = window.map.findS3M(item.data.key);
-        console.log(layer);
-        if (layer && layer.length) {
-          window.map.viewer.scene.camera.setView({
-            destination: new Cesium.Cartesian3.fromDegrees(layer[0].lon, layer[0].lat, 8000),
-          });
-        }
+      // if (item.data?.key) {
+      //   if (item.data.viewExtent) {
+      //     window.map.flyTo(item.data.viewExtent, 1.5);
+      //     return;
+      //   }
+      //   let layer = window.map.findS3M(item.data.key);
+      //   if (layer && layer.length) {
+      //     window.map.viewer.scene.camera.setView({
+      //       destination: new Cesium.Cartesian3.fromDegrees(layer[0].lon, layer[0].lat, 8000),
+      //     });
+      //   }
+      // }
+      if (item.fusionLayers && item.fusionLayers.layer2d && item.fusionLayers.layer2d.length > 0) {
+        window.map.showLayer2D(item.fusionLayers.layer2d[0], false, true);
+      }
+      if(item.fusionLayers && item.fusionLayers.model){
+        window.map.showLayer3D(item.fusionLayers.model, false, true);
       }
     };
 
@@ -252,7 +270,7 @@ export default defineComponent({
   padding-left: 10px;
   .fold-box {
     position: absolute;
-    top: 0;
+    top: 6px;
     right: 0;
     height: 40px;
     width: 40px;
@@ -273,14 +291,12 @@ export default defineComponent({
 
     .title {
       width: 100%;
-      // height: 40px;
+      height: 40px;
       display: flex;
       align-items: center;
       justify-content: center;
-      margin-bottom: 10px;
-      border-bottom: 1px solid gray;
       padding: 0 0 5px;
-
+      background: linear-gradient(180deg, rgba(22, 192, 255, 0) 0%, rgba(22, 192, 255, 0.7) 100%);
       .title-text {
         font-family: 思源黑体;
         font-size: 14px;
@@ -323,24 +339,35 @@ export default defineComponent({
           display: flex;
           align-items: center;
           width: auto;
-
-          .pos-btn {
-            position: absolute;
-            right: 10px;
-            display: flex;
-            height: 15px;
-            width: 15px;
-            cursor: pointer;
-            background: url('/@/assets/images/pos.png') no-repeat;
-            background-size: 100% 100%;
+          .layer-name {
+            height: auto;
+            width: 190px;
+            float: left;
+            max-width: 200px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
           }
-          .edit-btn {
+          .tools-box {
             position: absolute;
             right: 0;
-            height: 16px;
-            width: 16px;
-            background: url('/@/assets/images/mapTools/edit-b.png') no-repeat;
-            background-size: 100% 100%;
+            .pos-btn {
+              float: right;
+              height: 16px;
+              width: 16px;
+              cursor: pointer;
+              background: url('/@/assets/images/mapTools/loc.png') no-repeat;
+              background-size: 100% 100%;
+            }
+
+            .edit-btn {
+              float: right;
+              height: 16px;
+              width: 16px;
+              margin-left: 10px;
+              background: url('/@/assets/images/mapTools/edit-b.png') no-repeat;
+              background-size: 100% 100%;
+            }
           }
         }
         span {