|
|
@@ -14,8 +14,8 @@
|
|
|
"@wangeditor/editor": "^5.1.23",
|
|
|
"@wangeditor/editor-for-vue": "5.1.10",
|
|
|
"axios": "^1.6.7",
|
|
|
- "echarts": "^5.5.0",
|
|
|
"crypto-js": "^4.2.0",
|
|
|
+ "echarts": "^5.5.0",
|
|
|
"element-plus": "^2.5.6",
|
|
|
"jsencrypt": "^3.3.2",
|
|
|
"lodash-es": "^4.17.21",
|
|
|
@@ -2058,14 +2058,11 @@
|
|
|
"node": ">= 8"
|
|
|
}
|
|
|
},
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
"node_modules/crypto-js": {
|
|
|
"version": "4.2.0",
|
|
|
"resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
|
|
|
"integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
|
|
|
},
|
|
|
->>>>>>> 5f88fd1667661a41787fe8f1593b52a5337e7d3f
|
|
|
"node_modules/css-select": {
|
|
|
"version": "4.3.0",
|
|
|
"resolved": "https://registry.npmmirror.com/css-select/-/css-select-4.3.0.tgz",
|
|
|
@@ -2343,7 +2340,6 @@
|
|
|
"domelementtype": "1"
|
|
|
}
|
|
|
},
|
|
|
-<<<<<<< HEAD
|
|
|
"node_modules/echarts": {
|
|
|
"version": "5.5.0",
|
|
|
"resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.5.0.tgz",
|
|
|
@@ -2358,8 +2354,6 @@
|
|
|
"resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
|
|
|
"integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
|
|
|
},
|
|
|
-=======
|
|
|
->>>>>>> 5f88fd1667661a41787fe8f1593b52a5337e7d3f
|
|
|
"node_modules/element-plus": {
|
|
|
"version": "2.5.6",
|
|
|
"resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.5.6.tgz",
|
|
|
@@ -3712,14 +3706,11 @@
|
|
|
"js-yaml": "bin/js-yaml.js"
|
|
|
}
|
|
|
},
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
"node_modules/jsencrypt": {
|
|
|
"version": "3.3.2",
|
|
|
"resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.2.tgz",
|
|
|
"integrity": "sha512-arQR1R1ESGdAxY7ZheWr12wCaF2yF47v5qpB76TtV64H1pyGudk9Hvw8Y9tb/FiTIaaTRUyaSnm5T/Y53Ghm/A=="
|
|
|
},
|
|
|
->>>>>>> 5f88fd1667661a41787fe8f1593b52a5337e7d3f
|
|
|
"node_modules/json-buffer": {
|
|
|
"version": "3.0.1",
|
|
|
"resolved": "https://registry.npmmirror.com/json-buffer/-/json-buffer-3.0.1.tgz",
|
|
|
@@ -6056,12 +6047,9 @@
|
|
|
"engines": {
|
|
|
"node": ">=14"
|
|
|
},
|
|
|
-<<<<<<< HEAD
|
|
|
"funding": {
|
|
|
"url": "https://github.com/sponsors/antfu"
|
|
|
},
|
|
|
-=======
|
|
|
->>>>>>> 5f88fd1667661a41787fe8f1593b52a5337e7d3f
|
|
|
"peerDependencies": {
|
|
|
"@nuxt/kit": "^3.2.2",
|
|
|
"@vueuse/core": "*"
|
|
|
@@ -6158,12 +6146,9 @@
|
|
|
"engines": {
|
|
|
"node": ">=14"
|
|
|
},
|
|
|
-<<<<<<< HEAD
|
|
|
"funding": {
|
|
|
"url": "https://github.com/sponsors/antfu"
|
|
|
},
|
|
|
-=======
|
|
|
->>>>>>> 5f88fd1667661a41787fe8f1593b52a5337e7d3f
|
|
|
"peerDependencies": {
|
|
|
"@babel/parser": "^7.15.8",
|
|
|
"@nuxt/kit": "^3.2.2",
|
|
|
@@ -6574,7 +6559,6 @@
|
|
|
"engines": {
|
|
|
"node": ">=10"
|
|
|
}
|
|
|
-<<<<<<< HEAD
|
|
|
},
|
|
|
"node_modules/zrender": {
|
|
|
"version": "5.5.0",
|
|
|
@@ -6588,8 +6572,6 @@
|
|
|
"version": "2.3.0",
|
|
|
"resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
|
|
|
"integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
|
|
|
-=======
|
|
|
->>>>>>> 5f88fd1667661a41787fe8f1593b52a5337e7d3f
|
|
|
}
|
|
|
},
|
|
|
"dependencies": {
|
