From f6e2c7d08bb4f29f38a77b9f789c6d7a47d5bebe Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期五, 14 五月 2021 11:20:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue |   59 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
index f8df59b..5a88c59 100644
--- a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
+++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
@@ -30,7 +30,7 @@
                             v-for="item in subItems"
                             :key="item.code"
                             :label="item.name"
-                            :value="item.name">
+                            :value="item">
                     </el-option>
                 </el-select>
             </el-form-item>
@@ -42,7 +42,7 @@
         <el-scrollbar style="height:286.22px">
             <div class="environmental-risk-list" v-for="(item,index) in list" :key="index"
                  :class="activeNum===index?'hover':''" @click="handleLocation(item,index)">
-                <img class="state" :src="getImgSrc()" style="background: none"/>
+                <img class="state" :src="getImgSrc(item.properties.type)" style="background: none"/>
                 <h3>璧勬簮绫诲瀷:{{item.properties.adminzonename}}</h3>
                 <h5>璧勬簮鍚嶇О:{{item.properties.type}}</h5>
                 <p>璐熻矗浜�:<span>{{item.properties.resperson}}</span></p>
@@ -53,9 +53,12 @@
 </template>
 
 <script>
-// import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer'
 import WfsHelper from '@components/helpers/WfsHelper'
 import AjaxUtils from '@utils/AjaxUtils'
+
+// import { LayerEmergency } from '../../../../../conf/LayerEmergency'
+import { LayerEmergencySource } from '../../../../../conf/layers/LayerEmergencySource'
+import { LayerSurroundings } from '../../../../../conf/layers/LayerSurroundings'
 
 export default {
   name: 'ResourcesQuery',
@@ -63,7 +66,7 @@
     return {
       form: {
         eventName: '',
-        pipelineType: '璧勬簮绫诲瀷',
+        pipelineType: '搴旀�ヨ祫婧�',
         dataType: '',
         keyword: '',
         eventNameList: [
@@ -73,11 +76,8 @@
       },
       activeNum: -1,
       list: [],
-      // items: [LayerEntEmer],
-      items: [{ name: '搴旀�ヨ祫婧�' }, { name: '鍛ㄨ竟鐜' }],
-      // subItems: LayerEntEmer.layers,
-      subItems: [{ name: '鍏ㄩ儴璧勬簮' }, { name: '搴旀�ョ墿璧�' }, { name: '搴旀�ヨ溅杈�(鑸�)' }, { name: '搴旀�ラ槦浼�(鍚秷闃插崟浣�)' }],
-      subItemsT: [{ name: '鍏ㄩ儴鐜' }, { name: '鍖婚櫌' }, { name: '瀛︽牎' }, { name: '姘翠綋' }, { name: '鑷劧淇濇姢鍖�' }, { name: '鏁忔劅鐩爣' }],
+      items: [LayerEmergencySource, LayerSurroundings],
+      subItems: LayerEmergencySource.layers || LayerSurroundings.layers,
       WfsHelper: null
     }
   },
@@ -85,28 +85,42 @@
     this.wfsHelper = new WfsHelper()
   },
   methods: {
-    getImgSrc () {
-      const icon = this.form.dataType.icon
-      return icon ? 'assets/images/map/' + icon : ''
+    getImgSrc (type) {
+      // console.log(type)
+      // const icon = this.form.dataType.icon
+      return 'assets/images/map/sewers/' + type + '.png'
     },
-    handlePipelineType () {
-      // console.log('item')
+    handlePipelineType (val) {
+      // console.log(val)
+      this.list = []
+      for (let i = 0; i < this.items.length; i++) {
+        const item = this.items[i].name
+        if (val === item.name) {
+          this.subItems = item.layers
+          return
+        }
+      }
       if (this.form.pipelineType === '搴旀�ヨ祫婧�') {
-        this.form.pipelineType = '璧勬簮绫诲瀷'
-      }
-      if (this.form.pipelineType === '鍛ㄨ竟鐜') {
-        this.subItems = this.subItemsT
+        this.subItems = LayerEmergencySource.layers
+      } else if (this.form.pipelineType === '鍛ㄨ竟鐜') {
+        this.subItems = LayerSurroundings.layers
       }
     },
-    handleDataType () {
-      console.log('item')
+    handleDataType (val) {
+      console.log(val)
+      this.list = []
     },
     async handleSearch () {
       this.list = []
       this.wfsHelper.clearFilter()
       // todo 鐜板湪浼佷笟搴旀�ヨ繕娌″尯鍒嗗紑绫诲瀷锛屽悗闈㈡敼
+      // console.log(this.form.dataType)
       // this.wfsHelper.setTypeName([this.form.dataType.typeName])
       this.wfsHelper.setTypeName(['sewer:emergency'])
+      this.wfsHelper.setMaxFeatures(100)
+      if (this.form.dataType) {
+        this.wfsHelper.addEquals('type', '\'' + this.form.dataType.name + '\'')
+      }
       if (this.form.keyword) {
         this.wfsHelper.addLike('name', this.form.keyword)
       }
@@ -116,16 +130,13 @@
       }
     },
     handleLocation (val, index) {
-      console.log(val)
       this.activeNum = index
-      // layer && layer.openPopup()
-      // window.layerFactory.flyByFeature(val, this.form.dataType.code)
       window.map.flyTo([val.properties.y, val.properties.x], 15)
     }
   }
 }
 </script>
 
-<style scoped>
+<style lang="less" scoped>
 
 </style>

--
Gitblit v1.8.0