From 4df0471b7dff0494625ff09969b1a13b5359a26e Mon Sep 17 00:00:00 2001
From: XingChuan <m17600301067@163.com>
Date: 星期一, 31 五月 2021 22:41:47 +0800
Subject: [PATCH] 统计表弹框UI优化；增加点击企业名称缩放至企业；二级表展示功能优化。
---
src/views/MapTemplate.vue | 142 +++++++++++++++-------------------------------
1 files changed, 47 insertions(+), 95 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 9e972be..56d30b8 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -1,26 +1,19 @@
<template>
<div class="full-screen">
- <popup ref="popup" @callPopup="callPopup"></popup>
+ <!--<popup ref="popup" @callPopup="callPopup"></popup>-->
<div id="map" ref="rootmap">
</div>
- <sgis-layer-controller :preset="'warningPreset'">
- <lc-basemap></lc-basemap>
- <!-- <div class="barline"></div>-->
- <lc-service-layer class="barline" v-if="lcServiceLayerVisible"></lc-service-layer>
- </sgis-layer-controller>
+ <sgis-layer-controller></sgis-layer-controller>
<monitor-panel></monitor-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>
- <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>
+ <!-- <summary-sheets></summary-sheets>-->
+ <SummarySheet></SummarySheet>
+ <Emergency ref="Emergency"></Emergency>
+ <Message></Message>
+ <event-handling></event-handling>
</div>
</template>
@@ -29,50 +22,42 @@
import Sgis from '@src/Sgis'
// import mapConfig from '@/conf/MapConfig'
import SgisLayerController from '@components/LayerController/LayerController'
-import LcBasemap from '@components/LayerController/modules/LcBaseMap'
-import LcServiceLayer from '@components/LayerController/modules/LcServiceLayer'
import MonitorPanel from '@components/panel/RightSearchPanel'
// import TopEnterprisePanel from '@components/panel/TopEnterprisePanel'
-import summarySheets from '@components/table/summarySheets.vue'
+// import summarySheets from '@components/table/summarySheets.vue'SummarySheet
+import SummarySheet from '@components/table/summarySheets'
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 AddSolidWasteHelper from '@components/BaseNav/SolidWaste'
-// 搴熸皵
-import AddGasHelper from '@components/flueGas/flueGas'
-import PopupGas from '@/components/flueGas/popup-gas'
-import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
-// 鍏叡灞曠ず鏁版嵁
-import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
+import LayerFactory from '@components/LayerController/service/LayerFactory'
+import Emergency from '@components/emergency/index'
+import MapManager from '../components/helpers/MapManager'
+import Message from '@components/message/index'
+import EventHandling from '../components/base-page/enterprise-emergency/event-handling/EventHandling'
export default {
name: 'MapTemplate',
components: {
- Enterprise,
+ EventHandling,
+ // Enterprise,
LegendPanel,
// MenuSpecial,
ToolBoxPanel,
// TopEnterprisePanel,
SgisLayerController,
MonitorPanel,
- LcBasemap,
- LcServiceLayer,
- Popup,
- summarySheets,
- SolidContent,
- PopupGas
+ // summarySheets,
+ SummarySheet,
+ Emergency,
+ Message
},
data () {
return {
- // isShowBtn: false,
map: null,
lcServiceLayerVisible: false,
basemapHelper: {},
serviceLayerHelper: {},
- vectorLayerHelper: {}
+ vectorLayerHelper: {},
+ toolBoxVisible: false
}
},
computed: {
@@ -86,23 +71,6 @@
})
},
methods: {
- AddGasHelper () {
- const AddGas = new AddGasHelper({ map: this.map })
- AddGas.requestData()
- AddGas.SetPlueGasContent(this.config, this.$refs.FlueGas)
- },
- 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)
- },
saveMapStatus () {
window.serviceLayerHelper = this.serviceLayerHelper
this.$store.commit('setMapObj', this.map)
@@ -117,57 +85,29 @@
this.map = Sgis.initMap(mapcontainer)
this.$refs.toolBox.map = this.map
+ window.popupComp = this.$refs.popup
+
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.config)
- // this.ChangeState()
// this.AddGasHelper()
-
+ // this.ChangeWaterState()
+ var layerFactory = new LayerFactory({
+ L: window.L,
+ map: this.map
+ })
+ layerFactory.init(this.$store.state.map.serviceLayers.LayerSewersLine)
+ layerFactory.initEvent(this.$store.state.map.serviceLayers.LayerSewersLine)
+ window.layerFactory = layerFactory
+ window.mapManager = new MapManager()
+ window.mapManager.mapClickListener()
this.saveMapStatus()
// this.setMapObj(this.mapObj)
// this.setBasemapHelper(this.basemapHelper)
// this.setServiceLayerHelper(this.serviceLayerHelper)
// this.setVectorLayerHelper(this.vectorLayerHelper)
- this.addMarker()
- },
- addMarker () {
- const L = this.L
- var icon = new L.Icon({
- iconUrl: 'assets/images/map/marker-icon.png',
- shadowUrl: 'assets/images/map/marker-shadow.png',
- iconSize: [25, 41],
- iconAnchor: [12, 41],
- popupAnchor: [1, -34],
- shadowSize: [41, 41]
- })
- 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
- })
- .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)
@@ -178,11 +118,12 @@
<style lang="less">
.flue-gas {
- position:fixed;
+ position: fixed;
top: 88px;
left: 180px;
z-index: 500;
}
+
.solid-waste {
position: absolute;
top: 88px;
@@ -219,5 +160,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