diff --git a/src/styles/common.scss b/src/styles/common.scss index 3c32a16..e9501db 100644 --- a/src/styles/common.scss +++ b/src/styles/common.scss @@ -60,6 +60,7 @@ a { .avue-menu, .el-menu-item, .el-sub-menu__title { height: variables.$top_height; line-height: variables.$top_height; + } .is-active:before { diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 3dd64c9..be5a2e2 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -39,10 +39,12 @@ i { // margin-right: 5px; margin-right: 13px; + } i, span { color: hsla(0, 0%, 100%, .7); + font-size:13px !important; } &:hover { diff --git a/src/styles/tags.scss b/src/styles/tags.scss index e1ff48c..b2babf0 100644 --- a/src/styles/tags.scss +++ b/src/styles/tags.scss @@ -27,7 +27,7 @@ margin: 0 3px; height: 40px; line-height: 40px; - font-size: 13px; + font-size: 12px; font-weight: normal; color: #a8abb2; diff --git a/src/styles/top.scss b/src/styles/top.scss index 1a9cbd8..83b7dbc 100644 --- a/src/styles/top.scss +++ b/src/styles/top.scss @@ -13,7 +13,7 @@ .el-menu-item { i, span { - font-size: 14px; + font-size: 13px; } } } diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 1bc3fe5..f0692b7 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1,5 +1,5 @@ // $sidebar_width: 200px; -$sidebar_width: 220px; +$sidebar_width: 200px; $sidebar_collapse: 65px; $top_height: 60px; // $top_height: 50px; diff --git a/src/views/processManagement/bathRefine/planClass.vue b/src/views/processManagement/bathRefine/planClass.vue index c0f6935..654301f 100644 --- a/src/views/processManagement/bathRefine/planClass.vue +++ b/src/views/processManagement/bathRefine/planClass.vue @@ -26,7 +26,7 @@ --> 审批 @@ -243,26 +243,27 @@ export default { searchLabelWidth: 80, searchOrder: 20, dicData: [ - { - value: -1, - label: '室主任审批', + { + value: 1, + label: '待审核', }, { - value: 0, - label: '审批中', + value: 2, + label: '主任审核通过', }, { value: 3, - label: '审批完毕', + label: '厂长审核通过', }, { - value: 2, - label: '厂长审批', + value: 4, + label: '主任审核未通过', }, { - value: 1, - label: '审批完成', + value: 5, + label: '厂长审核未通过', }, + ], rules: [ {