From 8bca7077e5890593fc77520737f4698b27777dcd Mon Sep 17 00:00:00 2001
From: xiaocp2009 <39615122+xiaocp2009@users.noreply.github.com>
Date: Thu, 21 Aug 2025 15:30:21 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81svg=E6=9C=AC=E5=9C=B0=E5=8C=96V3=202?=
=?UTF-8?q?=E3=80=81=E6=89=B9=E9=87=8F=E7=AE=A1=E7=90=86V3=203=E3=80=81?=
=?UTF-8?q?=E5=85=B6=E4=BB=96=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/assets/svg-icon/menu/ziyuan1.svg | 1 +
.../src/components/custom/menu-tree.vue | 4 ++--
.../src/layouts/modules/theme-drawer/index.vue | 18 ++++++++++++++----
.../src/views/mps/batch/index.vue | 9 ++++-----
.../mps/batch/modules/batch-operate-drawer.vue | 2 +-
.../views/mps/batch/modules/batch-search.vue | 13 +++++++++++--
.../ruoyi-admin/src/main/resources/banner.txt | 6 ------
7 files changed, 33 insertions(+), 20 deletions(-)
create mode 100644 cds-fontend-2025.V1/src/assets/svg-icon/menu/ziyuan1.svg
diff --git a/cds-fontend-2025.V1/src/assets/svg-icon/menu/ziyuan1.svg b/cds-fontend-2025.V1/src/assets/svg-icon/menu/ziyuan1.svg
new file mode 100644
index 0000000..6b5d09f
--- /dev/null
+++ b/cds-fontend-2025.V1/src/assets/svg-icon/menu/ziyuan1.svg
@@ -0,0 +1 @@
+
diff --git a/cds-fontend-2025.V1/src/components/custom/menu-tree.vue b/cds-fontend-2025.V1/src/components/custom/menu-tree.vue
index 0df4dad..d5bd6d1 100644
--- a/cds-fontend-2025.V1/src/components/custom/menu-tree.vue
+++ b/cds-fontend-2025.V1/src/components/custom/menu-tree.vue
@@ -72,10 +72,10 @@ function renderLabel({ option }: { option: TreeOption }) {
function renderPrefix({ option }: { option: TreeOption }) {
const renderLocalIcon = String(option.icon).startsWith('local-icon-');
let icon = renderLocalIcon ? undefined : String(option.icon ?? 'local-icon-default');
- const localIcon = renderLocalIcon ? String(option.icon).replace('local-icon-', 'menu-') : undefined;
+ const localIcon = renderLocalIcon ? String(option.icon).replace('local-icon-', 'menu-') : 'menu-default';
if (icon === '#') {
/*icon = 'material-symbols:buttons-alt-outline-rounded';*/
- icon = 'local-icon-default';
+ icon = '#';
}
return ;
}
diff --git a/cds-fontend-2025.V1/src/layouts/modules/theme-drawer/index.vue b/cds-fontend-2025.V1/src/layouts/modules/theme-drawer/index.vue
index 1cb1139..668e476 100644
--- a/cds-fontend-2025.V1/src/layouts/modules/theme-drawer/index.vue
+++ b/cds-fontend-2025.V1/src/layouts/modules/theme-drawer/index.vue
@@ -19,13 +19,23 @@ const appStore = useAppStore();
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/cds-fontend-2025.V1/src/views/mps/batch/index.vue b/cds-fontend-2025.V1/src/views/mps/batch/index.vue
index 2e67573..5723886 100644
--- a/cds-fontend-2025.V1/src/views/mps/batch/index.vue
+++ b/cds-fontend-2025.V1/src/views/mps/batch/index.vue
@@ -142,18 +142,17 @@ const {
render: row => {
const editBtn = () => {
if (!hasAuth('mps:batch:edit')) {
- return 'NA';
+ return NA;
}
-
/*状态控制,注意要和数据库&字典保持一致*/
if(row.preBatchStatus != '1'){
- return 'NA';
+ return NA;
}
if(row.afterBatchStatus != '0'){
- return 'NA';
+ return NA;
}
if(row.checkStatus != '0'){
- return 'NA';
+ return NA;
}
return (
{
/>
- Date.now()
+}
@@ -44,9 +48,14 @@ async function search() {
diff --git a/cds-platform-2025.V1/ruoyi-admin/src/main/resources/banner.txt b/cds-platform-2025.V1/ruoyi-admin/src/main/resources/banner.txt
index 21b1126..1a0b58f 100644
--- a/cds-platform-2025.V1/ruoyi-admin/src/main/resources/banner.txt
+++ b/cds-platform-2025.V1/ruoyi-admin/src/main/resources/banner.txt
@@ -1,8 +1,2 @@
Application Version: ${revision}
Spring Boot Version: ${spring-boot.version}
-__________ _____.___.__ ____ ____ __________.__
-\______ \__ __ ____\__ | |__| \ \ / /_ __ ____ \______ \ | __ __ ______
- | _/ | \/ _ \/ | | | ______ \ Y / | \_/ __ \ ______ | ___/ | | | \/ ___/
- | | \ | ( <_> )____ | | /_____/ \ /| | /\ ___/ /_____/ | | | |_| | /\___ \
- |____|_ /____/ \____// ______|__| \___/ |____/ \___ > |____| |____/____//____ >
- \/ \/ \/ \/