From a96e7a6704cb34ece8835066ff9f069014062e3d Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 30 三月 2021 21:32:36 +0800
Subject: [PATCH] 文件合并方法
---
src/views/MapTemplate.vue | 102 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 73 insertions(+), 29 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 2e804f4..dd708d9 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -16,11 +16,10 @@
<summary-sheets></summary-sheets>
<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="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>
- <popup-gas ref="FlueGas"></popup-gas>
- <public-bouncedounced ref="PublicBounced"></public-bouncedounced>
+ <PublicBounced ref="PublicBounced"></PublicBounced>
</div>
</template>
@@ -40,13 +39,11 @@
import LegendPanel from '@components/panel/LegendPanel'
import Enterprise from '../components/table/enterprise'
// 搴曞浘涓氬姟js閫昏緫
-import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
-// import SolidContent from '@components/SolidWaste/SolidContent'
-// 搴熸皵
-import AddGasHelper from '@components/flueGas/flueGas'
-import PopupGas from '@/components/flueGas/popup-gas'
+import AddWasteWaterHelper from '@components/BaseNav/WasteWater/WasteWater'
+import AddGasHelper from '@components/BaseNav/flueGas/flueGas'
// // 鍏叡灞曠ず鏁版嵁
-// import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
+import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
+import LayerFactory from '@components/LayerController/service/LayerFactory'
export default {
name: 'MapTemplate',
@@ -62,9 +59,7 @@
LcServiceLayer,
Popup,
summarySheets,
- // SolidContent,
- PopupGas
- // PublicBounced
+ PublicBounced
},
data () {
return {
@@ -88,21 +83,42 @@
},
methods: {
AddGasHelper () {
- const AddGas = new AddGasHelper({ map: this.map })
- AddGas.requestData()
- AddGas.SetPlueGasContent(this.config, this.$refs.FlueGas)
- },
- ChangeState () {
const data = {
companyId: 3900100145,
+ id: '',
+ monType: 2,
userCode: 'wenchun.deng',
- name: '',
- marginWarr: '',
- longDayWarr: ''
+ monDuration: '',
+ epName: '',
+ secdDeptId: '',
+ contrLevel: '',
+ dataStatus: '',
+ dataFlag: '',
+ runStatus: '',
+ emissTypeId: ''
}
- const AddSolidWaste = new AddSolidWasteHelper({ map: this.map })
- AddSolidWaste.requestData(data)
- AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.PublicBounced)
+ const AddGas = new AddGasHelper({ map: this.map })
+ AddGas.requestData(data)
+ AddGas.SetPlueGasContent(this.config, this.$refs.PublicBounced)
+ },
+ ChangeWaterState () {
+ const data = {
+ companyId: 3900100145,
+ id: '',
+ monType: 1,
+ userCode: 'wenchun.deng',
+ monDuration: '',
+ epName: '',
+ secdDeptId: '',
+ contrLevel: '',
+ dataStatus: '',
+ dataFlag: '',
+ runStatus: '',
+ emissTypeId: ''
+ }
+ const AddWasteWater = new AddWasteWaterHelper({ map: this.map })
+ AddWasteWater.requestData(data)
+ AddWasteWater.SetWasteWaterContent(this.config, this.$refs.PublicBounced)
},
saveMapStatus () {
window.serviceLayerHelper = this.serviceLayerHelper
@@ -118,18 +134,27 @@
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.AddGasHelper()
+ // this.ChangeWaterState()
this.saveMapStatus()
// this.setMapObj(this.mapObj)
@@ -179,15 +204,23 @@
<style lang="less">
.flue-gas {
- position:fixed;
+ position: fixed;
top: 88px;
left: 180px;
z-index: 500;
}
+
.solid-waste {
position: absolute;
top: 88px;
left: 88px;
+ z-index: 999;
+}
+
+.Waste-water {
+ position: absolute;
+ top: 88px;
+ left: 280px;
z-index: 999;
}
@@ -220,5 +253,16 @@
.leaflet-custom-icon {
background: white;
}
+
+ .leaflet-marker-icon {
+ background: none;
+ }
+
+ #migic {
+ width: 48px;
+ height: 48px;
+ margin: -18px -20px;
+ z-index: 999;
+ }
}
</style>
--
Gitblit v1.8.0