From 0a0080a207a39e51a30a23a41c2054e842f36dae Mon Sep 17 00:00:00 2001 From: wangqi <magical1908@outlook.com> Date: 星期二, 06 四月 2021 18:21:27 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/main.js | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/main.js b/src/main.js index 4de11ed..4c254ad 100644 --- a/src/main.js +++ b/src/main.js @@ -1,3 +1,4 @@ +// import 'babel-polyfill' import Vue from 'vue' import App from './App.vue' import router from './router' @@ -7,11 +8,23 @@ 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 '@/utils/dialogDrag.js' +import '@components/plugin/leaflet-measure-path/leaflet-measure-path.css' +import '@components/plugin/leaflet-measure-path/leaflet-measure-path' +const appConfig = require('@/app.config') Vue.config.productionTip = false -Vue.use(ElementUI, { size: 'small' }) -// 娉ㄥ唽鎸囦护 +Vue.use(ElementUI) +Vue.prototype.$cancels = [] +Vue.prototype.L = L +Vue.prototype.$config = appConfig +Vue.prototype.$echarts = echarts // 鎸傝浇echarts +window.Vue = Vue +// 娉ㄥ唽鎸囦护7 // registerDirectives(Vue) // 娉ㄥ唽echarts鐨偆 @@ -20,7 +33,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