From 3072da92f3c3f08b2ee0ca03ee4e74b12f545b0e Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 26 五月 2021 21:31:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/components/panel/topicSearch/GasWasteSearch.vue |   65 ++++++++++++++++++++------------
 1 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index b390331..57b7faa 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -48,6 +48,12 @@
           <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>
         <!--              <el-form-item >-->
+        <div class="page_total">
+          <p>鍏辫
+            <span>{{total}}</span>
+            鏉¤褰�
+          </p>
+        </div>
         <div class="rightButtonSearch">
           <el-input  v-model="form.keyword" size="mini"  placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
             <!-- <el-button slot="append" icon="el-icon-search" size="mini"></el-button>-->
@@ -64,11 +70,11 @@
       </el-form>
     </div>
     <el-scrollbar style="height:264px">
-      <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
-        <i class="state"></i>
+      <div class="environmental-risk-list" v-for="(item,index) in list" :key="index" @click="handleLocation(item)"><!--  -->
+        <img src="../../../../public/assets/images/map/exhaust/fq_green2.png" alt="" class="state"/>
         <div>
-          <h3>###鐐煎寲閮�</h3>
-          <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+          <h3>{{ item.Name }}</h3>
+          <p>鎵�灞為儴闂細<span>{{ item.porltName }}</span></p>
           <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
         </div>
       </div>
@@ -98,15 +104,19 @@
 
 <script>
 import mapApi from '@/api/mapApi'
+import WasteWaterIndex from '../../base-page/WasteWater/WasteWaterIndex'
+import { pulseEffect, setPanTo } from '../../../utils/utils'
 
-// import WfsHelper from '@components/helpers/WfsHelper'
 export default {
   name: 'GasWasteSearch',
+  props: ['title'],
   data () {
     return {
       gdVisible: true,
       list: [],
       total: 0,
+      // 鍒嗛〉
+      pageSize: 10,
       inareaTypeOptions: [],
       enterpriseTypeOptions: [],
       enterpriseSubunitsTypeOptions: [],
@@ -118,8 +128,6 @@
       },
       // pageSize: 10,
       // current: 1,
-      isWaybillHover: true,
-      isRouteHover: false,
       levelOfRisk: [
         { name: '鍏ㄩ儴', value: '1' },
         { name: '姝ｅ父', value: '2' },
@@ -129,8 +137,12 @@
       ]
     }
   },
-  props: ['title'],
   methods: {
+    // 椤甸潰鍒囨崲 鍒嗛〉鍔熻兘
+    handlePage (page) {
+      // this.wfsHelper.setPage(page)
+      this.handleSearch()
+    },
     // 鍖哄煙绛涢��
     areaType (val) {
       this.pipelineTypeOptions.forEach((itm) => {
@@ -157,24 +169,29 @@
         pipelineType: this.form.pipelineType,
         dataType: this.form.dataType
       }
-      console.log(param)
-      // var wfsHelper = new WfsHelper()
-      // wfsHelper.addTypeName(this.form.query.layerName)
-      // wfsHelper.addLike(this.form.query.key, this.form.keyword)
-      // const _this = this
-      // const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
-      const res = await mapApi.getWasteGas()
-      console.log(res)
-      if (res.data instanceof Object && Object.prototype.hasOwnProperty.call(res.data, 'features')) {
-        this.list = res.data.features
-      }
+      // console.log(param)
+      const res = await mapApi.getWasteGas(param)
+      // console.log(res)
+      this.list = res.Result.DataInfo
+      console.log(this.list)
     },
-    handleLocation (val) {
+    // 寮圭獥灞曠ず
+    async handleLocation (val) {
       console.log(val)
-      const bound = this.L.geoJSON([val], {}).getBounds()
-      var layer = window.serviceLayerHelper.getByLayerId(val.id)
-      layer && layer.openPopup()
-      this.$store.state.map.map.flyToBounds(bound)
+      const pos = [val.Latitude, val.Longitude]
+      window.map.setView(pos, 15)
+      window.$layer.open({
+        content: {
+          comp: WasteWaterIndex, // 缁勪欢
+          parent: this, // 鐖剁粍浠�
+          data: { // 浼犻�掔殑鍙傛暟
+            storagePlaceId: val
+          }
+        },
+        title: '澶╂触鐭冲寲  ' + val.Name
+      })
+      pulseEffect([val.Latitude, val.Longitude])
+      setPanTo(pos, 250)
     }
   }
 }

--
Gitblit v1.8.0