From 1a69110f3110360ca1d2ed83012faf9c1a92acce Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 13 五月 2021 15:10:10 +0800
Subject: [PATCH] 图层控制与搜索联动修改。

---
 src/components/panel/RightSearchPanel.vue                 |    8 +++++++-
 src/components/LayerController/modules/LcServiceLayer.vue |   29 ++++++++++++-----------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index 46a7391..ad6142f 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -7,12 +7,12 @@
                     <i class="downUp el-icon-caret-bottom" @click="item.isShow=!item.isShow" :class="item.isShow?'':'active'" ></i><!-- el-icon-arrow-down -->
                     <!-- 涓�绾у浘灞傞亶鍘� -->
                     <div style="padding-left:25px;padding-top:10px;color:#fff;font-size: 16px;">
-                        <input type="checkbox"  :class="item.type==1?'active':''" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code" @change="swAllLayers(item,'')"/>{{ item.name }}
+                        <input type="checkbox"  :class="item.type==1?'active':''" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code" @change="swAllLayers(item)"/>{{ item.name }}
                     </div>
                     <div class="layerbox-item" v-show="item.isShow">
                         <!-- 浜岀骇鍥惧眰閬嶅巻 -->
                         <div class="basemap-layer-item" v-for="(itm,index2) in item.layers" :key="index2">
-                            <input type="checkbox" :class="itm.type==1?'active':''" :name="'wmsSublayers_'+item.code+'_'+itm.code" :checked="itm.checked" :value="itm.code" @change="swAllLayers(itm,item.name)"/>{{ itm.name }}
+                            <input type="checkbox" :class="itm.type==1?'active':''" :name="'wmsSublayers_'+item.code+'_'+itm.code" :checked="itm.checked" :value="itm.code" @change="swAllLayers(itm)"/>{{ itm.name }}
                             <!-- 涓夌骇鍥惧眰閬嶅巻 -->
                             <div class="layerbox-item-3">
                                 <div class="basemap-layer-item" v-for="(layer,index3) in itm.layers" :key="index3">
@@ -21,7 +21,7 @@
                                            :name="'wmsSublayers_'+item.code+'_'+layer.code"
                                            :checked="layer.checked"
                                            :value="layer.code"
-                                           @change="swAllLayers(layer,'')"/>
+                                           @change="swAllLayers(layer)"/>
                                     <span :style="'color:'+layer.color">{{ layer.name }}</span>
                                 </div>
                             </div>
@@ -48,20 +48,11 @@
   mounted () {
   },
   methods: {
-    swAllLayers (item, v) {
+    swAllLayers (item) {
       // eslint-disable-next-line no-debugger
       item.checked = !item.checked
       this.toggleLayer(item)
       this.swLayers(item.layers, item.checked)
-      // 鍒ゆ柇鏄惁鏄偣鍑� 涓撻鍥惧眰 涓嬬殑瀛愯妭鐐�
-      if (v === '涓撻鍥惧眰') {
-        bus.$emit('changeSearchBar', item)
-      }
-      // 鍒ゆ柇鏄惁鐐瑰嚮鐨� 涓�绾т笓棰樺浘灞�
-      if (item.name === '涓撻鍥惧眰') {
-        console.log(item, '88888888888888')
-      }
-
       this.serviceLayers.forEach(function (item1, index1) {
         if (item1.layers) {
           item1.istrue = 0
@@ -83,22 +74,26 @@
               } else {
                 item2.type = 1
               }
+              if (item1.name === '涓撻鍥惧眰') {
+                bus.$emit('changeSearchBar', item2)
+                // console.log(item2, 'item2')
+              }
               if (item2.checked) { item1.istrue += 1 } else { item1.isfalse += 1 }
             }
           })
           if (item1.istrue === item1.layers.length) {
-            item1.type = 2
+            item1.type = 2 // 鍏ㄩ��
             item1.checked = true
           } else if (item1.isfalse === item1.layers.length) {
-            item1.type = 0
+            item1.type = 0 // 涓嶉��
             item1.checked = false
           } else {
-            item1.type = 1
+            item1.type = 1 // 鍗婇��
           }
           // console.log(item1.layers.length, item1.istrue, item1.isfalse, item1.type)
         }
       })
-      console.log(this.serviceLayers)
+      // console.log(this.serviceLayers)
     },
     swLayers (layers, checked) {
       if (layers) {
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index fd8749e..cf00cb3 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -221,7 +221,13 @@
       that.gcComp = ''
       that.topicList.forEach((item) => {
         if (item.name === obj.name) {
-          item.isShow = obj.checked
+          // console.log(obj)
+          if (obj.type > 0) {
+            item.isShow = true
+          } else {
+            item.isShow = false
+          }
+          // item.isShow = obj.checked
           if (item.isShow) {
             that.selected(item)
           } else {

--
Gitblit v1.8.0