From eb614290eec26a4e6d1f47e618caf2cd6b461aed Mon Sep 17 00:00:00 2001
From: 李红刚 <p-honggang.li@pcitc.com>
Date: 星期四, 25 三月 2021 15:08:00 +0800
Subject: [PATCH] 1.修改缺少popup-gas airQuily.json文件导致报错问题

---
 src/views/MapTemplate.vue |  114 --------------------------------------------------------
 1 files changed, 1 insertions(+), 113 deletions(-)

diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index e40f80b..68b58e4 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="full-screen">
     <popup ref="popup" @callPopup="callPopup"></popup>
-    <popup-gas ref="popupGas" @popupgas="popupgas"></popup-gas>
     <div id="map" ref="rootmap">
     </div>
     <sgis-layer-controller :preset="'warningPreset'">
@@ -24,7 +23,6 @@
 import 'leaflet/dist/leaflet.css'
 import Sgis from '@src/Sgis'
 // import Vue from 'vue'
-import creatPopup from './creatPopup.js'
 // import mapConfig from '@/conf/MapConfig'
 import SgisLayerController from '@components/LayerController/LayerController'
 import LcBasemap from '@components/LayerController/modules/LcBaseMap'
@@ -37,7 +35,6 @@
 // import MenuSpecial from '@components/panel/MenuTopic'
 import LegendPanel from '@components/panel/LegendPanel'
 import Enterprise from '../components/table/enterprise'
-import PopupGas from '@/components/flueGas/popup-gas'
 
 export default {
   name: 'MapTemplate',
@@ -52,8 +49,7 @@
     LcBasemap,
     LcServiceLayer,
     Popup,
-    summarySheets,
-    PopupGas
+    summarySheets
   },
   data () {
     return {
@@ -107,114 +103,6 @@
       // this.setBasemapHelper(this.basemapHelper)
       // this.setServiceLayerHelper(this.serviceLayerHelper)
       // this.setVectorLayerHelper(this.vectorLayerHelper)
-      import('@/assets/airQuality.json').then(res => {
-      // this.addMarker()
-        this.addMarker(res.features)
-      })
-      // console.log(this.L)
-    },
-    addMarker (arr) {
-      const L = this.L
-      var icon = new L.Icon({
-        iconUrl: 'assets/images/map/marker-icon.png',
-        shadowUrl: 'assets/images/map/marker-shadow.png',
-        iconSize: [25, 41],
-        iconAnchor: [12, 41],
-        popupAnchor: [1, -34],
-        shadowSize: [41, 41]
-      })
-      // 00000000000000000000
-      var marker = L.marker([32.222, 118.7843], {
-        icon: icon
-      }).addTo(this.map)
-        .bindPopup(() => this.$refs.popup.$el, {
-          className: 's-map-popup',
-          minWidth: 300,
-          closeButton: false,
-          autoClose: false
-        })
-        .bindTooltip('瀛椾綋鍏夋檿鏁堟灉t.', {
-          // permanent : true,
-          offset: [0, 0], // 鍋忕Щ
-          direction: 'right', // 鏀剧疆浣嶇疆
-          // sticky:true,//鏄惁鏍囪鍦ㄧ偣涓婇潰
-          className: 'anim-tooltip'// CSS鎺у埗
-        })
-      marker.on('popupopen', this.onLayerClick)
-      // 000000000000000000
-      // 搴熸皵
-      // const MagicMarker = new L.marker.magic([32.226, 118.7848], {
-      //   iconUrl: 'assets/images/map/marker-icon.png',
-      //   magic: 'vanishIn'
-      // }).addTo(this.map)
-      arr.forEach(item => {
-        const { geometry: { coordinates } } = item
-        const coordinate = coordinates.map(item => parseFloat(item))
-        const data = creatPopup({ isShow: true, tirm: '666' })
-        console.log(item.properties.name)
-        // console.log(coordinate)
-        L.marker(coordinate, { icon: icon }).addTo(this.map).bindPopup(() => data, {
-          className: 's-map-popup',
-          minWidth: 300,
-          closeButton: false,
-          autoClose: false
-        }).bindTooltip(item.properties.name, {
-          // permanent : true,
-          offset: [0, 0], // 鍋忕Щ
-          direction: 'right', // 鏀剧疆浣嶇疆
-          // sticky:true,//鏄惁鏍囪鍦ㄧ偣涓婇潰
-          className: 'anim-tooltip'// CSS鎺у埗
-        })
-      })
-      // marker.on('popupopen', this.onClickgaspoppup)
-      // console.log(this.$refs)
-      // L.marker([38.8332098722457, 117.447918949615], {
-      //   icon: icon
-      // }).addTo(this.map)
-      // var marker = L.marker([32.222, 118.7843], {
-      //   icon: icon
-      // }).addTo(this.map)
-      //   .bindPopup(() => data, {
-      //     className: 's-map-popup',
-      //     minWidth: 300,
-      //     closeButton: false,
-      //     autoClose: false
-      //   })
-      //   .bindTooltip('瀛椾綋鍏夋檿鏁堟灉t.', {
-      //     // permanent : true,
-      //     offset: [0, 0], // 鍋忕Щ
-      //     direction: 'right', // 鏀剧疆浣嶇疆
-      //     // sticky:true,//鏄惁鏍囪鍦ㄧ偣涓婇潰
-      //     className: 'anim-tooltip'// CSS鎺у埗
-      //   })
-      //
-      // L.marker([32.229, 118.7843], {
-      //   icon: icon
-      // }).addTo(this.map)
-      //   .bindPopup(() => data1, {
-      //     className: 's-map-popup',
-      //     minWidth: 300,
-      //     closeButton: false,
-      //     autoClose: false
-      //   })
-      //   .bindTooltip('瀛椾綋鍏夋檿鏁堟灉t.', {
-      //     // permanent : true,
-      //     offset: [0, 0], // 鍋忕Щ
-      //     direction: 'right', // 鏀剧疆浣嶇疆
-      //     // sticky:true,//鏄惁鏍囪鍦ㄧ偣涓婇潰
-      //     className: 'anim-tooltip'// CSS鎺у埗
-      //   })
-      //
-      // marker.on('popupopen', this.onLayerClick)
-    },
-    onLayerClick () {
-      this.$refs.popup.setShow()
-    },
-    callPopup (val) {
-      console.log(val)
-    },
-    popupgas () {
-      console.log(1)
     }
   }
 }

--
Gitblit v1.8.0