From 97e8d550c9867f7a92c56060835db2969e6fca2e Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 31 三月 2021 15:44:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/views/MapTemplate.vue | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index c5d2668..f5d03d2 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -15,7 +15,8 @@
<legend-panel></legend-panel>
<summary-sheets></summary-sheets>
<enterprise></enterprise>
- <el-button type="primary" @click="ChangeState" class="solid-waste">鍥哄簾</el-button>
+ <!-- <el-button id="map-btn" el-icon-c-scale-to-original icon="el-icon-c-scale-to-original" circle @click="isShowHidden"></el-button>-->
+<!-- <el-button type="primary" @click="ChangeState" class="solid-waste">鍥哄簾</el-button>-->
<el-button type="primary" @click="ChangeWaterState" class="Waste-water">搴熸按</el-button>
<el-button type="primary" @click="AddGasHelper" class="flue-gas">搴熸皵</el-button>
<PublicBounced ref="PublicBounced"></PublicBounced>
@@ -43,6 +44,7 @@
import AddGasHelper from '@components/BaseNav/flueGas/flueGas'
// // 鍏叡灞曠ず鏁版嵁
import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
+import LayerFactory from '@components/LayerController/service/LayerFactory'
export default {
name: 'MapTemplate',
@@ -62,6 +64,7 @@
},
data () {
return {
+ // isShowBtn: false,
map: null,
lcServiceLayerVisible: false,
basemapHelper: {},
@@ -80,6 +83,18 @@
})
},
methods: {
+ ChangeState () {
+ const data = {
+ companyId: 3900100145,
+ userCode: 'wenchun.deng',
+ name: '',
+ marginWarr: '',
+ longDayWarr: ''
+ }
+ const AddSolidWaste = new AddSolidWasteHelper({ map: this.map })
+ AddSolidWaste.requestData(data)
+ AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.PublicBounced)
+ },
AddGasHelper () {
const data = {
companyId: 3900100145,
@@ -98,18 +113,6 @@
const AddGas = new AddGasHelper({ map: this.map })
AddGas.requestData(data)
AddGas.SetPlueGasContent(this.config, this.$refs.PublicBounced)
- },
- ChangeState () {
- const data = {
- companyId: 3900100145,
- userCode: 'wenchun.deng',
- name: '',
- marginWarr: '',
- longDayWarr: ''
- }
- const AddSolidWaste = new AddSolidWasteHelper({ map: this.map })
- AddSolidWaste.requestData(data)
- AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.PublicBounced)
},
ChangeWaterState () {
const data = {
@@ -144,17 +147,26 @@
this.map = Sgis.initMap(mapcontainer)
this.$refs.toolBox.map = this.map
+ window.popupComp = this.$refs.popup
+
+ var layerFactory = new LayerFactory({
+ L: window.L,
+ map: this.map
+ })
+ layerFactory.init()
+ window.layerFactory = layerFactory
+
this.basemapHelper = Sgis.initBasemapsHelper(this.map) // 鍒濆鍖栧熀纭�搴曞浘鍔╂墜
this.basemapHelper.initBasemap(this.config, false) // 绗簩涓弬鏁帮紝琛ㄧず鏄惁鍐呯綉搴曞浘
- this.serviceLayerHelper = Sgis.initTileLayersHelper(this.map) // 鍒濆鍖栦笟鍔″簳鍥惧姪鎵�
- console.log('-------' + this.$refs.popup.$el)
- this.serviceLayerHelper.initServiceLayers(this.config, this.$refs.popup)
+ // this.serviceLayerHelper = Sgis.initTileLayersHelper(this.map) // 鍒濆鍖栦笟鍔″簳鍥惧姪鎵�
+ // console.log('-------' + this.$refs.popup.$el)
+ // this.serviceLayerHelper.initServiceLayers(this.config, this.$refs.popup)
this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
this.vectorLayerHelper.initVectorLayers(this.config)
- // this.ChangeState()
+ this.ChangeState()
// this.AddGasHelper()
// this.ChangeWaterState()
--
Gitblit v1.8.0