From 4e44261ac4f6dcac2f15b3d30636d4b4823f6918 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 27 五月 2026 13:24:38 +0800
Subject: [PATCH] 君哥 1.恢复之前工艺路线模块，删除字段计件/计时字段，工资定额修改成计划工时，新增计划执行人员。工艺绑定，工艺路线恢复。仅需删除bom。 2.对于新增订单需流转协同办公进行审批，审批完成流转生产管控-生产订单 3.新增审批管理，规范管理所有节点审批人。 4.修改菜单栏样式bug
---
src/assets/styles/sidebar.scss | 331 ++++++++++++++++++++++++++++--------------------------
1 files changed, 171 insertions(+), 160 deletions(-)
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index be7b7a7..ff49a33 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -1,70 +1,69 @@
-#app {
- .main-container {
- min-height: 100%;
- transition: margin-left 0.28s;
- margin-left: $base-sidebar-width;
- position: relative;
- background: transparent;
- }
-
- .sidebarHide {
- margin-left: 0 !important;
- }
-
- .sidebar-container {
- transition: width 0.28s;
- width: $base-sidebar-width !important;
- height: 100%;
- position: fixed;
- font-size: 0px;
- top: 0;
- bottom: 0;
- left: 0;
- z-index: 1001;
- overflow: hidden;
- padding: 12px 0 16px 16px;
- background: transparent;
- box-shadow: none;
-
- // reset element-ui css
- .horizontal-collapse-transition {
- transition: 0s width ease-in-out, 0s padding-left ease-in-out,
- 0s padding-right ease-in-out;
- }
-
- .scrollbar-wrapper {
- overflow-x: hidden !important;
- }
-
- .el-scrollbar__bar.is-vertical {
- right: 0px;
- }
-
- .el-scrollbar {
- height: 100%;
- }
-
- &.has-logo {
- .el-scrollbar {
- height: calc(100% - 72px);
- margin-top: 10px;
- }
- }
-
- .is-horizontal {
- display: none;
- }
-
- a {
- display: inline-block;
- width: 100%;
- overflow: hidden;
- }
-
- .svg-icon {
- margin-right: 16px;
- }
-
+#app {
+ .main-container {
+ min-height: 100%;
+ transition: margin-left 0.28s;
+ margin-left: $base-sidebar-width;
+ position: relative;
+ background: transparent;
+ }
+
+ .sidebarHide {
+ margin-left: 0 !important;
+ }
+
+ .sidebar-container {
+ transition: width 0.28s;
+ width: $base-sidebar-width !important;
+ height: 100%;
+ position: fixed;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ z-index: 1001;
+ overflow: hidden;
+ padding: 12px 0 16px 16px;
+ background: transparent;
+ box-shadow: none;
+
+ // reset element-ui css
+ .horizontal-collapse-transition {
+ transition: 0s width ease-in-out, 0s padding-left ease-in-out,
+ 0s padding-right ease-in-out;
+ }
+
+ .scrollbar-wrapper {
+ overflow-x: hidden !important;
+ }
+
+ .el-scrollbar__bar.is-vertical {
+ right: 0px;
+ }
+
+ .el-scrollbar {
+ height: 100%;
+ }
+
+ &.has-logo {
+ .el-scrollbar {
+ height: calc(100% - 72px);
+ margin-top: 10px;
+ }
+ }
+
+ .is-horizontal {
+ display: none;
+ }
+
+ a {
+ display: inline-block;
+ width: 100%;
+ overflow: hidden;
+ }
+
+ .svg-icon {
+ margin-right: 16px;
+ }
+
.el-menu {
border: none;
height: 100%;
@@ -75,18 +74,18 @@
backdrop-filter: blur(18px);
box-shadow: var(--shadow-sm);
}
-
- .el-menu-item,
- .menu-title {
- overflow: hidden !important;
- text-overflow: ellipsis !important;
- white-space: nowrap !important;
- }
-
- .el-menu-item .el-menu-tooltip__trigger {
- display: inline-block !important;
- }
-
+
+ .el-menu-item,
+ .menu-title {
+ overflow: hidden !important;
+ text-overflow: ellipsis !important;
+ white-space: nowrap !important;
+ }
+
+ .el-menu-item .el-menu-tooltip__trigger {
+ display: inline-block !important;
+ }
+
// menu hover
.submenu-title-noDropdown,
.el-sub-menu__title {
@@ -95,17 +94,33 @@
border-radius: 14px;
}
}
- & .theme-light .is-active > .el-sub-menu__title {
- color: var(--current-color) !important;
- }
-
+
+ // 鎵�鏈夊瓙鑿滃崟鏍囬锛屼娇鐢� flex 甯冨眬璁╃澶村拰鏂囧瓧鍦ㄤ竴鎺�
+ .el-sub-menu__title {
+ padding-right: 10px !important;
+ display: flex !important;
+ align-items: center !important;
+ line-height: normal !important;
+ }
+
+ // 椤剁骇瀛愯彍鍗曟爣棰�
+ & > .el-menu > .el-sub-menu > .el-sub-menu__title {
+ padding-right: 10px !important;
+ display: flex !important;
+ align-items: center !important;
+ line-height: normal !important;
+ }
+ & .theme-light .is-active > .el-sub-menu__title {
+ color: var(--current-color) !important;
+ }
+
& .nest-menu .el-sub-menu > .el-sub-menu__title,
& .el-sub-menu .el-menu-item {
min-width: 0 !important;
margin: 0 12px 6px;
width: calc(100% - 24px);
padding-left: 8px !important;
- padding-right: 8px !important;
+ padding-right: 24px !important;
box-sizing: border-box;
&:hover {
@@ -116,7 +131,7 @@
border-radius: 14px;
}
}
-
+
& .theme-light .nest-menu .el-sub-menu > .el-sub-menu__title,
& .theme-light .el-sub-menu .el-menu-item {
//background-color: transparent;
@@ -127,7 +142,7 @@
}
}
}
-
+
.hideSidebar {
.sidebar-container {
width: 68px !important;
@@ -138,7 +153,7 @@
.main-container {
margin-left: 84px;
}
-
+
.submenu-title-noDropdown {
padding: 0 !important;
position: relative;
@@ -225,60 +240,56 @@
width: 0;
overflow: hidden;
visibility: hidden;
- display: inline-block;
- }
- & > i {
- height: 0;
- width: 0;
- overflow: hidden;
- visibility: hidden;
- display: inline-block;
+ display: inline-block;
+ }
+ & > i.el-sub-menu__icon-arrow {
+ display: none;
}
}
}
}
}
-
- .el-menu--collapse .el-menu .el-sub-menu {
- min-width: $base-sidebar-width !important;
- }
-
- // mobile responsive
- .mobile {
- .main-container {
- margin-left: 0px;
- }
-
- .sidebar-container {
- transition: transform 0.28s;
- width: $base-sidebar-width !important;
- }
-
- &.hideSidebar {
- .sidebar-container {
- pointer-events: none;
- transition-duration: 0.3s;
- transform: translate3d(-$base-sidebar-width, 0, 0);
- }
- }
- }
-
- .withoutAnimation {
- .main-container,
- .sidebar-container {
- transition: none;
- }
- }
-}
-
-// when menu collapsed
-.el-menu--vertical {
- & > .el-menu {
- .svg-icon {
- margin-right: 16px;
- }
- }
-
+
+ .el-menu--collapse .el-menu .el-sub-menu {
+ min-width: $base-sidebar-width !important;
+ }
+
+ // mobile responsive
+ .mobile {
+ .main-container {
+ margin-left: 0px;
+ }
+
+ .sidebar-container {
+ transition: transform 0.28s;
+ width: $base-sidebar-width !important;
+ }
+
+ &.hideSidebar {
+ .sidebar-container {
+ pointer-events: none;
+ transition-duration: 0.3s;
+ transform: translate3d(-$base-sidebar-width, 0, 0);
+ }
+ }
+ }
+
+ .withoutAnimation {
+ .main-container,
+ .sidebar-container {
+ transition: none;
+ }
+ }
+}
+
+// when menu collapsed
+.el-menu--vertical {
+ & > .el-menu {
+ .svg-icon {
+ margin-right: 16px;
+ }
+ }
+
.nest-menu .el-sub-menu > .el-sub-menu__title,
.el-menu-item {
min-width: 0 !important;
@@ -297,27 +308,27 @@
border-radius: 14px;
}
}
-
- // the scroll bar appears when the sub-menu is too long
- > .el-menu--popup {
- max-height: 100vh;
- overflow-y: auto;
- padding: 8px;
- border-radius: 18px;
- border: 1px solid var(--surface-border);
- box-shadow: var(--shadow-md);
-
- &::-webkit-scrollbar-track-piece {
- background: #dfe7e1;
- }
-
- &::-webkit-scrollbar {
- width: 6px;
- }
-
- &::-webkit-scrollbar-thumb {
- background: #9aa79e;
- border-radius: 20px;
- }
- }
-}
+
+ // the scroll bar appears when the sub-menu is too long
+ > .el-menu--popup {
+ max-height: 100vh;
+ overflow-y: auto;
+ padding: 8px;
+ border-radius: 18px;
+ border: 1px solid var(--surface-border);
+ box-shadow: var(--shadow-md);
+
+ &::-webkit-scrollbar-track-piece {
+ background: #dfe7e1;
+ }
+
+ &::-webkit-scrollbar {
+ width: 6px;
+ }
+
+ &::-webkit-scrollbar-thumb {
+ background: #9aa79e;
+ border-radius: 20px;
+ }
+ }
+}
--
Gitblit v1.9.3