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 | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main.js b/src/main.js
index cf57dcb..e4615a1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,16 +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 '@/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, { size: 'small' })
+Vue.use(ElementUI)
Vue.prototype.$cancels = []
Vue.prototype.L = L
-// 娉ㄥ唽鎸囦护
+Vue.prototype.$echarts = echarts // 鎸傝浇echarts
+// 娉ㄥ唽鎸囦护7
// registerDirectives(Vue)
// 娉ㄥ唽echarts鐨偆
@@ -26,7 +31,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