----修改默认主题样式

.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"]]

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 .

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",

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;
+      }
   }
 
 }

src/layouts/default/trigger/HeaderTrigger.vue

@@ -1,7 +1,7 @@
 <template>
     <span :class="[prefixCls, theme]" @click="toggleCollapsed">
         <span style="border-left: 1px solid rgb(255, 255, 255, 0.3); height: 30px; padding-right: 15px"></span>
-        <MenuUnfoldOutlined v-if="getCollapsed" /> <MenuFoldOutlined v-else />
+        <MenuUnfoldOutlined two-tone-color="#ffffff" v-if="getCollapsed" /> <MenuFoldOutlined two-tone-color="#ffffff" v-else />
     </span>
 </template>
 <script lang="ts">

src/views/system/setting/UpdatePassword.vue

@@ -1,6 +1,7 @@
 <template>
     <CollapseContainer :title="t('密码修改')" :canExpan="false">
-        <div class="flex flex-col items-center justify-center py-8 bg-white">
+        <div class="flex flex-col items-center justify-center py-8 bg-white" style="width: 550px">
+            <div class="text-center mb-4 text-red-500">* 密码必须8-16位字符，包含大写字母，小写字母，数字和特殊字符中的三种及以上。</div>
             <BasicForm @register="register" />
             <div class="flex justify-center">
                 <a-button @click="resetFields"> {{ t('重置') }} </a-button>