Squashed commit of the following:

merge
commit 380b590e36eb214a065bce764906646f22d0a029
Merge: 8cf5a5f bbb4e6b
Author: hanxin <32479996@qq.com>
Date:   Thu Apr 27 16:47:03 2023 +0800

    Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb

commit 8cf5a5f72af20803c2c5ad82be2534c2469b4be2
Author: hanxin <32479996@qq.com>
Date:   Thu Apr 27 16:47:00 2023 +0800

    logo宽度修改

commit bbb4e6b793b99c01cda111866ef37c17e0cef98f
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date:   Thu Apr 27 16:44:44 2023 +0800

    菜单样式

commit 39d70bf1786c8ca37a6aa88b4b8d08774bb25e29
Author: hanxin <32479996@qq.com>
Date:   Thu Apr 27 16:15:35 2023 +0800

    菜单上边距调整

commit 97205911bbc1467c4bfec7dfebef4460337e3cf9
Author: hanxin <32479996@qq.com>
Date:   Thu Apr 27 16:12:33 2023 +0800

    头上部边距修改

commit 08a77484ff225c79fcb26a1d92f9ff1ca56371f9
Author: hanxin <32479996@qq.com>
Date:   Thu Apr 27 16:07:41 2023 +0800

    首页上边距

commit dc92efe6ea47eeb8d16fe9695177b83f65655640
Author: hanxin <32479996@qq.com>
Date:   Thu Apr 27 15:58:58 2023 +0800

    背景高度修改

commit b18b31633a3822ec19a92ad465bf0ebb6edc6267
Author: XuZinan <tony.xu121508b2@yahoo.com>
Date:   Thu Apr 27 15:50:17 2023 +0800

    菜单样式

commit e0ab66c407ca87829e037ab28e67082c1b585434
Merge: 6558d5c ef00dee
Author: Renxy <18510891294@163.com>
Date:   Wed Apr 26 18:39:23 2023 +0800

    Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb

commit 6558d5cea7b3af07350db3f8934a6ee9eb3907b4
Author: Renxy <18510891294@163.com>
Date:   Wed Apr 26 18:39:16 2023 +0800

    修改默认选中提交人

commit ef00deecc21d0de06f178fae3b725c87221d4fa8
Author: hanxin <32479996@qq.com>
Date:   Wed Apr 26 18:36:20 2023 +0800

    菜单首页样式调整及头部调整

commit f727b8e78a0d3f32f2c49086d420d1f09e323784
Merge: aa43e34 7053d97
Author: hanxin <32479996@qq.com>
Date:   Wed Apr 26 17:35:42 2023 +0800

    Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb

commit aa43e347bef645babb24bfcff1ceec8659b34338
Author: hanxin <32479996@qq.com>
Date:   Wed Apr 26 17:35:38 2023 +0800

    头部样式调整

commit 7053d97b96e3e7e19f14e2b130adbf47d639006d
Author: Renxy <18510891294@163.com>
Date:   Wed Apr 26 17:17:34 2023 +0800

    修改提交审批表单报错

commit 56878d9edf5295f70db44f63101ac719cffd4476
Merge: 37acf16 56d0611
Author: Renxy <18510891294@163.com>
Date:   Wed Apr 26 16:25:41 2023 +0800

    Merge branch 'master' of http://120.55.44.4:10080/xujunjie/GtDigManageWeb

commit 37acf161dea7a2d381c013486c39cba00fe2a08c
Author: Renxy <18510891294@163.com>
Date:   Wed Apr 26 16:25:34 2023 +0800

    需改合同及审批流管理条件节点选择联系人选不了

# Conflicts:
#	src/global.less
#	src/pages/Home/index.less

.umirc.ts

