From f7ba8b6aab4a763feee8938e93c97079b52baf1d Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期二, 30 三月 2021 12:30:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

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

diff --git a/src/main.js b/src/main.js
index 32a895f..e4615a1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,18 +8,21 @@
 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)
 Vue.prototype.$cancels = []
 Vue.prototype.L = L
-// 娉ㄥ唽鎸囦护
+Vue.prototype.$echarts = echarts // 鎸傝浇echarts
+// 娉ㄥ唽鎸囦护7
 // registerDirectives(Vue)
 
 // 娉ㄥ唽echarts鐨偆

--
Gitblit v1.8.0