From 92a17fa6f79b766ce13c68b8d624096c5016f4d2 Mon Sep 17 00:00:00 2001 From: lxy <10179281+lxy0722@user.noreply.gitee.com> Date: Tue, 30 Jul 2024 17:12:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9C=A8=E6=B7=B1?= =?UTF-8?q?=E8=89=B2=E6=A8=A1=E5=BC=8F=E4=B8=8B=E7=9A=84=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E8=89=B2=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/views/system/dept/components/DeptUserCom/index.vue | 3 ++- web/src/views/system/dept/index.vue | 2 +- web/src/views/system/menu/index.vue | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/src/views/system/dept/components/DeptUserCom/index.vue b/web/src/views/system/dept/components/DeptUserCom/index.vue index fb50ff9..f52db55 100644 --- a/web/src/views/system/dept/components/DeptUserCom/index.vue +++ b/web/src/views/system/dept/components/DeptUserCom/index.vue @@ -277,7 +277,8 @@ const { resetCrudOptions } = useCrud({ padding: 0 10px; border-radius: 8px 0 0 8px; box-sizing: border-box; - background-color: #fff; + color: var(--next-bg-topBarColor); + background-color: var(--el-fill-color-blank);; } .dept-user-com-table { height: calc(100% - 200px); diff --git a/web/src/views/system/dept/index.vue b/web/src/views/system/dept/index.vue index 60b803b..52df92b 100644 --- a/web/src/views/system/dept/index.vue +++ b/web/src/views/system/dept/index.vue @@ -133,7 +133,7 @@ onMounted(() => { } .dept-left { - background-color: #fff; + background-color: var(--el-fill-color-blank);; border-radius: 0 8px 8px 0; padding: 10px; } diff --git a/web/src/views/system/menu/index.vue b/web/src/views/system/menu/index.vue index 0637a3f..f7d05bd 100644 --- a/web/src/views/system/menu/index.vue +++ b/web/src/views/system/menu/index.vue @@ -138,7 +138,7 @@ onMounted(() => { .menu-box { height: 100%; padding: 10px; - background-color: #fff; + background-color: var(--el-fill-color-blank);; box-sizing: border-box; } -- Gitee From 39223f4f792b6cd5401d21bdb3f142b4993c46c9 Mon Sep 17 00:00:00 2001 From: lxy <10179281+lxy0722@user.noreply.gitee.com> Date: Tue, 30 Jul 2024 17:19:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=A7=E6=B5=8B=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=8A=B6=E6=80=81=E4=B8=BA=E5=81=9C=E6=AD=A2?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E4=B8=8D=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/views/testTool/crud.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/src/views/testTool/crud.tsx b/web/src/views/testTool/crud.tsx index 014bc4e..1a0c55e 100644 --- a/web/src/views/testTool/crud.tsx +++ b/web/src/views/testTool/crud.tsx @@ -113,6 +113,10 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp show: auth('testTool:Download'), click: (ctx: any) => { const {row} = ctx; + if (row.status === false) { + errorMessage('当前版本:' + row.version + ' 已停用!') + return + } downloadFile(row) }, -- Gitee