From 0c9cf301d04d56c50fdbe471b6b2bf2bdf0e4d58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=A6=8F=E8=B4=A2?= <1471584931@qq.com>
Date: Tue, 10 Mar 2026 18:48:25 +0800
Subject: [PATCH] =?UTF-8?q?----=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?=
=?UTF-8?q?=E4=B8=BB=E9=A2=98=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 2 +-
Dockerfile | 2 +-
package.json | 2 +-
src/assets/style/theme/lng-theme.less | 38 ++++++++++++++++++-
src/layouts/default/trigger/HeaderTrigger.vue | 2 +-
src/views/system/setting/UpdatePassword.vue | 3 +-
6 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/.env.development b/.env.development
index f8e66ec..830e89d 100644
--- a/.env.development
+++ b/.env.development
@@ -11,7 +11,7 @@ VITE_PUBLIC_PATH = /
# 可以有多个，注意多个不能换行，否则代理将会失效
#VITE_PROXY = [["/api","http://localhost:3000"],["/upload","http://localhost:3300/upload"]]
#VITE_PROXY=[["/api/workflow","http://10.0.0.2:8093/workflow/"],["/api","http://10.10.2.102:9500"]]
-VITE_PROXY=[["/api","http://10.10.2.102:9500"]]
+VITE_PROXY=[["/api/system/login","http://127.0.0.1:8092","/system/login"],["/api","http://10.10.2.102:9500"]]
#VITE_PROXY=[["/api/approve/","http://127.0.0.1:8096","/approve/"],["/api","http://10.10.2.102:9500"]]
#VITE_PROXY=[["/api/system/generator/","http://127.0.0.1:8091/system/generator/"],["/api/system/file/","http://127.0.0.1:8091/system/file/"],["/api/system/oss/","http://127.0.0.1:8091/system/oss/"],["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api","http://10.10.2.102:9500"]]
#VITE_PROXY=[["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api","http://10.10.2.102:9500"]]
diff --git a/Dockerfile b/Dockerfile
index 03a4a04..a43b879 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,4 +15,4 @@ VOLUME ["/etc/nginx/nginx.conf", "/usr/share/nginx/html"]
CMD ["nginx","-g","daemon off;"]
-# docker build -t docker.ges.bjgastx.com/itc-web:1.1.5 .
+# docker build -t docker.ges.bjgastx.com/itc-web:1.1.7 .
diff --git a/package.json b/package.json
index 542cf49..f9e6e0f 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
"codemirror": "^5.65.2",
"cropperjs": "^1.5.12",
"crypto-js": "^4.1.1",
- "dayjs": "^1.11.7",
+ "dayjs": "^1.11.19",
"diagram-js": "^12.1.1",
"dom-to-image": "^2.6.0",
"echarts": "^5.3.1",
diff --git a/src/assets/style/theme/lng-theme.less b/src/assets/style/theme/lng-theme.less
index 80586f9..761773a 100644
--- a/src/assets/style/theme/lng-theme.less
+++ b/src/assets/style/theme/lng-theme.less
@@ -13,9 +13,10 @@
}
.ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-item:hover::after, .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-submenu:hover::after, .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-item-active::after, .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-submenu-active::after, .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-item-open::after, .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-submenu-open::after, .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-item-selected::after, .ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-submenu-selected::after {
- border-bottom: 2px solid #0960bd;
+ border-bottom: 2px solid #fff;
right: 10px;
left: 10px;
+ bottom: 4px;
.ant-menu-title-content{
color: #000 !important;
@@ -38,10 +39,45 @@
background-image: url('/@/assets/style/theme/imgs/primary-top.png') !important;
background-size: 100% 100% !important;
+ .vben-layout-header-left {
+
+ .vben-layout-header-trigger{
+ svg {
+ fill: #fff !important;
+ }
+
+ &.light:hover {
+ background-color: unset !important;
+
+ svg {
+ fill: #5e95ff !important;
+ }
+ }
+ }
+ }
.ant-menu-title-content{
color: #fff !important;
}
+
+ .vben-layout-header-action {
+ svg {
+ fill: #fff !important;
+ color: #fff !important;
+ }
+
+ .vben-layout-header-action__item:hover{
+ background-color: #0960bd !important;
+ }
+ }
+
+ .vben-header-user-dropdown__name{
+ color: #fff !important;
+ }
+
+ .vben-header-user-dropdown--light:hover{
+ background-color: #0960bd !important;
+ }
}
}
diff --git a/src/layouts/default/trigger/HeaderTrigger.vue b/src/layouts/default/trigger/HeaderTrigger.vue
index 40155de..ad6f831 100644
--- a/src/layouts/default/trigger/HeaderTrigger.vue
+++ b/src/layouts/default/trigger/HeaderTrigger.vue
@@ -1,7 +1,7 @@
-
+