From 4adfa4774e09f3b388335bb8dee5dea518856e5b Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期日, 30 五月 2021 19:23:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 package.json |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 5360251..badf5d0 100644
--- a/package.json
+++ b/package.json
@@ -13,23 +13,35 @@
   },
   "dependencies": {
     "@jiaminghi/data-view": "^2.10.0",
-    "axios": "^0.18.0",
+    "@turf/turf": "^6.3.0",
+    "audit": "0.0.6",
+    "axios": "^0.21.1",
+    "babel-polyfill": "^6.26.0",
     "core-js": "^3.6.5",
-    "dayjs": "^1.9.6",
+    "dayjs": "^1.10.4",
     "echarts": "^4.2.1",
     "element-ui": "^2.14.1",
+    "esri-leaflet": "^3.0.1",
+    "fix": "0.0.6",
+    "fullscreen": "^1.1.1",
     "jquery": "^3.5.1",
     "js-cookie": "^2.2.0",
     "leaflet": "^1.7.1",
     "leaflet-canvas-markers": "^1.0.6",
+    "leaflet.browser.print": "^1.0.6",
     "leaflet.markercluster": "^1.4.1",
     "lodash": "^4.17.10",
     "nprogress": "^0.2.0",
+    "proj4": "^2.7.2",
+    "qs": "^6.10.1",
     "rbush": "^3.0.1",
-    "screenfull": "^3.3.2",
+    "screenfull": "^3.3.3",
+    "style-resources-loader": "^1.4.1",
     "vue": "^2.6.11",
+    "vue-cli-plugin-style-resources-loader": "^0.1.4",
     "vue-count-to": "^1.0.13",
     "vue-focus": "^2.1.0",
+    "vue-fullscreen": "^2.2.0",
     "vue-router": "^3.0.1",
     "vuex": "^3.0.1"
   },

--
Gitblit v1.8.0