From c88e6fc89736da8faa46d525c8781c0f1dac5384 Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期五, 19 三月 2021 01:50:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main.js |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main.js b/src/main.js
index e9343a2..f174d4a 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,13 +8,14 @@
 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 './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/leaflet-canvas-markers'
 Vue.config.productionTip = false
 
 Vue.use(ElementUI)

--
Gitblit v1.8.0