From 67cc1463320874211a09fee5c1b3b1fecf6d5a7c Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 10 十一月 2023 13:40:57 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0

---
 package-lock.json |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c3b75ad..55ee0cf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,6 +11,7 @@
         "@amap/amap-jsapi-loader": "^1.0.1",
         "axios": "^0.27.2",
         "core-js": "^3.8.3",
+        "crypto-js": "^4.1.1",
         "docxtemplater": "^3.32.4",
         "docxtemplater-image-module-free": "^1.1.1",
         "echarts": "^5.4.0",
@@ -18,8 +19,6 @@
         "file-saver": "^2.0.5",
         "jszip": "^3.10.1",
         "jszip-utils": "^0.1.0",
-        "leaflet": "^1.9.3",
-        "leaflet.chinatmsproviders": "^3.0.6",
         "leaflet.pm": "^2.2.0",
         "normalize.css": "^8.0.1",
         "pizzip": "^3.1.3",
@@ -4076,6 +4075,11 @@
         "semver": "bin/semver"
       }
     },
+    "node_modules/crypto-js": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz",
+      "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
+    },
     "node_modules/css-declaration-sorter": {
       "version": "6.3.1",
       "resolved": "https://registry.npmmirror.com/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz",
@@ -6741,12 +6745,8 @@
     "node_modules/leaflet": {
       "version": "1.9.3",
       "resolved": "https://registry.npmmirror.com/leaflet/-/leaflet-1.9.3.tgz",
-      "integrity": "sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ=="
-    },
-    "node_modules/leaflet.chinatmsproviders": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmmirror.com/leaflet.chinatmsproviders/-/leaflet.chinatmsproviders-3.0.6.tgz",
-      "integrity": "sha512-B4UPSn2MT//RkFoyrVjwqQyfKuf4tSmMjJDKQ6nqwCCGgirYKRWHafSH9JmA88WoG5pkuMXBcKQhY32FobxU/g=="
+      "integrity": "sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ==",
+      "peer": true
     },
     "node_modules/leaflet.pm": {
       "version": "2.2.0",
@@ -15374,6 +15374,11 @@
         }
       }
     },
+    "crypto-js": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz",
+      "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
+    },
     "css-declaration-sorter": {
       "version": "6.3.1",
       "resolved": "https://registry.npmmirror.com/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz",
@@ -17570,12 +17575,8 @@
     "leaflet": {
       "version": "1.9.3",
       "resolved": "https://registry.npmmirror.com/leaflet/-/leaflet-1.9.3.tgz",
-      "integrity": "sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ=="
-    },
-    "leaflet.chinatmsproviders": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmmirror.com/leaflet.chinatmsproviders/-/leaflet.chinatmsproviders-3.0.6.tgz",
-      "integrity": "sha512-B4UPSn2MT//RkFoyrVjwqQyfKuf4tSmMjJDKQ6nqwCCGgirYKRWHafSH9JmA88WoG5pkuMXBcKQhY32FobxU/g=="
+      "integrity": "sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ==",
+      "peer": true
     },
     "leaflet.pm": {
       "version": "2.2.0",

--
Gitblit v1.8.0