@@ -40,12 +40,14 @@ export default defineConfig({
       path: '/home',
       component: './Home/index',
       menuRender: false,
+      icon: 'https://gt-digitization.oss-cn-hangzhou.aliyuncs.com/doc/department/2023-04/homeIcon.png',
     },
     {
       name: '审批流管理',
       path: '/flow',
       access: 'isAdmin',
       hideChildrenInMenu: true,
+      icon: 'https://gt-digitization.oss-cn-hangzhou.aliyuncs.com/doc/department/2023-04/flowIcon.png',
       routes: [
         // {
         //   path: '/flow',
@@ -68,6 +70,7 @@ export default defineConfig({
       name: 'OA审批',
       path: '/oa',
       hideChildrenInMenu: true,
+      icon: 'https://gt-digitization.oss-cn-hangzhou.aliyuncs.com/doc/department/2023-04/oaIcon.png',
       routes: [
         {
           name: 'OA审批',
@@ -101,11 +104,13 @@ export default defineConfig({
       name: '文档管理',
       path: '/fileManagement',
       component: './FileManagement/index',
+      icon: 'https://gt-digitization.oss-cn-hangzhou.aliyuncs.com/doc/department/2023-04/fileIcon.png',
     },
     {
       name: '合同管理',
       path: '/contract-manager',
       component: './ContractManager/index',
+      icon: 'https://gt-digitization.oss-cn-hangzhou.aliyuncs.com/doc/department/2023-04/contractIcon.png',
     },
     // {
     //   name: '授权管理',
@@ -126,6 +131,7 @@ export default defineConfig({
     {
       name: '个人中心',
       path: '/profile',
+      icon: 'https://gt-digitization.oss-cn-hangzhou.aliyuncs.com/doc/department/2023-04/profileIcon.png',
       routes: [
         {
           name: '我的申请',
@@ -162,6 +168,7 @@ export default defineConfig({
       name: '供应商管理',
       path: '/manufacturer',
       component: './ManufacturerMng/Firm',
+      icon: 'https://gt-digitization.oss-cn-hangzhou.aliyuncs.com/doc/department/2023-04/manufacturerIcon.png',
     },
   ],
   npmClient: 'yarn',

src/global.less

@@ -114,10 +114,75 @@ input[type='reset'] {
   height: 79px;
 }
 .ant-layout .ant-layout-header {
-  height: 79px;
-  line-height: 79px;
+  height: 79px !important;
+  line-height: 79px !important;
+}
+.ant-pro-global-header-logo img {
+  height: 40px;
 }
 .ant-pro-global-header-logo-mix {
   margin-left: 62px;
 }
 
+.ant-layout-sider {
+  height: calc(100% - 79px) !important;
+  inset-block-start: 79px !important;
+  background-size: 132% 100% !important;
+  background-image: url(@/assets/SideMenu/background.png) !important;
+}
+
+.ant-menu-title-content {
+  font-size: 18px;
+  color: #e8f7fc;
+}
+
+.ant-pro-base-menu-icon {
+  height: 20px;
+  width: 20px;
+}
+.ant-pro-base-menu-item-icon {
+  margin-right: 10px;
+}
+
+.ant-menu-item,
+.ant-menu-submenu {
+  margin-top: 15px !important;
+  margin-bottom: 15px !important;
+}
+
+.ant-menu-item,
+.ant-menu-submenu-title {
+  border-bottom: 1px solid !important;
+  border-image: linear-gradient(#3e6ab4, #5bbdfa) 2 2 2 2 !important;
+}
+
+.ant-menu-sub {
+  margin-left: 32px !important;
+  .ant-menu-item {
+    margin-top: 10px !important;
+    margin-bottom: 10px !important;
+  }
+  .ant-menu-title-content {
+    font-size: 16px;
+    color: #e8f7fc;
+  }
+}
+
+.ant-menu-submenu-arrow {
+  color: #e8f7fc !important;
+}
+
+.ant-menu-item-selected,
+.ant-pro-base-menu-collapsed
+  .ant-menu-submenu-selected
+  > .ant-menu-submenu-title,
+.ant-menu-item:active {
+  background-image: url(@/assets/SideMenu/selectedBackground.png);
+  background-color: transparent !important;
+}
+
+.ant-menu-submenu-popup {
+  .ant-menu {
+    background-color: #1b366f !important;
+  }
+}

src/pages/Home/index.less

@@ -1,9 +1,8 @@
 .background {
   background-image: url(@/assets/UnityMenu/newBackground.png);
   width: 100%;
-  height: calc(100vh - 56px);
+  height: calc(100vh - 79px);
   overflow-y: auto;
-  padding: 60px 0;
   position: absolute;
   top: 0;
   left: 0;
@@ -39,7 +38,7 @@
   width: 1486px;
   max-height: 100vh;
   overflow-y: hidden;
-  padding-top: 166px;
+  padding-top: 160px;
 }
 
 .menuFriName {