From 10b5efefb0f22715ecf871e79a67a165ab8610a7 Mon Sep 17 00:00:00 2001 From: YANGDL <114714267@qq.com> Date: 星期六, 13 三月 2021 16:43:10 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main.js | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main.js b/src/main.js index e609408..8ffa4e2 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,12 +8,16 @@ import echartsDarkTheme from '@/styles/theme-dark/echarts/theme.json' import ElementUI from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' +import 'leaflet/dist/leaflet.css' +import L from 'leaflet' +import '@/utils/dialogDrag.js' Vue.config.productionTip = false -Vue.use(ElementUI, { size: 'small' }) +Vue.use(ElementUI) Vue.prototype.$cancels = [] -// 娉ㄥ唽鎸囦护 +Vue.prototype.L = L +// 娉ㄥ唽鎸囦护7 // registerDirectives(Vue) // 娉ㄥ唽echarts鐨偆 @@ -21,7 +26,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