From 93850b9aee34d3a66c2770a1eb0435ce104e772f Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 15 四月 2021 15:20:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

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

diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index d98e78a..5da507e 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -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>
@@ -44,6 +45,7 @@
 
 import mapApi from '@/api/mapApi'
 import publicBounced from '@/components/BaseNav/PublicBounced/PublicBounced'
+import defaultImg from '../../../../public/assets/images/map/solidwaste/gf_green2.png'
 
 export default {
   name: 'SolidWasteSearch',
@@ -51,6 +53,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: '鍖哄煙',
@@ -115,34 +144,7 @@
           label: '闀垮害(m)',
           key: 'length'
         }]
-      }],
-      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']
+      }]
     }
   },
   methods: {
@@ -151,11 +153,42 @@
       // console.log(this.form.keyword)
       const result = await mapApi.getSolidWaste(data)
       this.searchDataDisplay = result.Result.DataInfo
+      console.log(this.searchDataDisplay)
+    },
+    // 涓嶅悓绫诲瀷鍥剧墖灏佽
+    differentTypes (judgeValue) {
+      var effectOfChange
+      if (judgeValue === 1) {
+        effectOfChange = defaultImg
+      } else {
+        effectOfChange = defaultImg
+      }
+      return effectOfChange
     },
     // 鏁版嵁灞曠ず,鐐瑰嚮杩涜寮规鍙婄偣鐨勫睍绀�
     async setBounced (val) {
       const pos = [val.Latitude, val.Longitude]
       window.map.flyTo(pos, 11)
+      // 寰幆閬嶅巻鏁版嵁 鏍规嵁杩涜marker 鐨勫垱寤�
+      // for (let i = 0; i < this.searchDataDisplay.length; i++) {
+      // 缁忕含搴� 浣嶇疆
+      const positionX = val.Latitude
+      const positionY = val.Longitude
+
+      // 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚� 1.鎺ュ彛鎺ュ彛鏁版嵁鏉ヨ繘琛屾暟鎹殑鍒ゆ柇 2.鏍规嵁鏁版嵁绫诲瀷鐨勪笉鍚岋紝杩涜涓嶅悓绫诲瀷鐨勫浘鐗囨樉绀�
+      const judgeValue = val.StorageQty
+      var iconUrl = this.differentTypes(judgeValue)
+
+      const marker = this.L.marker([positionX, positionY], {
+        // totransferData: this.searchDataDisplay[i],
+        icon: this.L.icon({
+          iconUrl: iconUrl,
+          iconSize: [30, 30],
+          iconAnchor: [15, 15]
+        })
+      })
+      this.layer.addLayer(marker)
+      // }
       const t1 = setTimeout(async () => {
         const dataValue = {
           StoragePlaceId: val.StoragePlaceId

--
Gitblit v1.8.0