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 = 全代码平台
 

.env.development

@@ -19,7 +19,7 @@ VITE_PROXY=[["/api","http://10.10.2.102:9500"]]
 
 # 是否删除Console.log
 VITE_DROP_CONSOLE = false
-VITE_GLOB_APP_TITLE = 供应链平台
+VITE_GLOB_APP_TITLE = 供应链管理平台
 
 # 接口地址
 # 如果没有跨域问题，直接在这里配置即可

.vscode/settings.json

@@ -75,7 +75,7 @@
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
     "[less]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
+        "editor.defaultFormatter": "stylelint.vscode-stylelint"
     },
     "[scss]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"

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.3 .
+# docker build -t docker.ges.bjgastx.com/itc-web:1.1.4 .

src/assets/style/lng-theme.less

@@ -0,0 +1,14 @@
+
+
+.lng-theme-primary {
+  .lng-menu {
+    .vben-menu-submenu,.vben-menu-submenu-title,.vben-menu{
+      background: unset !important;
+    } 
+  }
+
+  .vben-layout-sideBar {
+    background: unset !important;
+  }
+
+}

src/layouts/default/header/index.vue

@@ -1,7 +1,6 @@
 <template>
     <LayHeader :class="getHeaderClass">
         <!-- left start -->
-
         <div :class="`${prefixCls}-left`">
             <!-- logo -->
             <AppLogo v-if="getShowHeaderLogo || getIsMobile" :class="`${prefixCls}-logo`" :theme="getHeaderTheme" :style="getLogoWidth" :show-title="!getCollapsed" />

src/layouts/default/menu/index.vue

@@ -120,7 +120,7 @@
                 // console.log(menus);
                 if (!menus || !menus.length) return null;
                 return !props.isHorizontal ? (
-                    <SimpleMenu {...menuProps} isSplitMenu={unref(getSplit)} items={menus} />
+                    <SimpleMenu {...menuProps} class="lng-menu" isSplitMenu={unref(getSplit)} items={menus} />
                 ) : (
                     <BasicMenu {...(menuProps as any)} isHorizontal={props.isHorizontal} type={unref(getMenuType)} showLogo={unref(getIsShowLogo)} mode={unref(getComputedMenuMode as any)} items={menus} />
                 );

src/layouts/default/sider/LayoutSider.vue

@@ -73,7 +73,7 @@
                     {
                         [`${prefixCls}--fixed`]: unref(getMenuFixed),
                         [`${prefixCls}--mix`]: unref(getIsMixMode) && !unref(getIsMobile)
-                    }
+                    },
                 ];
             });
 
@@ -122,6 +122,8 @@
 
     .@{prefix-cls} {
         z-index: @layout-sider-fixed-z-index;
+        background-image: url('/@/assets/images/left_menu.jpg');
+        background-size: 100% 100%;
 
         &--fixed {
             position: fixed;