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 |   41 ++++++++++++-----------------------------
 1 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 9c5005c..10ad517 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -3,18 +3,15 @@
     <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>
+<!--    <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>-->
@@ -28,16 +25,15 @@
 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'
+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'
@@ -45,17 +41,16 @@
 export default {
   name: 'MapTemplate',
   components: {
-    Enterprise,
+    // Enterprise,
     LegendPanel,
     // MenuSpecial,
     ToolBoxPanel,
     // TopEnterprisePanel,
     SgisLayerController,
     MonitorPanel,
-    LcBasemap,
-    LcServiceLayer,
     Popup,
-    summarySheets,
+    // summarySheets,
+    SummarySheet,
     PublicBounced
   },
   data () {
@@ -98,16 +93,12 @@
         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) // 鍒濆鍖栧熀纭�搴曞浘鍔╂墜
       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)
 
@@ -119,7 +110,6 @@
       // this.setBasemapHelper(this.basemapHelper)
       // this.setServiceLayerHelper(this.serviceLayerHelper)
       // this.setVectorLayerHelper(this.vectorLayerHelper)
-      this.addMarker()
     },
     onLayerClick () {
       this.$refs.popup.setShow()
@@ -143,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