From 8f015e4bfcd64305be602c4343abe2585e2d47da Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期二, 05 一月 2021 14:11:46 +0800
Subject: [PATCH] 优化逻辑

---
 src/router/routes.js  |    3 -
 src/conf/MapConfig.js |    5 +-
 src/App.vue           |   10 ++++
 src/Sgis.js           |   66 ++++++++++++++++----------------
 src/app.config.js     |    1 
 5 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 421bf83..11b7cc7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,10 +8,18 @@
 
 export default {
   name: 'App',
-  mounted(){
+  mounted () {
   }
 }
 </script>
 
 <style>
+html, body, #app{
+  color: #2c3e50;
+  height: 100vh;
+  width: 100vw;
+  margin: 0;
+  padding: 0;
+  overflow: hidden;
+}
 </style>
diff --git a/src/Sgis.js b/src/Sgis.js
index 8751989..cbda89c 100644
--- a/src/Sgis.js
+++ b/src/Sgis.js
@@ -15,30 +15,30 @@
 let map = null
 // let baseMapGroup = null
 const initMap = (div) => {
-    if (map != null) {
-        map.remove()
-    }
+  if (map != null) {
+    map.remove()
+  }
 
-    // Leaflet鎵╁睍浠g爜
-    Editable.init(L) // 鍥惧眰缂栬緫
-    PathDrag.init(L) // 璺緞鎷栨嫿
-    MagicMarker.init(L) // 鍔ㄧ敾Marker
-    CanvasIcon.init(L) // 浣跨敤canvas缁樺埗Marker
-    WmtsSupport.init(L) // 鎵╁睍锛屼娇鏀寔WMTS
-    // CustomPopup.init(L) // 鑷畾涔夊脊鍑烘
-    DashFlow.DashFlow(L) // 娴佸姩绾垮浘
-    // Leaflet鎵╁睍浠g爜
+  // Leaflet鎵╁睍浠g爜
+  Editable.init(L) // 鍥惧眰缂栬緫
+  PathDrag.init(L) // 璺緞鎷栨嫿
+  MagicMarker.init(L) // 鍔ㄧ敾Marker
+  CanvasIcon.init(L) // 浣跨敤canvas缁樺埗Marker
+  WmtsSupport.init(L) // 鎵╁睍锛屼娇鏀寔WMTS
+  // CustomPopup.init(L) // 鑷畾涔夊脊鍑烘
+  DashFlow.DashFlow(L) // 娴佸姩绾垮浘
+  // Leaflet鎵╁睍浠g爜
 
-    map = L.map(div, MapConfig.mapOptions)
+  map = L.map(div, MapConfig.mapOptions)
 
-    map.on('click', (event, a, b) => {
-        console.log(event, a, b)
-    })
+  map.on('click', (event, a, b) => {
+    console.log(event, a, b)
+  })
 
-    window.map = map
-    window.L = L
+  window.map = map
+  window.L = L
 
-    return { map: map, L: L }
+  return { map: map, L: L }
 }
 
 /**
@@ -47,10 +47,10 @@
  * @param L
  */
 const initBasemapsHelper = (map, L) => {
-    // todo 杩欓噷杩涜搴曞浘鍦板浘鐨勫垵濮嬪寲
-    var basemapHelper = new BasemapHelper({map, L})
-    console.log(basemapHelper)
-    return basemapHelper
+  // todo 杩欓噷杩涜搴曞浘鍦板浘鐨勫垵濮嬪寲
+  var basemapHelper = new BasemapHelper({ map, L })
+  console.log(basemapHelper)
+  return basemapHelper
 }
 /**
  * 涓氬姟搴曞浘鍒濆鍖�
@@ -58,8 +58,8 @@
  * @param L
  */
 const initTileLayersHelper = (map, L) => {
-    let serviceLayerHelper = new ServiceLayerHelper({map, L})
-    return serviceLayerHelper
+  const serviceLayerHelper = new ServiceLayerHelper({ map, L })
+  return serviceLayerHelper
 }
 
 /**
@@ -68,15 +68,15 @@
  * @param L
  */
 const initVectorLayersHelper = (map, L) => {
-    // todo 杩欓噷杩涜鍦板浘鐨勫垵濮嬪寲
-    var vectorLayerHelper = new VectorLayerHelper({map, L})
-    window.vectorLayerHelper = vectorLayerHelper
-    return vectorLayerHelper
+  // todo 杩欓噷杩涜鍦板浘鐨勫垵濮嬪寲
+  var vectorLayerHelper = new VectorLayerHelper({ map, L })
+  window.vectorLayerHelper = vectorLayerHelper
+  return vectorLayerHelper
 }
 
 export default {
-    initMap,
-    initBasemapsHelper,
-    initTileLayersHelper,
-    initVectorLayersHelper
+  initMap,
+  initBasemapsHelper,
+  initTileLayersHelper,
+  initVectorLayersHelper
 }
diff --git a/src/app.config.js b/src/app.config.js
index d220b0d..cf2a95f 100644
--- a/src/app.config.js
+++ b/src/app.config.js
@@ -14,7 +14,6 @@
   homeRouterName: 'Home',
   loginRouteName: 'Login',
   routeMode: 'history',
-  isProMACE: false,
   tagNavCache: false,
   defaultTheme: 'blue'
 }
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index f08b037..c0880fc 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -19,9 +19,8 @@
 
 // 鍑犱綍绫诲瀷甯搁噺
 const GEOM_POINT = 'POINT'
-const GEOM_POLYLINE = 'POLYLINE'
-const GEOM_POLYGON = 'POLYGON'
-console.log(GEOM_POINT, GEOM_POLYLINE, GEOM_POLYGON)
+// const GEOM_POLYLINE = 'POLYLINE'
+// const GEOM_POLYGON = 'POLYGON'
 
 const mapOptions = {
   crs: L.CRS.EPSG4326,
diff --git a/src/router/routes.js b/src/router/routes.js
index d9689c4..a27e957 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -9,7 +9,6 @@
  * }
  */
 // 榛樿璺宠浆璺敱
-import App from '../App'
 import PipeLineIndex from '../views/baseInfoMgr/pipeline/PipeLineIndex'
 import MapTemplate from '../views/MapTemplate'
 
@@ -17,7 +16,7 @@
 export const routes = [{
   path: '/',
   name: 'Main',
-  component: App,
+  component: MapTemplate,
   redirect: '/home',
   children: [{
     path: 'home',

--
Gitblit v1.8.0