From d610d8743c112be221399d18c14a93fb956cd6d2 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 13 五月 2021 17:40:17 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/panel/RightSearchPanel.vue                                            |    3 +--
 src/conf/Constants.js                                                                |    1 -
 src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue |   29 ++++++++++++++++++++++-------
 src/components/LayerController/modules/LcServiceLayer.vue                            |    6 +++++-
 src/conf/LayerEmergency.js                                                           |    2 +-
 5 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index 7ec8aa9..4bd7e82 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -90,10 +90,14 @@
           } else {
             item1.type = 1 // 鍗婇��
           }
+          if (item1.name === '浼佷笟搴旀��') {
+            console.log(item1)
+            bus.$emit('changeSearchBar', item1)
+          }
           // 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 cf00cb3..3c1ee1e 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -217,11 +217,9 @@
   mounted () {
     const that = this
     bus.$on('changeSearchBar', function (obj) {
-      // console.log(obj.checked, obj.name)
       that.gcComp = ''
       that.topicList.forEach((item) => {
         if (item.name === obj.name) {
-          // console.log(obj)
           if (obj.type > 0) {
             item.isShow = true
           } else {
@@ -236,6 +234,7 @@
         }
       })
     })
+  //  console.log(that.topicList)
   }
 }
 </script>
diff --git a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
index f8df59b..4a7ece9 100644
--- a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
+++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
@@ -89,7 +89,16 @@
       const icon = this.form.dataType.icon
       return icon ? 'assets/images/map/' + icon : ''
     },
-    handlePipelineType () {
+    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
+          return
+        }
+      }
       // console.log('item')
       if (this.form.pipelineType === '搴旀�ヨ祫婧�') {
         this.form.pipelineType = '璧勬簮绫诲瀷'
@@ -98,8 +107,9 @@
         this.subItems = this.subItemsT
       }
     },
-    handleDataType () {
-      console.log('item')
+    handleDataType (val) {
+      console.log(val)
+      this.list = []
     },
     async handleSearch () {
       this.list = []
@@ -107,25 +117,30 @@
       // todo 鐜板湪浼佷笟搴旀�ヨ繕娌″尯鍒嗗紑绫诲瀷锛屽悗闈㈡敼
       // this.wfsHelper.setTypeName([this.form.dataType.typeName])
       this.wfsHelper.setTypeName(['sewer:emergency'])
+      if (this.form.dataType) {
+        if (this.form.dataType === '鍏ㄩ儴鐜' || this.form.dataType === '鍏ㄩ儴璧勬簮' || this.form.dataType === '') {
+
+        } else {
+          this.wfsHelper.addEquals('type', '\'' + this.form.dataType + '\'')
+        }
+      }
       if (this.form.keyword) {
         this.wfsHelper.addLike('name', this.form.keyword)
       }
       const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
+      console.log(res)
       if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
         this.list = res.features
       }
     },
     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>
diff --git a/src/conf/Constants.js b/src/conf/Constants.js
index 6171d54..4b29334 100644
--- a/src/conf/Constants.js
+++ b/src/conf/Constants.js
@@ -20,7 +20,6 @@
   sewersAreaGs: 'Company.js',
   pipesegment: 'PipeLineAnimal.js',
   pollutionSources: 'SourcesPollution.js'
-  // EnterpriseEmergency: 'EnterpriseEmergency.js'
 }
 
 export const STYLES = {
diff --git a/src/conf/LayerEmergency.js b/src/conf/LayerEmergency.js
index e272e9d..6dff372 100644
--- a/src/conf/LayerEmergency.js
+++ b/src/conf/LayerEmergency.js
@@ -6,7 +6,7 @@
 
 export const LayerEmergency = {
   code: 'sewersEmergency',
-  name: '搴旀�ュ浘灞�',
+  name: '浼佷笟搴旀��',
   checked: false,
   isShow: true,
   type: 0,

--
Gitblit v1.8.0