diff --git a/.env b/.env index b321d38..b057c01 100644 --- a/.env +++ b/.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 = 全代码平台 diff --git a/src/assets/images/content-org.png b/src/assets/images/content-org.png new file mode 100644 index 0000000..bc94f4c Binary files /dev/null and b/src/assets/images/content-org.png differ diff --git a/src/assets/images/content-write.png b/src/assets/images/content-write.png new file mode 100644 index 0000000..08bec25 Binary files /dev/null and b/src/assets/images/content-write.png differ diff --git a/src/assets/images/content.png b/src/assets/images/content.png new file mode 100644 index 0000000..908af7b Binary files /dev/null and b/src/assets/images/content.png differ diff --git a/src/assets/style/theme/imgs/theme1-left.png b/src/assets/style/theme/imgs/theme1-left.png index f2b7424..2f9b217 100644 Binary files a/src/assets/style/theme/imgs/theme1-left.png and b/src/assets/style/theme/imgs/theme1-left.png differ diff --git a/src/assets/style/theme/imgs/theme1-top.png b/src/assets/style/theme/imgs/theme1-top.png index a830142..f095f07 100644 Binary files a/src/assets/style/theme/imgs/theme1-top.png and b/src/assets/style/theme/imgs/theme1-top.png differ diff --git a/src/assets/style/theme/imgs/theme2-left.png b/src/assets/style/theme/imgs/theme2-left.png index dc02441..4a1c44d 100644 Binary files a/src/assets/style/theme/imgs/theme2-left.png and b/src/assets/style/theme/imgs/theme2-left.png differ diff --git a/src/assets/style/theme/imgs/theme2-top.png b/src/assets/style/theme/imgs/theme2-top.png index 8a44830..003e05a 100644 Binary files a/src/assets/style/theme/imgs/theme2-top.png and b/src/assets/style/theme/imgs/theme2-top.png differ diff --git a/src/assets/style/theme/imgs/theme3-left.png b/src/assets/style/theme/imgs/theme3-left.png index 3779cf1..f2b7424 100644 Binary files a/src/assets/style/theme/imgs/theme3-left.png and b/src/assets/style/theme/imgs/theme3-left.png differ diff --git a/src/assets/style/theme/imgs/theme3-top.png b/src/assets/style/theme/imgs/theme3-top.png index 108f3ff..a830142 100644 Binary files a/src/assets/style/theme/imgs/theme3-top.png and b/src/assets/style/theme/imgs/theme3-top.png differ diff --git a/src/assets/style/theme/imgs/theme4-left.png b/src/assets/style/theme/imgs/theme4-left.png index 0cee473..6d46356 100644 Binary files a/src/assets/style/theme/imgs/theme4-left.png and b/src/assets/style/theme/imgs/theme4-left.png differ diff --git a/src/assets/style/theme/imgs/theme4-top.png b/src/assets/style/theme/imgs/theme4-top.png index d2e6d8e..b29d858 100644 Binary files a/src/assets/style/theme/imgs/theme4-top.png and b/src/assets/style/theme/imgs/theme4-top.png differ diff --git a/src/assets/style/theme/imgs/theme5-left.png b/src/assets/style/theme/imgs/theme5-left.png index 8a1ec2e..7500ae4 100644 Binary files a/src/assets/style/theme/imgs/theme5-left.png and b/src/assets/style/theme/imgs/theme5-left.png differ diff --git a/src/assets/style/theme/imgs/theme5-top.png b/src/assets/style/theme/imgs/theme5-top.png index c8c2c68..30e3cd5 100644 Binary files a/src/assets/style/theme/imgs/theme5-top.png and b/src/assets/style/theme/imgs/theme5-top.png differ diff --git a/src/assets/style/theme/imgs/theme8-left.png b/src/assets/style/theme/imgs/theme8-left.png index 7909648..13a69fc 100644 Binary files a/src/assets/style/theme/imgs/theme8-left.png and b/src/assets/style/theme/imgs/theme8-left.png differ diff --git a/src/assets/style/theme/imgs/theme8-top.png b/src/assets/style/theme/imgs/theme8-top.png index 6999ed0..572d0f5 100644 Binary files a/src/assets/style/theme/imgs/theme8-top.png and b/src/assets/style/theme/imgs/theme8-top.png differ diff --git a/src/assets/style/theme/imgs/theme9-left.png b/src/assets/style/theme/imgs/theme9-left.png index 13a69fc..e45c74d 100644 Binary files a/src/assets/style/theme/imgs/theme9-left.png and b/src/assets/style/theme/imgs/theme9-left.png differ diff --git a/src/assets/style/theme/imgs/theme9-top.png b/src/assets/style/theme/imgs/theme9-top.png index 572d0f5..c8818fc 100644 Binary files a/src/assets/style/theme/imgs/theme9-top.png and b/src/assets/style/theme/imgs/theme9-top.png differ diff --git a/src/assets/style/theme/lng-theme.less b/src/assets/style/theme/lng-theme.less index 4c61a75..08f590c 100644 --- a/src/assets/style/theme/lng-theme.less +++ b/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; diff --git a/src/utils/theme.ts b/src/utils/theme.ts index 93a9d6c..a8b0ee3 100644 --- a/src/utils/theme.ts +++ b/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' }), - THEME2: new ThemeInfo('THEME2', { class: 'lng-theme-theme2', borderColor: '#0B4A99', backColor: '#0B4A99', textColor: '#000', hoverBackColor: '#1664A7',hoverTextColor: '#000', activeBackColor: '#127498', activeTextColor: '#000' }), - THEME3: new ThemeInfo('THEME3', { class: 'lng-theme-theme3', borderColor: '#82B802', backColor: '#82B802', textColor: '#000', hoverBackColor: '#B5D783',hoverTextColor: '#000', activeBackColor: '#568A02', activeTextColor: '#000' }), - THEME4: new ThemeInfo('THEME4', { class: 'lng-theme-theme4', borderColor: '#406872', backColor: '#406872', 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' }), + 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: '#008689', backColor: '#008689', textColor: '#fff', hoverBackColor: '#03B4B9',hoverTextColor: '#fff', activeBackColor: '#036F71', activeTextColor: '#fff' }), + 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: '#58BFDE', backColor: '#58BFDE', textColor: '#000', hoverBackColor: '#3BA5C1',hoverTextColor: '#000', activeBackColor: '#416961', 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' }), - THEME9: new ThemeInfo('THEME9', { class: 'lng-theme-theme9', borderColor: '#3950E0', backColor: '#3950E0', textColor: '#000', hoverBackColor: '#5D71EA',hoverTextColor: '#000', activeBackColor: '#081FB7', 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: '#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' }), } diff --git a/src/views/secondDev/Login.vue b/src/views/secondDev/Login.vue index d2b8f6a..46572e0 100644 --- a/src/views/secondDev/Login.vue +++ b/src/views/secondDev/Login.vue @@ -2,6 +2,7 @@
+