diff --git a/public/index.html b/public/index.html
index 61b6c0f..4c5620a 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2022-08-22 14:57:50
* @LastEditors: zwq
- * @LastEditTime: 2022-12-13 14:33:51
+ * @LastEditTime: 2023-01-06 14:57:22
* @Description:
-->
diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss
index 7ac97ca..69a7c38 100644
--- a/src/assets/scss/common.scss
+++ b/src/assets/scss/common.scss
@@ -276,7 +276,7 @@ img {
&:focus,
&:hover {
color: #fff;
- background-color: mix(#000, $--color-primary, 15%);
+ background-color: mix(#fff, $--color-primary, 15%);
}
}
> .el-menu-item.is-active,
@@ -318,7 +318,7 @@ img {
transition: width .3s;
}
&__brand {
- background-color: #409eff;
+ background-color: rgba(0, 21, 41, 1);
display: flex;
justify-content: center;
align-items: center;
@@ -478,12 +478,16 @@ img {
&:focus,
&:hover {
color: #fff;
- background-color: #2863af;
+ background-color: rgba(11, 88, 255, 1);
+ .aui-sidebar__menu-icon-son{
+ background: #fff;
+ border-radius: 4px;
+ }
}
}
.el-menu,
.el-submenu.is-opened {
- background-color: #0b253f;
+ background-color: rgba(11, 37, 63, 1);
}
.el-menu-item.is-active,
.el-submenu.is-active > .el-submenu__title {
@@ -521,6 +525,16 @@ img {
color: inherit !important;
transition: font-size .3s;
}
+ &__menu-icon-son {
+ display: inline-block;
+ vertical-align: middle;
+ width: 8px !important;
+ margin: 0 10px;
+ text-align: center;
+ font-size: 8px;
+ color: inherit !important;
+ transition: font-size 0.3s;
+ }
}
@@ -592,20 +606,17 @@ img {
}
& > .el-tabs__item {
height: $content--tabs-header-height;
- padding: 0 15px;
- line-height: $content--tabs-header-height;
border: 0;
- color: $--color-text-regular;
+ padding: 0 10px;
+ color: rgba(89, 89, 89, 1);
&:focus,
&:hover,
&.is-active {
- color: $--color-text-primary;
- background-color: $--background-color-base;
&:after {
display: block;
}
> .el-icon-close {
- color: $--color-text-primary;
+ color: rgba(255, 255, 255, 1);
}
}
&:after {
@@ -619,11 +630,20 @@ img {
background-color: $--color-primary;
}
+ .el-tabs__item {
- margin-left: 1px;
+ margin-left: 5px;
+ height: 24px;
+ font-size: 12px;
+ line-height: 24px;
+ border-radius: 5px;
+ background-color: rgba(239, 239, 239, 1);
+ &.is-active {
+ color: rgba(255, 255, 255, 1);
+ background-color: rgba(62, 142, 247, 1);
+ }
}
> .el-icon-close {
width: 14px;
- margin-left: 15px;
+ margin-left: 6px;
color: $--color-text-secondary;
}
> i.icon {
diff --git a/src/assets/scss/variables.scss b/src/assets/scss/variables.scss
index 344243d..080afb4 100644
--- a/src/assets/scss/variables.scss
+++ b/src/assets/scss/variables.scss
@@ -5,10 +5,10 @@ $base--line-height: 1.15;
$navbar--height: 50px;
// Sidebar
-$sidebar--width: 230px;
+$sidebar--width: 248px;
$sidebar--width-fold: 64px;
-$sidebar--background-color-dark: #001529;
-$sidebar--text-color-dark: #ffffff;
+$sidebar--background-color-dark: rgba(0, 21, 41, 1);
+$sidebar--text-color-dark: rgba(255, 255, 255, 1);
$sidebar--menu-item-height: 48px;
// Content
diff --git a/src/icons/svg/椭圆形.svg b/src/icons/svg/椭圆形.svg
new file mode 100644
index 0000000..1091081
--- /dev/null
+++ b/src/icons/svg/椭圆形.svg
@@ -0,0 +1,13 @@
+
+
\ No newline at end of file
diff --git a/src/icons/svg/组织管理.svg b/src/icons/svg/组织管理.svg
new file mode 100644
index 0000000..b820d69
--- /dev/null
+++ b/src/icons/svg/组织管理.svg
@@ -0,0 +1,12 @@
+
+
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index fc73123..0809c83 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -34,10 +34,6 @@ export const moduleRoutes = {
children: [
{ path: '/home', component: () => import('@/views/modules/home'), name: 'home', meta: { title: '首页', isTab: true } },
- { path: '/echart-line', component: () => import('@/views/spc-chart/echart-line'), name: 'echart-line', meta: { title: 'spc折线', isTab: true } },
- { path: '/echart-3line', component: () => import('@/views/spc-chart/echart-3line'), name: 'echart-3line', meta: { title: 'spc3折线', isTab: true } },
- { path: '/echart-2line', component: () => import('@/views/spc-chart/echart-2line'), name: 'echart-2line', meta: { title: 'spc2折线', isTab: true } },
-
// 基础信息
{ path: '/productType', component: () => import('@/views/spc-basic/productType'), name: 'productType', meta: { title: '产品类型', isTab: true } },
{ path: '/productList', component: () => import('@/views/spc-basic/productList'), name: 'productList', meta: { title: '产品列表', isTab: true } },
diff --git a/src/views/main-sidebar-sub-menu.vue b/src/views/main-sidebar-sub-menu.vue
index c91e31a..37cf1df 100644
--- a/src/views/main-sidebar-sub-menu.vue
+++ b/src/views/main-sidebar-sub-menu.vue
@@ -1,3 +1,10 @@
+
@@ -7,7 +14,8 @@
-
+
+
{{ menu.name }}
diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue
index e0646fd..ef42e58 100644
--- a/src/views/main-sidebar.vue
+++ b/src/views/main-sidebar.vue
@@ -21,36 +21,51 @@
产品管理
-
-
+
+
产品列表
-
+
+
工厂管理
过程管理
-
-
@@ -62,50 +77,42 @@
机台管理
-
-
-
+
+
量具管理
-
- 计量单位管理
-
-
-
-
-
-
-
- spc折线
-
-
-
- spc2折线
-
-
-
- spc3折线
+
+ 计量单位管理
@@ -116,15 +123,27 @@
质量规划
-
+
+
控制图形
-
+
+
控制系数
-
-
+
+
+
判读方案
@@ -135,34 +154,49 @@
过程检验
-
-