From 653c004b4f44396cdb4dce04c17152c7563e37f8 Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期五, 09 四月 2021 11:02:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/views/MapTemplate.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index e19b47f..2c80ca3 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -10,7 +10,7 @@
<!-- <menu-special></menu-special>-->
<legend-panel></legend-panel>
<summary-sheets></summary-sheets>
- <enterprise></enterprise>
+ <!-- <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>-->
@@ -31,7 +31,7 @@
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 +39,7 @@
export default {
name: 'MapTemplate',
components: {
- Enterprise,
+ // Enterprise,
LegendPanel,
// MenuSpecial,
ToolBoxPanel,
@@ -91,6 +91,7 @@
map: this.map
})
layerFactory.init(this.$store.state.map.serviceLayers.LayerSewersLine)
+ layerFactory.init(this.$store.state.map.serviceLayers.layerSewersPoint)
window.layerFactory = layerFactory
this.basemapHelper = Sgis.initBasemapsHelper(this.map) // 鍒濆鍖栧熀纭�搴曞浘鍔╂墜
--
Gitblit v1.8.0