From f8865d1c7f36c4ffa66002e0dd3a9d5e99e4fe6b Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期日, 30 五月 2021 13:45:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/main.js | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/main.js b/src/main.js
index 28cfbd5..621ab68 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,17 +8,31 @@
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/iconfont/iconfont.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'
+import '@components/plugin/PathDrag'
+// import '@components/plugin/flowline'
+
+import layer from './components/layer'
+const appConfig = require('@/app.config')
Vue.config.productionTip = false
Vue.use(ElementUI)
Vue.prototype.$cancels = []
Vue.prototype.L = L
-// 娉ㄥ唽鎸囦护
+Vue.prototype.$config = appConfig
+Vue.prototype.$echarts = echarts // 鎸傝浇echarts
+window.echarts = echarts
+window.Vue = Vue
+window.$layer = layer(Vue)
+// 娉ㄥ唽鎸囦护7
// registerDirectives(Vue)
// 娉ㄥ唽echarts鐨偆
@@ -27,7 +41,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