From ec4d5c1827487f4c901b69bd9eae58e111e82b32 Mon Sep 17 00:00:00 2001 From: 徐旺旺 <11530253@qq.com> Date: 星期四, 20 五月 2021 18:05:25 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/main.js | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main.js b/src/main.js index e9343a2..a2d5681 100644 --- a/src/main.js +++ b/src/main.js @@ -1,4 +1,4 @@ -import 'babel-polyfill' +// import 'babel-polyfill' import Vue from 'vue' import App from './App.vue' import router from './router' @@ -8,18 +8,29 @@ 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 './components/plugin/leaflet-canvas-markers' +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.Vue = Vue +window.$layer = layer(Vue) // 娉ㄥ唽鎸囦护7 // registerDirectives(Vue) -- Gitblit v1.8.0