From 2f3695cf0962c35021e6ad76495e7a38e7d3878d Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 25 三月 2021 17:10:40 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/main.js |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main.js b/src/main.js
index 28cfbd5..0ce6953 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,11 +8,14 @@
 import echartsDarkTheme from '@/styles/theme-dark/echarts/theme.json'
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
+import '@assets/css/map/_map-variable.less'
+import '@assets/css/map/map-panel-style.less'
 import 'leaflet/dist/leaflet.css'
 import L from 'leaflet'
-import 'leaflet.markercluster'
-import 'leaflet-canvas-markers'
-import './components/plugin/Leaflet.GridLayer.FadeOut'
+import '@/utils/dialogDrag.js'
+import '@components/plugin/leaflet-measure-path/leaflet-measure-path.css'
+import '@components/plugin/leaflet-measure-path/leaflet-measure-path'
+
 Vue.config.productionTip = false
 
 Vue.use(ElementUI)
@@ -27,7 +30,7 @@
 // 寮�鍙戠幆澧冧笅鍔犺浇鍋囨暟鎹�
 if (process.env.VUE_APP_MOCK && process.env.NODE_ENV === 'development') {
   console.warn('褰撳墠澶勪簬mock鏁版嵁璇锋眰锛�')
-  require('./mock')
+  // require('./mock')
 }
 window.vm = new Vue({
   router,

--
Gitblit v1.8.0