From dc7a33f8aea88396c960b0cdd7802398d8141123 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 14 四月 2021 10:37:42 +0800
Subject: [PATCH] 固废搜索问题

---
 src/components/panel/topicSearch/SewersSearch.vue     |   22 ++++++-----
 src/components/panel/topicSearch/SolidWasteSearch.vue |   59 +++++++++++------------------
 2 files changed, 34 insertions(+), 47 deletions(-)

diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index dedb740..f32abb2 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -6,22 +6,24 @@
         <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"  :popper-class="'select-down'">
+              <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
+                         :popper-class="'select-down'">
                 <el-option
-                        v-for="item in items"
-                        :key="item.code"
-                        :label="item.name"
-                        :value="item.name">
+                    v-for="item in items"
+                    :key="item.code"
+                    :label="item.name"
+                    :value="item.name">
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item :label="form.pipelineType+'锛�'" size="mini">
-              <el-select style="width: 100%"  v-model="form.dataType"  @change="handleDataType" :popper-class="'select-down'">
+              <el-select style="width: 100%" v-model="form.dataType" :popper-class="'select-down'">
+                <!--  @change="handleDataType"-->
                 <el-option
-                        v-for="item in subItems"
-                        :key="item.code"
-                        :label="item.name"
-                        :value="item.name">
+                    v-for="item in subItems"
+                    :key="item.code"
+                    :label="item.name"
+                    :value="item.name">
                 </el-option>
               </el-select>
             </el-form-item>
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index 8649d6b..d68d1a7 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -16,12 +16,10 @@
           </el-select>
         </el-form-item>
         <el-radio-group v-model="form.type" class="levelOfRisk">
-          <el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span class="levelOfRisk-type">{{
-              item.name
-            }}</span>
+          <el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index">
+            <span class="levelOfRisk-type">{{ item.name }}</span>
           </el-radio>
         </el-radio-group>
-
         <div class="rightButtonSearch">
           <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
           <el-button class="el-icon-search" @click="handleSearch"></el-button>
@@ -45,27 +43,12 @@
 <script>
 
 import mapApi from '@/api/mapApi'
-import WfsHelper from '@components/helpers/WfsHelper'
 
 export default {
   name: 'SolidWasteSearch',
   props: ['title'],
   data () {
     return {
-      levelOfRisk: [
-        {
-          name: '鍏ㄩ儴',
-          value: '1'
-        },
-        {
-          name: '姝e父',
-          value: '2'
-        },
-        {
-          name: '棰勮',
-          value: '3'
-        }
-      ],
       judgeVisible: true,
       solidWasteTypeOptions: [{
         value: '1',
@@ -132,7 +115,20 @@
           key: 'length'
         }]
       }],
-      radio: '1',
+      levelOfRisk: [
+        {
+          name: '鍏ㄩ儴',
+          value: '1'
+        },
+        {
+          name: '姝e父',
+          value: '2'
+        },
+        {
+          name: '棰勮',
+          value: '3'
+        }
+      ],
       form: {
         keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
         // 鏁版嵁鐨勪紶閫�
@@ -144,11 +140,8 @@
   },
   methods: {
     setBounced (val) {
-      console.log(val)
-      const bound = this.L.geoJSON([val], {}).getBounds()
-      // var layer = window.layerFactory.flyByLayerId(val.id, bound)
-      window.map.flyToBounds(bound)
-      // layer && layer.openPopup()
+      const pos = [val.Latitude, val.Longitude]
+      window.map.flyTo(pos, 16)
     },
     handlePipelineType (val) {
       this.solidWasteTypeOptions.forEach(item => {
@@ -159,18 +152,10 @@
     },
     // 鐐瑰嚮鎼滅储瀹炵幇鏁版嵁鐨勬悳绱㈠睍绀�
     async handleSearch (data) {
-      // // console.log(this.form.keyword)
-      // const result = await mapApi.getSolidWaste(data)
-      // console.log(result)
-      // this.searchDataDisplay = result.Result.Result
-      var wfsHelper = new WfsHelper()
-      wfsHelper.addTypeName('鍥哄簾')
-      wfsHelper.addLike('name', this.form.keyword)
-      const res = await mapApi.getSolidWaste(wfsHelper.getUrl(), {})
-      console.log(res)
-      // if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
-      this.searchDataDisplay = res.Result.Result
-      // }
+      // console.log(this.form.keyword)
+      const result = await mapApi.getSolidWaste(data)
+      console.log(result)
+      this.searchDataDisplay = result.Result.DataInfo
     }
   }
 }

--
Gitblit v1.8.0