From 9f51306b10520a2be30bedfe1b34c288cf770f43 Mon Sep 17 00:00:00 2001
From: surprise <15810472099@163.com>
Date: 星期四, 19 十月 2023 17:51:30 +0800
Subject: [PATCH] 坡度坡向功能新增,临时图层添加定位。空间查询功能优化;

---
 src/views/layer/layerManage.vue |   45 +++++++++++++++++++++++++++++++++++----------
 1 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/views/layer/layerManage.vue b/src/views/layer/layerManage.vue
index c405184..9383194 100644
--- a/src/views/layer/layerManage.vue
+++ b/src/views/layer/layerManage.vue
@@ -44,6 +44,8 @@
                       @click.native="clickdTemporary(1, data)">缂栬緫</el-dropdown-item>
                     <el-dropdown-item v-if="data.shpType == 'temporaryLayer'"
                       @click.native="clickdTemporary(2, data)">鍒犻櫎</el-dropdown-item>
+                    <el-dropdown-item v-if="data.shpType == 'temporaryLayer'"
+                      @click.native="clickdTemporary(3, data)">瀹氫綅</el-dropdown-item>
                   </el-dropdown-menu>
                 </template>
               </el-dropdown>
@@ -117,6 +119,10 @@
 const temporary = ref(new Date().getTime());
 const clickdTemporary = async (res, data) => {
   if (res == 1) {
+    let son = estreeRef.value.getCheckedKeys()
+    if(son.indexOf(data.id)<0){
+         return ElMessage(data.cnName+"鍥惧眰娌℃湁鍕鹃��,鏃犳硶杩涜缂栬緫");
+    }
     if (store.state.editTemporaryId) {
       var id = store.state.editTemporaryId;
       var edit_id = sgworld.Creator.SimpleGraphic.SimpleGraphicObj.indexOf(id);
@@ -130,7 +136,7 @@
     sgworld.Creator.SimpleGraphic.edit(true, {
       editProp: false, tipText: {
         ActiveText: '鐐瑰嚮婵�娲荤紪杈�'
-      }
+      }, enableDelete: false
     });
   } else if (res == 2) {
     var layerId = []
@@ -167,6 +173,12 @@
       }
       estreeRef.value.setCheckedKeys(layerIds, true);
     })
+  } else if(res == 3){
+    let son = estreeRef.value.getCheckedKeys()
+    if(son.indexOf(data.id)<0){
+         return ElMessage(data.cnName+"鍥惧眰娌℃湁鍕鹃��,鏃犳硶杩涜瀹氫綅");
+    }
+    temporaryTool.locationTemporaryLayer(data);
   }
 };
 //閫夋嫨鍥惧眰
@@ -174,6 +186,10 @@
   layerAttributeIsshow.value = false;
   layerDetailIsshow.value = false;
   let isCheck = checked.checkedKeys.indexOf(data.id) > -1;
+  nextTick(() => {
+    let son = estreeRef.value.getCheckedNodes();
+    store.commit("SET_CHECKLAYER", son);
+  });
   if (isCheck) {
     if (data.isLayer == 0) {
       let son = estreeRef.value.getCheckedNodes().reverse();
@@ -202,9 +218,7 @@
         }
       }
     }
-
   } else {
-
     if (data.isLayer == 0) {
       var layers = data.children;
       for (var i in layers) {
@@ -224,6 +238,7 @@
     }
 
   }
+ 
 };
 const setVisiable = (treeNode, checked) => {
   if (checked !== undefined) {
@@ -288,17 +303,27 @@
 const getCheckedLayerPID = (res, result) => {
   var temp = [];
   var ids = result
+
   let forFn = (data) => {
-    data.children.forEach(item => {
-      if (item.children) {
-        temp.push(item.id)
-      } else {
-        if (ids.indexOf(item.id) > -1) {
-          temp.push(item.id)
+    if (data.children) {
+      data.children.forEach(item => {
+        if (item.children) {
+          forFn(item)
+        } else {
+          if (ids.indexOf(item.id) > -1) {
+            temp.push(item.id)
+          }
         }
+      })
+    } else {
+
+      if (ids.indexOf(data.id) > -1) {
+        temp.push(data.id)
       }
-    })
+    }
+
   }
+  
   forFn(res);
   return temp;
 };

--
Gitblit v1.9.3