From 6a0a093dba38d4c9e819a45a70aec8e340da9ca0 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 31 三月 2021 19:28:30 +0800
Subject: [PATCH] 图表不显示问题
---
src/views/MapTemplate.vue | 169 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 146 insertions(+), 23 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index bde308c..ce51726 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -6,12 +6,20 @@
<sgis-layer-controller :preset="'warningPreset'">
<lc-basemap></lc-basemap>
<!-- <div class="barline"></div>-->
- <lc-service-layer class="barline"></lc-service-layer>
+ <lc-service-layer class="barline" v-if="lcServiceLayerVisible"></lc-service-layer>
</sgis-layer-controller>
- <lc-service-layer-filter v-show="showServiceLayerFilter" ref="serviceLayerFilter"></lc-service-layer-filter>
<monitor-panel></monitor-panel>
- <top-enterprise-panel></top-enterprise-panel>
- <tool-box-panel></tool-box-panel>
+ <!-- <top-enterprise-panel></top-enterprise-panel>-->
+ <tool-box-panel ref="toolBox"></tool-box-panel>
+ <!-- <menu-special></menu-special>-->
+ <legend-panel></legend-panel>
+ <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>-->
+<!-- <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>
</div>
</template>
@@ -22,37 +30,51 @@
import SgisLayerController from '@components/LayerController/LayerController'
import LcBasemap from '@components/LayerController/modules/LcBaseMap'
import LcServiceLayer from '@components/LayerController/modules/LcServiceLayer'
-import LcServiceLayerFilter from '@components/LayerController/modules/LcServiceLayerFilter'
import MonitorPanel from '@components/panel/RightSearchPanel'
-import TopEnterprisePanel from '@components/panel/TopEnterprisePanel'
+// import TopEnterprisePanel from '@components/panel/TopEnterprisePanel'
+import summarySheets from '@components/table/summarySheets.vue'
import ToolBoxPanel from '@components/panel/ToolBoxPanel'
import Popup from '@views/popup/Popup'
+// import MenuSpecial from '@components/panel/MenuTopic'
+import LegendPanel from '@components/panel/LegendPanel'
+import Enterprise from '../components/table/enterprise'
+// 搴曞浘涓氬姟js閫昏緫
+
+import AddWasteWaterHelper from '@components/BaseNav/WasteWater/WasteWater'
+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: {
+ Enterprise,
+ LegendPanel,
+ // MenuSpecial,
ToolBoxPanel,
- TopEnterprisePanel,
+ // TopEnterprisePanel,
SgisLayerController,
MonitorPanel,
LcBasemap,
LcServiceLayer,
- LcServiceLayerFilter,
- Popup
+ Popup,
+ summarySheets,
+ PublicBounced
},
data () {
return {
map: null,
+ lcServiceLayerVisible: false,
basemapHelper: {},
serviceLayerHelper: {},
- vectorLayerHelper: {}
+ vectorLayerHelper: {},
+ toolBoxVisible: false
}
},
computed: {
- showServiceLayerFilter () {
- return this.$store.state.map.showServiceLayerFilter
- },
- mapConfig () {
- return this.$store.state.map.mapConfig
+ config () {
+ return this.$store.state.map.config
}
},
beforeMount () {
@@ -61,25 +83,79 @@
})
},
methods: {
+ AddGasHelper () {
+ const data = {
+ companyId: 3900100145,
+ id: '',
+ monType: 2,
+ userCode: 'wenchun.deng',
+ monDuration: '',
+ epName: '',
+ secdDeptId: '',
+ contrLevel: '',
+ dataStatus: '',
+ dataFlag: '',
+ runStatus: '',
+ emissTypeId: ''
+ }
+ 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
this.$store.commit('setMapObj', this.map)
this.$store.commit('setBasemapHelper', this.basemapHelper)
- this.$store.commit('setServiceLayerHelper', this.serviceLayerHelper)
+ // this.$store.commit('setServiceLayerHelper', this.serviceLayerHelper)
this.$store.commit('setVectorLayerHelper', this.vectorLayerHelper)
+
+ this.lcServiceLayerVisible = true
},
init () {
const mapcontainer = this.$refs.rootmap
this.map = Sgis.initMap(mapcontainer)
- this.basemapHelper = Sgis.initBasemapsHelper(this.map) // 鍒濆鍖栧熀纭�搴曞浘鍔╂墜
- this.basemapHelper.initBasemap(this.mapConfig, false) // 绗簩涓弬鏁帮紝琛ㄧず鏄惁鍐呯綉搴曞浘
+ window.popupComp = this.$refs.popup
+ var layerFactory = new LayerFactory({
+ L: window.L,
+ map: this.map
+ })
+ layerFactory.init()
+ window.layerFactory = layerFactory
- this.serviceLayerHelper = Sgis.initTileLayersHelper(this.map) // 鍒濆鍖栦笟鍔″簳鍥惧姪鎵�
- this.serviceLayerHelper.initServiceLayers(this.mapConfig)
+ 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.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
- this.vectorLayerHelper.initVectorLayers(this.mapConfig)
+ this.vectorLayerHelper.initVectorLayers(this.config)
+ // this.ChangeState()
+ // this.AddGasHelper()
+ // this.ChangeWaterState()
+ this.$refs.toolBox.init(this.map)
this.saveMapStatus()
// this.setMapObj(this.mapObj)
// this.setBasemapHelper(this.basemapHelper)
@@ -100,7 +176,12 @@
var marker = L.marker([32.2221, 118.7843], {
icon: icon
}).addTo(this.map)
- .bindPopup(() => this.$refs.popup.$el, { className: 's-map-popup', minWidth: 300, closeButton: false, autoClose: false })
+ .bindPopup(() => this.$refs.popup.$el, {
+ className: 's-map-popup',
+ minWidth: 300,
+ closeButton: false,
+ autoClose: false
+ })
.bindTooltip('瀛椾綋鍏夋檿鏁堟灉t.', {
// permanent : true,
offset: [0, 0], // 鍋忕Щ
@@ -122,6 +203,26 @@
</script>
<style lang="less">
+.flue-gas {
+ 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;
+}
.full-screen {
width: 100%;
@@ -141,5 +242,27 @@
//background-color: #0661AE;
border-top: 1px solid #0661AE;
}
+
+ #map-btn {
+ position: fixed;
+ top: 20px;
+ left: 100px;
+ z-index: 9999;
+ }
+
+ .leaflet-custom-icon {
+ background: white;
+ }
+
+ .leaflet-marker-icon {
+ background: none;
+ }
+
+ #migic {
+ width: 48px;
+ height: 48px;
+ margin: -18px -20px;
+ z-index: 999;
+ }
}
-</style>>
+</style>
--
Gitblit v1.8.0