From 392b411e0a19130ae9cb375c1fb8d2cbab5a4c14 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 06 五月 2021 16:55:19 +0800
Subject: [PATCH] popup改为弹窗

---
 src/views/MapTemplate.vue |   41 ++++++++++++++++++-----------------------
 1 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 2c80ca3..d0bffe7 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -1,6 +1,6 @@
 <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></sgis-layer-controller>
@@ -9,7 +9,8 @@
     <tool-box-panel ref="toolBox"></tool-box-panel>
     <!--    <menu-special></menu-special>-->
     <legend-panel></legend-panel>
-    <summary-sheets></summary-sheets>
+<!--    <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>-->
@@ -26,15 +27,16 @@
 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 PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
 import LayerFactory from '@components/LayerController/service/LayerFactory'
+import EventHandler from '../components/LayerController/event/EventHandler'
 
 export default {
   name: 'MapTemplate',
@@ -46,8 +48,8 @@
     // TopEnterprisePanel,
     SgisLayerController,
     MonitorPanel,
-    Popup,
-    summarySheets,
+    // summarySheets,
+    SummarySheet,
     PublicBounced
   },
   data () {
@@ -86,13 +88,6 @@
       this.$refs.toolBox.map = this.map
 
       window.popupComp = this.$refs.popup
-      var layerFactory = new LayerFactory({
-        L: window.L,
-        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) // 鍒濆鍖栧熀纭�搴曞浘鍔╂墜
       this.basemapHelper.initBasemap(this.config, false) // 绗簩涓弬鏁帮紝琛ㄧず鏄惁鍐呯綉搴曞浘
@@ -102,14 +97,21 @@
       // this.AddGasHelper()
       // this.ChangeWaterState()
 
+      var eventHandler = new EventHandler()
+      window.eventHandler = eventHandler
+
+      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
       this.saveMapStatus()
       // this.setMapObj(this.mapObj)
       // this.setBasemapHelper(this.basemapHelper)
       // this.setServiceLayerHelper(this.serviceLayerHelper)
       // this.setVectorLayerHelper(this.vectorLayerHelper)
-    },
-    onLayerClick () {
-      this.$refs.popup.setShow()
     },
     callPopup (val) {
       console.log(val)
@@ -130,13 +132,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