Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-web into dev

.env

@@ -8,7 +8,7 @@ VITE_GLOB_APP_TITLE = 供应链平台
 VITE_GLOB_APP_SHORT_NAME = GES_SCM
 
 # 应用名称（仅展示在登录页和左上角logo旁，其他情况用VITE_GLOB_APP_TITLE）
-VITE_SYSTEM_NAME = 供应链管理平台
+VITE_SYSTEM_NAME = 天然气供应链管理平台
 # 应用名称简写，用于空间不足的界面显示（左上角logo旁，7个字以内，超出变成...）
 # VITE_SYSTEM_SHORT_NAME = 全代码平台
 

src/assets/style/theme/lng-theme.less

@@ -172,22 +172,6 @@
 
 .lng-theme-theme2 {
 
-  .lng-menu {
-    .vben-menu-submenu,.vben-menu-submenu-title,.vben-menu,.vben-menu-item{
-      background: unset !important;
-      color: #000 !important;
-
-      .vben-menu-submenu-title-active:not(.vben-menu-submenu){
-        color: #fff !important;
-        background-color: rgba(0, 0, 0, 0.4) !important;
-      }
-    } 
-  }
-
-  .ant-menu-title-content{
-      color: var(--text-color) !important;
-  }
-
   .vben-layout-sideBar {
     background: unset !important;
     background-image: url('/@/assets/style/theme/imgs/theme2-left.png') !important;
@@ -204,22 +188,6 @@
 
 .lng-theme-theme3 {
 
-  .lng-menu {
-    .vben-menu-submenu,.vben-menu-submenu-title,.vben-menu,.vben-menu-item{
-      background: unset !important;
-      color: #000 !important;
-
-      .vben-menu-submenu-title-active:not(.vben-menu-submenu){
-        color: #fff !important;
-        background-color: rgba(0, 0, 0, 0.4) !important;
-      }
-    } 
-  }
-
-  .ant-menu-title-content{
-      color: var(--text-color) !important;
-  }
-
   .vben-layout-sideBar {
     background: unset !important;
     background-image: url('/@/assets/style/theme/imgs/theme3-left.png') !important;
@@ -270,25 +238,6 @@
 
 .lng-theme-theme5 {
 
-  .vben-app-logo__title{
-     color: var(--text-color) !important;
-  }
-
-  .lng-menu {
-    .vben-menu-submenu,.vben-menu-submenu-title,.vben-menu,.vben-menu-item{
-      background: unset !important;
-      color: #000 !important;
-
-      .vben-menu-submenu-title-active:not(.vben-menu-submenu){
-        color: #fff !important;
-        background-color: rgba(0, 0, 0, 0.4) !important;
-      }
-    } 
-  }
-
-  .ant-menu-title-content{
-    color: var(--text-color) !important;
-  }
 
   .vben-layout-sideBar {
     background: unset !important;
@@ -406,22 +355,6 @@
  */
 .lng-theme-theme9 {
 
-  .lng-menu {
-    .vben-menu-submenu,.vben-menu-submenu-title,.vben-menu,.vben-menu-item{
-      background: unset !important;
-      color: #000 !important;
-
-      .vben-menu-submenu-title-active:not(.vben-menu-submenu){
-        color: #fff !important;
-        background-color: rgba(0, 0, 0, 0.4) !important;
-      }
-    } 
-  }
-
-  .ant-menu-title-content{
-      color: var(--text-color);
-  }
-
   .vben-layout-sideBar {
     background: unset !important;
     background-image: url('/@/assets/style/theme/imgs/theme9-left.png') !important;

src/utils/theme.ts

@@ -31,15 +31,15 @@ export class ThemeInfo {
 export const ThemeType = {
   PRIMARY: new ThemeInfo('PRIMARY', { class: 'lng-theme-primary', borderColor: '#0960bd', backColor: '#0960bd', textColor: '#fff', hoverBackColor: '#0960bd',hoverTextColor: '#fff', activeBackColor: '#004496', activeTextColor: '#fff' }),
   LIGHT: new ThemeInfo('LIGHT', { class: 'lng-theme-light', borderColor: '#01768C', backColor: '#01768C', textColor: '#fff', hoverBackColor: '#00889D',hoverTextColor: '#fff', activeBackColor: '#005B6E', activeTextColor: '#fff' }),
-  THEME1: new ThemeInfo('THEME1', { class: 'lng-theme-theme1', borderColor: '#2070B5', backColor: '#2070B5', textColor: '#fff', hoverBackColor: '#10A4C0',hoverTextColor: '#fff', activeBackColor: '#059ABA', activeTextColor: '#fff' }),
+  THEME1: new ThemeInfo('THEME1', { class: 'lng-theme-theme7', borderColor: '#35b3a9', backColor: '#35b3a9', textColor: '#000', hoverBackColor: '#C8FCF7',hoverTextColor: '#000', activeBackColor: '#67CBC4', activeTextColor: '#000' }),
-  THEME2: new ThemeInfo('THEME2', { class: 'lng-theme-theme2', borderColor: '#0B4A99', backColor: '#0B4A99', textColor: '#000', hoverBackColor: '#1664A7',hoverTextColor: '#000', activeBackColor: '#127498', activeTextColor: '#000' }),
+  THEME2: new ThemeInfo('THEME2', { class: 'lng-theme-theme2', borderColor: '#008689', backColor: '#008689', textColor: '#fff', hoverBackColor: '#03B4B9',hoverTextColor: '#fff', activeBackColor: '#036F71', activeTextColor: '#fff' }),
-  THEME3: new ThemeInfo('THEME3', { class: 'lng-theme-theme3', borderColor: '#82B802', backColor: '#82B802', textColor: '#000', hoverBackColor: '#B5D783',hoverTextColor: '#000', activeBackColor: '#568A02', activeTextColor: '#000' }),
+  THEME3: new ThemeInfo('THEME3', { class: 'lng-theme-theme3', borderColor: '#14A4BF', backColor: '#14A4BF', textColor: '#fff', hoverBackColor: '#179FC0',hoverTextColor: '#fff', activeBackColor: '#2170B5', activeTextColor: '#fff' }),
-  THEME4: new ThemeInfo('THEME4', { class: 'lng-theme-theme4', borderColor: '#406872', backColor: '#406872', textColor: '#000', hoverBackColor: '#3BA5C1',hoverTextColor: '#000', activeBackColor: '#416961', activeTextColor: '#000' }),
+  THEME4: new ThemeInfo('THEME4', { class: 'lng-theme-theme4', borderColor: '#58BFDE', backColor: '#58BFDE', textColor: '#000', hoverBackColor: '#3BA5C1',hoverTextColor: '#000', activeBackColor: '#416961', activeTextColor: '#000' }),
-  THEME5: new ThemeInfo('THEME5', { class: 'lng-theme-theme5', borderColor: '#E05FB2', backColor: '#E05FB2', textColor: '#000', hoverBackColor: '#F0A4A6',hoverTextColor: '#000', activeBackColor: '#D1178E', activeTextColor: '#000' }),
+  THEME5: new ThemeInfo('THEME5', { class: 'lng-theme-theme5', borderColor: '#017D91', backColor: '#017D91', textColor: '#fff', hoverBackColor: '#00809F',hoverTextColor: '#fff', activeBackColor: '#00576B', activeTextColor: '#fff' }),
   THEME6: new ThemeInfo('THEME6', { class: 'lng-theme-theme6', borderColor: '#5AB712', backColor: '#5AB712', textColor: '#000', hoverBackColor: '#9DDB6C',hoverTextColor: '#000', activeBackColor: '#90DE55', activeTextColor: '#000' }),
   THEME7: new ThemeInfo('THEME7', { class: 'lng-theme-theme7', borderColor: '#35b3a9', backColor: '#35b3a9', textColor: '#000', hoverBackColor: '#C8FCF7',hoverTextColor: '#000', activeBackColor: '#67CBC4', activeTextColor: '#000' }),
-  THEME8: new ThemeInfo('THEME8', { class: 'lng-theme-theme8', borderColor: '#BD2D18', backColor: '#BD2D18', textColor: '#000', hoverBackColor: '#ED7967',hoverTextColor: '#000', activeBackColor: '#D8503E', activeTextColor: '#000' }),
+  THEME8: new ThemeInfo('THEME8', { class: 'lng-theme-theme8', borderColor: '#909BD6', backColor: '#909BD6', textColor: '#000', hoverBackColor: '#AAB2E8',hoverTextColor: '#000', activeBackColor: '#747EC6', activeTextColor: '#000' }),
-  THEME9: new ThemeInfo('THEME9', { class: 'lng-theme-theme9', borderColor: '#3950E0', backColor: '#3950E0', textColor: '#000', hoverBackColor: '#5D71EA',hoverTextColor: '#000', activeBackColor: '#081FB7', activeTextColor: '#000' }),
+  THEME9: new ThemeInfo('THEME9', { class: 'lng-theme-theme9', borderColor: '#2F78AB', backColor: '#2F78AB', textColor: '#fff', hoverBackColor: '#589DCB',hoverTextColor: '#fff', activeBackColor: '#1C5F8B', activeTextColor: '#fff' }),
   THEME10: new ThemeInfo('THEME10', { class: 'lng-theme-theme10', borderColor: '#A5583E', backColor: '#A5583E', textColor: '#fff', hoverBackColor: '#D37658',hoverTextColor: '#fff', activeBackColor: '#DB4D1F', activeTextColor: '#fff' }),
 }
 

src/views/secondDev/Login.vue

@@ -2,6 +2,7 @@
     <div class="t-container">
        <!--  <StarBackground3 /> -->
         <LoginCarousel />
+        <img :src="contentImgSrc" class="content-img">
         <div :class="prefixCls" class="login-box relative w-full h-full" v-if="!isSingleLogin">
             <div class="center-box">
                 <div class="login-left-title">
@@ -39,9 +40,9 @@
     // import StarBackground3 from './StarBackground3.vue';
     // import Earth3D from './Earth3D.vue';
     import LoginCarousel from './LoginCarousel.vue';
+    import contentImg from '/@/assets/images/content.png';
 
-
+    let contentImgSrc = ref(contentImg);
-
     const { currentRoute } = useRouter();
     const userStore = useUserStore();
     const isSingleLogin = ref(false);
@@ -140,6 +141,13 @@
         width: 180px;
     }
 
+    .content-img {
+        position: absolute;
+        left: 60px; 
+        top:60px;
+        width: 280px;   
+    }
+
     .center-box {
         //background-color: #fff;
         border: 1px solid #eaeaea;
@@ -165,7 +173,7 @@
     .login-left-title .sub-title {
         font-size: 36px;
         font-weight: bold;
-        color: #5e95ff;
+        color: rgba(0,0,0,0.55);
         text-align: center;
     }
 

src/views/secondDev/LoginForm.vue

@@ -416,6 +416,16 @@
     .sub-button {
         height: 48px;
         font-size: 20px;
+        background: linear-gradient(135deg, rgba(255,165,0,0.8), rgba(255,110,0,0.8)) !important;
+        border: 1px solid rgba(255,110,0,0.2) !important;
+        /* 磨砂效果 */
+        backdrop-filter: blur(4px);
+        -webkit-backdrop-filter: blur(4px);
+        transition: 0.3s;
+
+        &:hover{
+            background: linear-gradient(135deg, rgba(255,165,0,0.9), rgba(255,80,0,0.9)) !important;
+        }
     }
 
     .ant-form label {

tests/test.html

@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <meta charset="UTF-8">
+    <title>厚德善能 益邦惠民</title>
+    <style>
+        * {
+            margin: 0;
+            padding: 0;
+            box-sizing: border-box;
+        }
+        /* 页面背景透明 + 居中布局 */
+        body {
+            background: #6A9EC3;
+            min-height: 100vh;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            /* 如需深色背景预览，可临时替换为：background: #333; */
+        }
+        /* 双列容器 */
+        .text-container {
+            display: flex;
+            gap: 60px; /* 两列文字间距 */
+        }
+        /* 单列文字样式 */
+        .text-item {
+            /* 竖排文字核心属性 */
+            writing-mode: vertical-rl;
+            text-orientation: upright;
+            /* 字体&尺寸&颜色 */
+            font-size: 100px;
+            color: #00FF00;
+            font-weight: 900;
+            /* 瘦金体（优先系统瘦金体，无则 fallback 仿宋/楷体） */
+            font-family: "瘦金体", "瘦金体简", "STKaiti", "FangSong", serif;
+            /* 文字间距优化 */
+            letter-spacing: 10px;
+        }
+    </style>
+</head>
+<body>
+    <div class="text-container">
+        <div class="text-item">厚德善能</div>
+        <div class="text-item">益邦惠民</div>
+    </div>
+</body>
+</html>