From e20d96c28a7e1a40a593a8011a2080ce80cd8bf0 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 17 三月 2021 14:55:47 +0800
Subject: [PATCH] Merge branch 'master' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into master
---
src/views/MapTemplate.vue | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 825eaeb..be0702d 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -11,9 +11,11 @@
<monitor-panel></monitor-panel>
<!-- <top-enterprise-panel></top-enterprise-panel>-->
<tool-box-panel ref="toolBox"></tool-box-panel>
- <menu-special></menu-special>
+<!-- <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>-->
</div>
</template>
@@ -29,14 +31,16 @@
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 MenuSpecial from '@components/panel/MenuTopic'
import LegendPanel from '@components/panel/LegendPanel'
+import Enterprise from '../components/table/enterprise'
export default {
name: 'MapTemplate',
components: {
+ Enterprise,
LegendPanel,
- MenuSpecial,
+ // MenuSpecial,
ToolBoxPanel,
// TopEnterprisePanel,
SgisLayerController,
@@ -48,6 +52,7 @@
},
data () {
return {
+ // isShowBtn: false,
map: null,
lcServiceLayerVisible: false,
basemapHelper: {},
@@ -66,6 +71,9 @@
})
},
methods: {
+ isShowHidden () {
+ this.isShowBtn = !this.isShowBtn
+ },
saveMapStatus () {
window.serviceLayerHelper = this.serviceLayerHelper
this.$store.commit('setMapObj', this.map)
@@ -156,5 +164,14 @@
//background-color: #0661AE;
border-top: 1px solid #0661AE;
}
+ #map-btn {
+ position: fixed;
+ top: 20px;
+ left: 100px;
+ z-index: 9999;
+ }
+ .leaflet-custom-icon{
+ background: white;
+ }
}
</style>
--
Gitblit v1.8.0