From c56e506fd34c58209240e97fc29043639fae5d19 Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期四, 29 四月 2021 15:13:21 +0800
Subject: [PATCH] 统计表,指标,预报警表格弹框公共修改,管线分析功能
---
src/views/MapTemplate.vue | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index fbe6525..10ad517 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -9,8 +9,9 @@
<tool-box-panel ref="toolBox"></tool-box-panel>
<!-- <menu-special></menu-special>-->
<legend-panel></legend-panel>
- <summary-sheets></summary-sheets>
- <enterprise></enterprise>
+<!-- <summary-sheets></summary-sheets>-->
+ <SummarySheet></SummarySheet>
+ <!-- <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>-->
@@ -26,12 +27,13 @@
import SgisLayerController from '@components/LayerController/LayerController'
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'
+import SummarySheet from '@components/table/SummarySheet'
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'
+// import Enterprise from '../components/table/enterprise'
// // 鍏叡灞曠ず鏁版嵁
import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
import LayerFactory from '@components/LayerController/service/LayerFactory'
@@ -39,7 +41,7 @@
export default {
name: 'MapTemplate',
components: {
- Enterprise,
+ // Enterprise,
LegendPanel,
// MenuSpecial,
ToolBoxPanel,
@@ -47,7 +49,8 @@
SgisLayerController,
MonitorPanel,
Popup,
- summarySheets,
+ // summarySheets,
+ SummarySheet,
PublicBounced
},
data () {
@@ -90,7 +93,8 @@
L: window.L,
map: this.map
})
- layerFactory.init()
+ layerFactory.init(this.$store.state.map.serviceLayers.LayerSewersLine)
+ layerFactory.initEvent(this.$store.state.map.serviceLayers.LayerSewersLine)
window.layerFactory = layerFactory
this.basemapHelper = Sgis.initBasemapsHelper(this.map) // 鍒濆鍖栧熀纭�搴曞浘鍔╂墜
@@ -106,7 +110,6 @@
// this.setBasemapHelper(this.basemapHelper)
// this.setServiceLayerHelper(this.serviceLayerHelper)
// this.setVectorLayerHelper(this.vectorLayerHelper)
- this.addMarker()
},
onLayerClick () {
this.$refs.popup.setShow()
@@ -130,13 +133,6 @@
position: absolute;
top: 88px;
left: 88px;
- z-index: 999;
-}
-
-.Waste-water {
- position: absolute;
- top: 88px;
- left: 280px;
z-index: 999;
}
--
Gitblit v1.8.0