From 73c8d3f55d5a675174a61342f3cea712ed5bc0eb Mon Sep 17 00:00:00 2001
From: QibolinCzp <qibolin02429@126.com>
Date: 星期五, 14 五月 2021 10:49:54 +0800
Subject: [PATCH] 问题修改

---
 src/components/panel/topicSearch/GasWasteSearch.vue |   86 ++++++-------------------------------------
 1 files changed, 12 insertions(+), 74 deletions(-)

diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index b4d485f..ad63218 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -98,16 +98,14 @@
 
 <script>
 import mapApi from '@/api/mapApi'
-import publicBounced from '@/components/BaseNav/PublicBounced/PublicBounced'// import WfsHelper from '@components/helpers/WfsHelper'
-import ImagGreen from '../../../../public/assets/images/map/exhaust/fq_green2.png'
+import WasteWaterIndex from '../../BaseNav/WasteWater/WasteWaterIndex'
+
 export default {
   name: 'GasWasteSearch',
+  props: ['title'],
   data () {
     return {
-      layer: window.map,
-      L: window.L,
       gdVisible: true,
-      instance: null,
       list: [],
       total: 0,
       inareaTypeOptions: [],
@@ -121,8 +119,6 @@
       },
       // pageSize: 10,
       // current: 1,
-      isWaybillHover: true,
-      isRouteHover: false,
       levelOfRisk: [
         { name: '鍏ㄩ儴', value: '1' },
         { name: '姝e父', value: '2' },
@@ -132,7 +128,6 @@
       ]
     }
   },
-  props: ['title'],
   methods: {
     // 鍖哄煙绛涢��
     areaType (val) {
@@ -171,73 +166,16 @@
       console.log(val)
       const pos = [val.Latitude, val.Longitude]
       window.map.flyTo(pos, 15)
-      const positionX = val.Latitude
-      const positionY = val.Longitude
-
-      // 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚� 1.鎺ュ彛鎺ュ彛鏁版嵁鏉ヨ繘琛屾暟鎹殑鍒ゆ柇 2.鏍规嵁鏁版嵁绫诲瀷鐨勪笉鍚岋紝杩涜涓嶅悓绫诲瀷鐨勫浘鐗囨樉绀�
-      const ContrLevel = val.ContrLevel
-      var iconUrl = this.differentTypes(ContrLevel)
-
-      const marker = this.L.marker([positionX, positionY], {
-        icon: this.L.icon({
-          iconUrl: iconUrl,
-          iconSize: [30, 30],
-          iconAnchor: [15, 15]
-        })
+      window.$layer.open({
+        content: {
+          content: WasteWaterIndex, // 缁勪欢
+          parent: this, // 鐖剁粍浠�
+          data: { // 浼犻�掔殑鍙傛暟
+            storagePlaceId: val
+          }
+        },
+        title: '澶╂触鐭冲寲  ' + val.Name
       })
-      this.layer.addLayer(marker)
-      const t1 = setTimeout(async () => {
-        const dataValue = {
-          StoragePlaceId: val.StoragePlaceId
-        }
-        // 寮规鏍囬
-        const title = val
-        console.log(title)
-        // 鍩烘湰淇℃伅 tabs
-        const result = await mapApi.getWasteGas(dataValue)
-        const GasOnlinedata = {
-          onLineMonEmissPointId: '23',
-          monItemId: '28,31',
-          beginTime: '2020-04-06 15:13:20',
-          endTime: '2020-04-07 15:13:20',
-          dataType: '1'
-        }
-        const GasManualData = {
-          companyId: '3900100145',
-          labMonPointId: '219',
-          beginTime: '2020-04-06 15:13:20',
-          endTime: ' 2020-04-07 15:13:20'
-        }
-        const ManualData = await mapApi.getWasteGasManualData(GasManualData)
-        const Mondata = await mapApi.getWasteGasMonData(GasOnlinedata)
-        // 缁戝畾寮规瀹炰緥
-        this.instance && this.instance.closePopup()
-        const PublicBounced = window.Vue.extend(publicBounced)
-        this.instance = new PublicBounced().$mount()
-        document.body.appendChild(this.instance.$el)
-        // document.body.removeChild(instance.$el)
-        // 閫氳繃鏂规硶 鍚戠粦瀹氬脊妗嗕紶閫掓暟鎹�
-        this.instance.setGasData(title, result.Result.DataInfo, Mondata.Result.DataInfo, ManualData.Result.DataInfo, 'feiqi')
-        // console.log(title, result.Result.DataInfo, Mondata.Result.DataInfo, ManualData.Result.DataInfo)
-        // this.setPanTo(pos, 250)
-      }, 100)
-      console.log(t1)
-    },
-    // 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
-    differentTypes (ContrLevel) {
-      // effectOfChange
-      /*
-       if (ContrLevel === 1) {
-         effectOfChange = ImgBlue
-       } else if (ContrLevel === 2) {
-      */
-      const effectOfChange = ImagGreen
-      // } else if (ContrLevel === 3) {
-      //   effectOfChange = ImagBright
-      // } else {
-      //   effectOfChange = ImgGray
-      // }
-      return effectOfChange
     }
   }
 }

--
Gitblit v1.8.0