From 4f35a8b56c12315c82fd5bd136f32da2dcadc5e2 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期二, 27 四月 2021 09:27:22 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/panel/topicSearch/SolidWasteSearch.vue |   78 ++++++++++++++++++++++++--------------
 1 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index 676551d..a57c29f 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -15,7 +15,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-radio-group v-model="form.type" class="levelOfRisk">
+        <el-radio-group v-model="form.transferData" class="levelOfRisk">
           <el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index">
             <span class="levelOfRisk-type">{{ item.name }}</span>
           </el-radio>
@@ -29,7 +29,8 @@
     <el-scrollbar style="height:286.22px">
       <div class="environmental-risk-list" v-for="(item,index) in searchDataDisplay" :key="index"
            @click="setBounced(item)">
-        <i class="state"></i>
+        <!--        <i class="state"></i>-->
+        <img src="../../../../public/assets/images/map/solidwaste/gf_green2.png" alt="" class="state">
         <div>
           <h3>###鐐煎寲閮�</h3>
           <p>鎵�灞為儴闂細<span>{{ item.Name }}</span></p>
@@ -43,6 +44,7 @@
 <script>
 
 import mapApi from '@/api/mapApi'
+import WasteSolidIndex from '@/components/BaseNav/WasteSolid/WasteSolidIndex'
 
 export default {
   name: 'SolidWasteSearch',
@@ -50,6 +52,33 @@
   data () {
     return {
       judgeVisible: true,
+      form: {
+        keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
+        // 鏁版嵁鐨勪紶閫�
+        transferData: 1
+      },
+      levelOfRisk: [
+        {
+          name: '鍏ㄩ儴',
+          value: 1
+        },
+        {
+          name: '姝ｅ父',
+          value: 2
+        },
+        {
+          name: '棰勮',
+          value: 3
+        }
+      ],
+      // 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
+      searchDataDisplay: [],
+      instance: null,
+      intervals: [],
+      layer: window.map,
+      L: window.L,
+      times: 5,
+      colors: ['#98FB98', '#ff0000'],
       solidWasteTypeOptions: [{
         value: '1',
         label: '鍖哄煙',
@@ -114,35 +143,11 @@
           label: '闀垮害(m)',
           key: 'length'
         }]
-      }],
-      levelOfRisk: [
-        {
-          name: '鍏ㄩ儴',
-          value: '1'
-        },
-        {
-          name: '姝ｅ父',
-          value: '2'
-        },
-        {
-          name: '棰勮',
-          value: '3'
-        }
-      ],
-      form: {
-        keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
-        // 鏁版嵁鐨勪紶閫�
-        transferData: ''
-      },
-      // 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
-      searchDataDisplay: []
+      }]
     }
   },
   methods: {
-    setBounced (val) {
-      const pos = [val.Latitude, val.Longitude]
-      window.map.flyTo(pos, 11)
-    },
+    // select鐨刼ption鐨勬暟鎹�夋嫨
     handlePipelineType (val) {
       this.solidWasteTypeOptions.forEach(item => {
         if (val === item.value) {
@@ -154,8 +159,23 @@
     async handleSearch (data) {
       // console.log(this.form.keyword)
       const result = await mapApi.getSolidWaste(data)
-      console.log(result)
       this.searchDataDisplay = result.Result.DataInfo
+    },
+    // 鏁版嵁灞曠ず,鐐瑰嚮杩涜寮规鍙婄偣鐨勫睍绀�
+    setBounced (val) {
+      console.log(val)
+      const pos = [val.Latitude, val.Longitude]
+      window.map.flyTo(pos, 15)
+      window.$layer.open({
+        content: {
+          content: WasteSolidIndex, // 缁勪欢
+          parent: this, // 鐖剁粍浠�
+          data: { // 浼犻�掔殑鍙傛暟
+            storagePlaceId: val.StoragePlaceId
+          }
+        },
+        title: val.Name
+      })
     }
   }
 }

--
Gitblit v1.8.0