From 562dbac6e849316531b711b72805ce9f252b5eb0 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 30 三月 2021 17:26:32 +0800
Subject: [PATCH] 弹框样式修改
---
src/views/MapTemplate.vue | 42 +++++++++++++++++-------------------------
1 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index dcbaf77..0809498 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -17,12 +17,8 @@
<enterprise></enterprise>
<!-- <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>
- <SolidContent ref="SolidWastePopup"></SolidContent>
<el-button type="primary" @click="ChangeWaterState" class="Waste-water">搴熸按</el-button>
- <PublicBounced ref="PublicBounced"></PublicBounced>
-<!-- <SolidContent ref="SolidWastePopup"></SolidContent>-->
<el-button type="primary" @click="AddGasHelper" class="flue-gas">搴熸皵</el-button>
- <popup-gas ref="FlueGas"></popup-gas>
<PublicBounced ref="PublicBounced"></PublicBounced>
</div>
</template>
@@ -42,18 +38,14 @@
// import MenuSpecial from '@components/panel/MenuTopic'
import LegendPanel from '@components/panel/LegendPanel'
import Enterprise from '../components/table/enterprise'
-import SolidContent from '@components/BaseNav/SolidWaste/SolidContent'
-// import WasteWaterContent from '@components/BaseNav/WasteWater/WasteWaterContent'
// 搴曞浘涓氬姟js閫昏緫
import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
import AddWasteWaterHelper from '@components/BaseNav/WasteWater/WasteWater'
-
-// import SolidContent from '@components/SolidWaste/SolidContent'
-// 搴熸皵
-import AddGasHelper from '@components/flueGas/flueGas'
-import PopupGas from '@/components/flueGas/popup-gas'
+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',
components: {
@@ -68,15 +60,10 @@
LcServiceLayer,
Popup,
summarySheets,
- SolidContent,
- // WasteWaterContent,
- // SolidContent,
- PopupGas,
PublicBounced
},
data () {
return {
- show: true,
// isShowBtn: false,
map: null,
lcServiceLayerVisible: false,
@@ -146,9 +133,6 @@
AddWasteWater.requestData(data)
AddWasteWater.SetWasteWaterContent(this.config, this.$refs.PublicBounced)
},
- // isShowHidden () {
- // this.isShowBtn = !this.isShowBtn
- // },
saveMapStatus () {
window.serviceLayerHelper = this.serviceLayerHelper
this.$store.commit('setMapObj', this.map)
@@ -163,19 +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.ChangeState()
// this.ChangeWaterState()
this.saveMapStatus()
@@ -226,11 +217,12 @@
<style lang="less">
.flue-gas {
- position:fixed;
+ position: fixed;
top: 88px;
left: 180px;
z-index: 500;
}
+
.solid-waste {
position: absolute;
top: 88px;
--
Gitblit v1.8.0