From 81e462c9578834d32a30f939d940fb674f1e29f8 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期五, 21 五月 2021 17:35:54 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/panel/topicSearch/SewersSearch.vue |   45 ++++++++++++++++++++++++---------------------
 1 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 3976569..f2e157a 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -6,7 +6,7 @@
                 <div class="search-panel ">
                     <el-form ref="form" :model="form" label-width="90px" class="search-form">
                         <el-form-item label="璁炬柦绫诲瀷锛�" size="mini" class="search-panel-item">
-                            <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
+                            <el-select style="width: 100%" v-model="form.pipelineType"
                                        :popper-class="'select-down'">
                                 <el-option
                                         v-for="item in items"
@@ -38,7 +38,8 @@
                          :class="activeNum===index?'hover':''">
                         <img class="state" :src="getImgSrc()" style="background: none"/>
                         <div>
-                            <h3 @click="handleLocation(item,index)">{{ item.properties.name || item.properties.code }}</h3>
+                            <h3 @click="handleLocation(item,index)">{{ item.properties.name || item.properties.code
+                                }}</h3>
                             <p>鎵�灞炰紒涓氾細<span>{{ item.properties.orgname }}</span>
                             <p>璁炬柦绫诲瀷锛�<span>{{ item.properties.type }}</span>
                                 <el-button v-if="fuShuSheShiShow" class="rt btn00fff6" size="mini"
@@ -111,7 +112,6 @@
       list: [],
       // 鍥惧眰鎺у埗
       items: [LayerPipeLines, LayerFsss, LayerHbss, LayerPk, LayerArea],
-      subItems: LayerPipeLines.layers,
       // 鍒嗛〉
       pageSize: 10,
       total: 0,
@@ -127,6 +127,20 @@
       wfsHelper: null
     }
   },
+  computed: {
+    subItems () {
+      const val = this.form.pipelineType
+      for (let i = 0; i < this.items.length; i++) {
+        const item = this.items[i]
+        if (val === item.name) {
+          return item.layers.filter(function (value, index, array) {
+            return value.name !== '娴佸悜'
+          })
+        }
+      }
+      return []
+    }
+  },
   mounted () {
     this.wfsHelper = new WfsHelper()
   },
@@ -134,13 +148,13 @@
     // tab鍒囨崲
     handleClick (tab, event) {
       console.log(tab, event)
-      if (tab.label === '鍒嗘瀽') {
-        // 鍏抽棴寮圭獥
-        window.mapManager.clickDialogSwitch = false
-      } else {
-        // 鎵撳紑寮圭獥
-        window.mapManager.clickDialogSwitch = true
-      }
+      // if (tab.label === '鍒嗘瀽') {
+      //   // 鍏抽棴寮圭獥
+      //   window.mapManager.clickDialogSwitch = false
+      // } else {
+      //   // 鎵撳紑寮圭獥
+      //   window.mapManager.clickDialogSwitch = true
+      // }
     },
     // 鏍规嵁杩斿洖鏁版嵁 纭灞曠ず鍥剧墖
     getImgSrc () {
@@ -151,17 +165,6 @@
     handlePage (page) {
       this.wfsHelper.setPage(page)
       this.handleSearch()
-    },
-    // 璁炬柦绫诲瀷绛涢��
-    handlePipelineType (val) {
-      this.list = []
-      for (let i = 0; i < this.items.length; i++) {
-        const item = this.items[i]
-        if (val === item.name) {
-          this.subItems = item.layers
-          return
-        }
-      }
     },
     // 浜岀骇form琛ㄥ崟鍒囨崲閫夋嫨娓呯┖宸查�夋嫨鏁版嵁
     handleDataType () {

--
Gitblit v1.8.0