From 437378bde2122efa19c678a2ecdea658478f0feb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=A2=A6=E8=BF=9C?= <1063331231@qq.com>
Date: Mon, 30 Jun 2025 16:41:56 +0800
Subject: [PATCH 01/19] =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E5=88=A0=E9=99=A4?=
=?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98=E8=B4=A6=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/setting/User.vue | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/components/setting/User.vue b/src/components/setting/User.vue
index adbb91b..6ea4721 100644
--- a/src/components/setting/User.vue
+++ b/src/components/setting/User.vue
@@ -54,9 +54,14 @@ const onDelUser = (user: User.UserItem) => {
FtMessage.warning('自己不可删除自己')
return
}
- if (user.roleType === 'admin' && userInfo.roleType !== 'admin') {
+ /* if (user.roleType === 'admin' && userInfo.roleType !== 'admin') {
FtMessage.warning('不可删除管理员用户')
return
+ } */
+ // 禁止删除超级管理员
+ if (userInfo.name === 'admin') {
+ FtMessage.warning('不可删除超级管理员用户')
+ return
}
FtMessageBox.warning('请确认是否删除?').then(() => {
const delParams = {
From 985485fa7ad9d579371f286c6eabf91c76b9dc5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=A2=A6=E8=BF=9C?= <1063331231@qq.com>
Date: Mon, 30 Jun 2025 16:42:33 +0800
Subject: [PATCH 02/19] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?=
=?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E5=AF=B9=E7=94=A8=E6=88=B7=E5=90=8D?=
=?UTF-8?q?=20=E5=AF=86=E7=A0=81=20=E7=A1=AE=E8=AE=A4=E5=AF=86=E7=A0=81=20?=
=?UTF-8?q?=E9=95=BF=E5=BA=A6=E5=92=8C=E6=B1=89=E5=AD=97=E7=9A=84=E9=AA=8C?=
=?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/setting/AddUser.vue | 71 ++++++++++++++++++++++++++++----------
1 file changed, 53 insertions(+), 18 deletions(-)
diff --git a/src/components/setting/AddUser.vue b/src/components/setting/AddUser.vue
index bd50326..a4904d0 100644
--- a/src/components/setting/AddUser.vue
+++ b/src/components/setting/AddUser.vue
@@ -1,9 +1,9 @@
-
+
@@ -136,22 +181,12 @@ const handleConfirm = (value: string) => {
From 64e96e6252e7647c50ec512dde55533a154758e9 Mon Sep 17 00:00:00 2001
From: guoapeng
Date: Mon, 30 Jun 2025 16:57:15 +0800
Subject: [PATCH 03/19] =?UTF-8?q?fix:=20=E5=9B=BE=E8=A1=A8=E4=B8=8D?=
=?UTF-8?q?=E6=B8=85=E6=99=B0=E5=92=8C=E5=8F=98=E5=BD=A2=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
server/index.js | 2 +-
src/components/seal/DashboardChart.vue | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/index.js b/server/index.js
index d5fc3f2..5cb3ba4 100644
--- a/server/index.js
+++ b/server/index.js
@@ -3,7 +3,7 @@ import express from 'express'
const app = express()
-const PORT = 8080 // 可根据需要更改端口号
+const PORT = 8088 // 可根据需要更改端口号
app.listen(PORT, () => {
console.log(`服务器已启动,正在监听端口 ${PORT}`)
})
diff --git a/src/components/seal/DashboardChart.vue b/src/components/seal/DashboardChart.vue
index acd84cd..2103575 100644
--- a/src/components/seal/DashboardChart.vue
+++ b/src/components/seal/DashboardChart.vue
@@ -27,7 +27,7 @@ const initChart = () => {
if (!chartRef.value) {
return
}
- myChart = echarts.init(chartRef.value)
+ myChart = echarts.init(chartRef.value, null, { renderer: 'svg' })
const option = {
tooltip: {
formatter: '{a}
{b} : {c}%',
@@ -70,7 +70,7 @@ onUnmounted(() => {
-
+
diff --git a/src/components/home/config.vue b/src/components/home/config.vue
index 296e73c..b3212a7 100644
--- a/src/components/home/config.vue
+++ b/src/components/home/config.vue
@@ -151,7 +151,7 @@ const onDefaultFormula = () => {
From 0fcfda1b783c2676a02e59caf710144ec425851c Mon Sep 17 00:00:00 2001
From: guoapeng
Date: Tue, 1 Jul 2025 10:30:19 +0800
Subject: [PATCH 18/19] =?UTF-8?q?fix:=20=E6=95=B4=E4=BD=93=E5=AD=97?=
=?UTF-8?q?=E4=BD=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/styles/common.scss | 2 +-
src/assets/styles/element.scss | 2 --
src/components/common/BTButton/index.vue | 2 +-
src/components/formula/FormulaTable.vue | 3 +--
src/stores/systemStore.ts | 2 +-
src/views/setting/index.vue | 1 -
6 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/assets/styles/common.scss b/src/assets/styles/common.scss
index 3e0fb16..c8d5faa 100644
--- a/src/assets/styles/common.scss
+++ b/src/assets/styles/common.scss
@@ -1,6 +1,6 @@
/* CSS Document */
html {
- font-family: serif !important;
+ font-family: 'PingFangSC-Regular', 'PingFang SC', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif;
height: 100vh;
font-size: 14px;
}
diff --git a/src/assets/styles/element.scss b/src/assets/styles/element.scss
index b40dc28..2203280 100644
--- a/src/assets/styles/element.scss
+++ b/src/assets/styles/element.scss
@@ -1,8 +1,6 @@
:root {
--el-font-size-base: 18px;
// --el-button-size: 80px;
-
- --el-font-family-base: serif;
--el-color-primary: #1989fa;
//--el-button-active-bg-color: linear-gradient(90deg, #0657C0 24%, #096AE0 101%);
--text-color-primary: #17213c;
diff --git a/src/components/common/BTButton/index.vue b/src/components/common/BTButton/index.vue
index ebedd53..62a31ef 100644
--- a/src/components/common/BTButton/index.vue
+++ b/src/components/common/BTButton/index.vue
@@ -113,6 +113,6 @@ const handleClick = (event: MouseEvent) => {
padding-left: 5px;
}
.button{
- font-family: serif;
+
}
diff --git a/src/components/formula/FormulaTable.vue b/src/components/formula/FormulaTable.vue
index 449c8f1..e84e6b2 100644
--- a/src/components/formula/FormulaTable.vue
+++ b/src/components/formula/FormulaTable.vue
@@ -122,7 +122,7 @@ const deleteRecipe = (item: Formula.FormulaItem) => {
diff --git a/src/views/liquid/index.vue b/src/views/liquid/index.vue
index 5147c7d..44b179f 100644
--- a/src/views/liquid/index.vue
+++ b/src/views/liquid/index.vue
@@ -183,7 +183,7 @@ const onStopDrainLiquid = async () => {
type="primary"
:button-text="`${liquidTotoal}g`"
bg-color="#2892F3"
- border-radius="0"
+ border-radius="0 var(--el-border-radius-base) var(--el-border-radius-base) 0"
text-color="#ffffff"
height="4rem"
text-size="24px"