From bf903b3a5011688117bb2caa2ae705dde372e39f Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 25 三月 2021 15:20:10 +0800
Subject: [PATCH] 拉去最新代码，更改废水代码
---
src/views/MapTemplate.vue | 98 +++++-------------------------------------------
1 files changed, 11 insertions(+), 87 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index e40f80b..be0702d 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'">
@@ -10,7 +9,7 @@
<lc-service-layer class="barline" v-if="lcServiceLayerVisible"></lc-service-layer>
</sgis-layer-controller>
<monitor-panel></monitor-panel>
-<!-- <top-enterprise-panel></top-enterprise-panel>-->
+ <!-- <top-enterprise-panel></top-enterprise-panel>-->
<tool-box-panel ref="toolBox"></tool-box-panel>
<!-- <menu-special></menu-special>-->
<legend-panel></legend-panel>
@@ -23,8 +22,6 @@
<script>
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 +34,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,11 +48,11 @@
LcBasemap,
LcServiceLayer,
Popup,
- summarySheets,
- PopupGas
+ summarySheets
},
data () {
return {
+ // isShowBtn: false,
map: null,
lcServiceLayerVisible: false,
basemapHelper: {},
@@ -70,14 +66,14 @@
}
},
beforeMount () {
- // import('@/assets/airQuality.json').then(res => {
- // console.log(res.features)
- // })
this.$nextTick(() => {
this.init()
})
},
methods: {
+ isShowHidden () {
+ this.isShowBtn = !this.isShowBtn
+ },
saveMapStatus () {
window.serviceLayerHelper = this.serviceLayerHelper
this.$store.commit('setMapObj', this.map)
@@ -87,7 +83,7 @@
this.lcServiceLayerVisible = true
},
- init: function () {
+ init () {
const mapcontainer = this.$refs.rootmap
this.map = Sgis.initMap(mapcontainer)
this.$refs.toolBox.map = this.map
@@ -107,13 +103,9 @@
// 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)
+ this.addMarker()
},
- addMarker (arr) {
+ addMarker () {
const L = this.L
var icon = new L.Icon({
iconUrl: 'assets/images/map/marker-icon.png',
@@ -123,8 +115,7 @@
popupAnchor: [1, -34],
shadowSize: [41, 41]
})
- // 00000000000000000000
- var marker = L.marker([32.222, 118.7843], {
+ var marker = L.marker([32.2221, 118.7843], {
icon: icon
}).addTo(this.map)
.bindPopup(() => this.$refs.popup.$el, {
@@ -140,81 +131,14 @@
// 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