From f481c5fe4fc2aa80c77a760f4161e4ab3912cb45 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 06 七月 2024 15:07:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/package.json | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/UI-Project/package.json b/UI-Project/package.json
index d123656..7a586a0 100644
--- a/UI-Project/package.json
+++ b/UI-Project/package.json
@@ -1,5 +1,5 @@
{
- "name": "northglass-erp",
+ "name": "northglass-mes",
"version": "0.0.0",
"private": true,
"scripts": {
@@ -10,7 +10,9 @@
"dependencies": {
"@element-plus/icons-vue": "^2.1.0",
"@vue-macros/reactivity-transform": "^0.3.23",
- "axios": "^1.5.1",
+ "axios": "^1.6.8",
+ "chart.js": "^4.4.3",
+ "echarts": "^5.5.0",
"element-plus": "^2.4.0",
"moment": "^2.30.1",
"pinia": "^2.1.6",
@@ -18,6 +20,8 @@
"sortablejs": "^1.15.1",
"sweetalert2": "^11.10.7",
"vue": "^3.3.4",
+ "vue-draggable-plus": "^0.5.0",
+ "vue-i18n": "^9.10.1",
"vue-router": "^4.2.4",
"vxe-table": "^4.5.15",
"xe-utils": "^3.5.14",
@@ -25,7 +29,9 @@
},
"devDependencies": {
"@types/sortablejs": "^1.15.7",
- "@vitejs/plugin-vue": "^4.3.4",
+ "@vitejs/plugin-vue": "^4.6.2",
+ "http-proxy-middleware": "^3.0.0",
+ "unplugin-auto-import": "^0.17.6",
"vite": "^4.4.9"
}
}
--
Gitblit v1.8.0