From 49003d0eeae335ba72a89e9c1156237cdd02ebd8 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期二, 18 五月 2021 15:42:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/panel/topicSearch/SewersSearch.vue |   52 +++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index ba6c05b..db65213 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -32,14 +32,17 @@
             </div>
           </el-form>
         </div>
-        <el-scrollbar style="height:380.44px;">
-          <div class="environmental-risk-list" v-for="(item,index) in list" :key="index" :class="activeNum==index?'hover':''">
-            <img class="state" :src="getImgSrc()" style="background: none"/>
+        <el-scrollbar style="height:413px;">
+          <div class="environmental-risk-list" v-for="(item,index) in list" :key="index" :class="activeNum===index?'hover':''">
+            <img class="state" :src="getImgSrc()" style="background: none" />
             <div>
               <h3 @click="handleLocation(item,index)">{{ item.properties.pipename }}</h3>
-              <p>鎵�灞炰紒涓氾細<span>{{ item.properties.orgcode }}</span>
-              <p>璁炬柦绫诲瀷锛�<span>{{ item.properties.teetype }}</span>
-              <!--  <el-button v-if="fuShuSheShiShow" class="rt" size="mini" style="margin-right: 0.04rem" @click="btnAffiliatedFacilities(item)" >闄勫睘璁炬柦</el-button> -->
+              <p>鎵�灞炰紒涓氾細<span>{{ item.properties.orgname }}</span>
+              <p>璁炬柦绫诲瀷锛�<span>{{ item.properties.linenumtype }}</span>
+               <el-button v-if="fuShuSheShiShow" class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
+                          @click="btnAffiliatedFacilities(item,index)" >
+                 闄勫睘璁炬柦
+               </el-button>
               </p>
             </div>
           </div>
@@ -51,7 +54,6 @@
               :page-size=pageSize
               layout="prev, pager, next"
               :total=total
-              :current-page=current
               class="warnPagination"
           >
           </el-pagination>
@@ -84,6 +86,7 @@
 // 寮曞叆缁勪欢鍐呭
 import SewersAnalysis from '@components/panel/topicSearch/SewersSelect/SewersAnalysis'
 import SewersHistory from '@components/panel/topicSearch/SewersSelect/SewersHistory'
+import { fitBounds, highlight, locate } from '../../helpers/LocateHelper'
 
 export default {
   name: 'SewersSearch',
@@ -99,6 +102,7 @@
       list: [],
       items: [LayerPipeLines, LayerFsss, LayerHbss, LayerPk, LayerArea],
       subItems: LayerPipeLines.layers,
+      pageSize: 10,
       total: 0,
       form: {
         pipelineType: '绠＄嚎',
@@ -111,7 +115,9 @@
       isRouteHover: false,
       facilitiesParameter: null,
       fuShuSheShiShow: true,
-      activeNum: -1
+      fuShuSheShiPanelShow: true,
+      activeNum: -1,
+      wfsHelper: null
     }
   },
   props: ['title'],
@@ -123,10 +129,13 @@
     handleClick (tab, event) {
       console.log(tab, event)
     },
+    handlePage (page) {
+      this.wfsHelper.setPage(page)
+      this.handleSearch()
+    },
     // 璁炬柦绫诲瀷绛涢��
     handlePipelineType (val) {
       this.list = []
-      // debugger
       for (let i = 0; i < this.items.length; i++) {
         const item = this.items[i]
         if (val === item.name) {
@@ -141,29 +150,42 @@
     async handleSearch () {
       // console.log(this.form.dataType.sname, this.form.keyword)
       this.list = []
-      var wfsHelper = new WfsHelper()
+      this.wfsHelper.clearFilter()
       // todo 鐜板湪绠＄綉杩樻病鍖哄垎寮�绫诲瀷锛屽悗闈㈡敼
-      wfsHelper.addTypeName(this.form.dataType.sname)
-      wfsHelper.addLike('name', this.form.keyword)
+      this.wfsHelper.setTypeName([this.form.dataType.typeName])
+      if (this.form.keyword) {
+        this.wfsHelper.addLike('name', this.form.keyword)
+      }
       // const _this = this
-      const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
+      const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
       console.log(res)
       if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
+        this.total = res.totalFeatures
         this.list = res.features
       }
     },
     handleLocation (val, index) {
+      // console.log(val)
+      this.activeNum = index
+      // layer && layer.openPopup()
+      const config = this.form.dataType
+      locate(val, config)
+    },
+    btnAffiliatedFacilities (val, index) {
       this.activeNum = index
       this.facilitiesParameter = val
-      // layer && layer.openPopup()
       // 鍒ゆ柇閫夋嫨鏄惁鏄绾匡紝濡傛灉鏄垯鏄剧ず銆婇檮灞炶鏂姐�嬪脊妗�
       if (this.form.pipelineType === '绠＄嚎') {
         this.fuShuSheShiShow = true
       } else {
         this.fuShuSheShiShow = false
       }
-      window.layerFactory.flyByFeature(val, this.form.dataType.code)
+      fitBounds(val, this.form.dataType.code)
+      highlight(val)
     }
+  },
+  mounted () {
+    this.wfsHelper = new WfsHelper()
   }
 }
 </script>

--
Gitblit v1.8.0