From 1b555a0ab0527478cdf2b0c31c0ea8aea70f8adc Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 15 六月 2023 10:52:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into yxh01
---
package.json | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/package.json b/package.json
similarity index 91%
rename from ruoyi-ui/package.json
rename to package.json
index c1cd574..70a1102 100644
--- a/ruoyi-ui/package.json
+++ b/package.json
@@ -40,9 +40,11 @@
"axios": "0.24.0",
"clipboard": "2.0.8",
"core-js": "3.25.3",
- "echarts": "5.4.0",
+ "cos-js-sdk-v5": "^1.4.18",
+ "dayjs": "^1.11.7",
+ "echarts": "^5.4.2",
"element-ui": "2.15.12",
- "file-saver": "2.0.5",
+ "file-saver": "^2.0.5",
"fuse.js": "6.4.3",
"highlight.js": "9.18.5",
"js-beautify": "1.13.0",
@@ -59,7 +61,8 @@
"vue-meta": "2.4.0",
"vue-router": "3.4.9",
"vuedraggable": "2.24.3",
- "vuex": "3.6.0"
+ "vuex": "3.6.0",
+ "xlsx": "^0.18.5"
},
"devDependencies": {
"@vue/cli-plugin-babel": "4.4.6",
@@ -77,6 +80,7 @@
"sass": "1.32.13",
"sass-loader": "10.1.1",
"script-ext-html-webpack-plugin": "2.1.5",
+ "script-loader": "^0.7.2",
"svg-sprite-loader": "5.1.1",
"vue-template-compiler": "2.6.12"
},
--
Gitblit v1.9.3