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/BaseNav/pipeline/AffiliatedFacilities.vue |   13 ++++++++++++-
 src/conf/layers/LayerFsss.js                             |    6 ++----
 src/components/panel/topicSearch/SewersSearch.vue        |   36 +++++++++++++++---------------------
 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/components/BaseNav/pipeline/AffiliatedFacilities.vue b/src/components/BaseNav/pipeline/AffiliatedFacilities.vue
index a52abbb..87260dc 100644
--- a/src/components/BaseNav/pipeline/AffiliatedFacilities.vue
+++ b/src/components/BaseNav/pipeline/AffiliatedFacilities.vue
@@ -67,7 +67,6 @@
         keyword: ''
       },
       dataType: '',
-      classification: LayerFsss.layers,
       list: [],
       activeNum: -1
     }
@@ -82,11 +81,23 @@
       deep: true
     }
   },
+  computed: {
+    classification () {
+      const layers = LayerFsss.layers
+      console.log(layers)
+      const filtered = layers.filter(function (value, index, array) {
+        console.log(value)
+        return value.name !== '娴佸悜'
+      })
+      return filtered
+    }
+  },
   methods: {
     getImgSrc () {
       const icon = this.dataType.icon
       return icon ? 'assets/images/map/' + icon : ''
     },
+
     handleClose (done) {
       // this.$confirm('纭鍏抽棴锛�').then(_ => { done() }).catch(_ => {})
     },
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index fb291db..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"
@@ -127,19 +127,24 @@
       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()
   },
   methods: {
-    subItems () {
-      const layers = LayerPipeLines.layers
-      console.log(layers)
-      const filtered = layers.filter(function (value, index, array) {
-        console.log(value)
-        return value.name !== '娴佸悜'
-      })
-      return filtered
-    },
     // tab鍒囨崲
     handleClick (tab, event) {
       console.log(tab, event)
@@ -160,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 () {
diff --git a/src/conf/layers/LayerFsss.js b/src/conf/layers/LayerFsss.js
index caaea37..d46732e 100644
--- a/src/conf/layers/LayerFsss.js
+++ b/src/conf/layers/LayerFsss.js
@@ -25,8 +25,7 @@
       type: SERVICE_TYPE.WMS,
       typeName: 'sewer:fourlink',
       // wfs: WFS_URL + '?TYPENAME=鍥涢��',
-      icon: 'sewers/鍥涢��.png',
-      index: 3
+      icon: 'sewers/鍥涢��.png'
     },
     {
       code: 'tee',
@@ -37,8 +36,7 @@
       typeName: 'sewer:tee',
       type: SERVICE_TYPE.WMS,
       // wfs: WFS_URL + '?TYPENAME=涓夐��',
-      icon: 'sewers/涓夐��.png',
-      index: 3
+      icon: 'sewers/涓夐��.png'
     },
     {
       code: 'piperack',

--
Gitblit v1.8.0