From 513e1bdf4b2703409d9e4dbb776e67ffa0c134a6 Mon Sep 17 00:00:00 2001
From: WX <1377869194@qq.com>
Date: 星期三, 13 九月 2023 09:52:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.92:8888/r/PM20230220027_Web

---
 src/views/layer/layerManage.vue |   37 ++++++++++++++++++++++++++++++++-----
 1 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/views/layer/layerManage.vue b/src/views/layer/layerManage.vue
index 647fa23..798f6c8 100644
--- a/src/views/layer/layerManage.vue
+++ b/src/views/layer/layerManage.vue
@@ -269,7 +269,29 @@
   // });
   // treeData = handleTree(menuOption, "id", "pid", "children");
 };
+const setRestLayerData = () => {
+  let son = estreeRef.value.getCheckedNodes().reverse();
+  server.delLayerAll();
 
+  var setGeoWms = [];
+  var url = null;
+  for (var i in son) {
+    var layerArr = son[i];
+    layerArr.checked = true;
+    if (layerArr.category == 2 && layerArr.type == 3) {
+      if (layerArr.tab != "moon:geo_mappable_unit") {
+        setGeoWms.push(layerArr.tab);
+        url = layerArr.url;
+      }
+    } else {
+      server.addTreeData(layerArr);
+    }
+  }
+  if (setGeoWms.length > 0) {
+    server.addGeoServerMmsLayers(setGeoWms, url);
+  }
+  store.commit("SET_CHECKLAYER", son);
+};
 const getLayer = async () => {
   store.state.restLayer = false;
   server.delLayerAll();
@@ -280,15 +302,18 @@
     });
     var std = [];
     var terrainId = null;
+    var adLayer = [];
     dt.result.filter((res) => {
       if (res.isLayer == 1 && res.isShow == 1) {
         if (res.type == 1 && res.data == 2) {
           if (!terrainId) {
             terrainId = res.id;
             std.push(res.id);
+            adLayer.push(res);
           }
         } else {
           std.push(res.id);
+          adLayer.push(res);
         }
       }
     });
@@ -299,19 +324,20 @@
     defaultLayer(dt.result);
     var setGeoWms = [];
     var url = null;
-    for (var i in dt.result) {
-      var layer = dt.result[i];
+
+    for (var i in adLayer) {
+      var layer = adLayer[i];
       if (layer.category == 2 && layer.type == 3) {
         if (layer.tab != "moon:geo_mappable_unit") {
           setGeoWms.push(layer.tab);
           url = layer.url;
         }
       } else {
-        server.addTreeData(layer);
+          server.addTreeData(layer);
       }
     }
     if (setGeoWms.length > 0) {
-      server.addGeoServerMmsLayers(setGeoWms.reverse(), url);
+      server.addGeoServerMmsLayers(setGeoWms, url);
     }
     //;
     nextTick(() => {
@@ -340,11 +366,12 @@
     return father.pid == 0; // 杩斿洖涓�绾ц彍鍗�
   });
 }
+
 watch(
   () => store.state.restLayer,
   (nVal, oVal) => {
     if (nVal) {
-      getLayer();
+      setRestLayerData();
     }
   },
   { deep: true }

--
Gitblit v1.9.3