From 8359b52650eb0b257b3095a4a94b812ea67d95cf Mon Sep 17 00:00:00 2001 From: x_ying <2438792676@qq.com> Date: Mon, 11 Jul 2022 15:01:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=84=E9=A1=B5=E9=9D=A2=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=A1=86=E4=B8=8E=E6=8C=89=E9=92=AE=E7=BB=9F=E4=B8=80=E9=AB=98?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/archives-manage.scss | 6 ++--- src/assets/styles/index.scss | 2 +- src/assets/styles/yxk-admin.scss | 25 +++++++++++-------- .../archivesCheck/module/addCheck.vue | 7 ++++-- .../lendManage/borrowerManage/index.vue | 2 +- .../lendManage/lendProcess/index.vue | 2 +- .../lendManage/lendQuery/index.vue | 2 +- .../storeManage/warehouse3DConfig/index.vue | 4 +-- src/views/system/menu/index.vue | 10 ++++---- 9 files changed, 33 insertions(+), 27 deletions(-) diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index bf58864..cf7e29c 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -39,8 +39,8 @@ $arcCyan: #0FBED9; color: #fff; background-color: transparent; border: none; - height: 32px; - line-height: 32px; + height: 30px; + line-height: 30px; .el-input__inner { padding-left: 15px; color: #339CFF; @@ -336,7 +336,7 @@ $arcCyan: #0FBED9; .selct-data-head{ color: #fff; - line-height: 32px; + line-height: 30px; } // 绑定标签 diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index c2f3bee..96a64ca 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -106,7 +106,7 @@ aside { margin-bottom: 20px; border-radius: 2px; display: block; - line-height: 32px; + line-height: 30px; font-size: 16px; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; color: #2c3e50; diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index cc0acef..699cd50 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -7,10 +7,13 @@ input { border: 1px solid $inputBorder; background-color: $mainContainerBg; - height: 32px; - line-height: 32px; + height: 30px; + line-height: 30px; color: #fff; } + .iconfont{ + line-height: 30px; + } } .el-form-item-label { margin: 0 3px 9px 0; @@ -19,11 +22,11 @@ vertical-align: middle; font-size: 14px; color: #606266; - line-height: 32px; + line-height: 30px; padding: 0 7px; } .el-select__caret.el-input__icon.el-icon-arrow-up{ - line-height: 32px; + line-height: 30px; } .date-item { display: inline-block; @@ -31,7 +34,7 @@ border: 1px solid $inputBorder; background-color: $mainContainerBg; margin-right: 20px; - height: 32px !important; + height: 30px !important; width: 230px !important; } } @@ -44,9 +47,9 @@ position: relative; overflow: hidden; vertical-align: middle; - width: 32px; - height: 32px; - line-height: 32px; + width: 30px; + height: 30px; + line-height: 30px; border-radius: 16px; } @@ -54,7 +57,7 @@ height: 60px; padding: 13px 0 0; img{ - height: 32px; + height: 30px; width: 135px; display: block; //margin: 0 auto; @@ -618,8 +621,8 @@ .vue-treeselect__control, .vue-treeselect__placeholder, .vue-treeselect__single-value{ - height: 32px; - line-height: 32px; + height: 28px; + line-height: 28px; color: #fff; } .vue-treeselect__control{ diff --git a/src/views/archivesManage/archivesCheck/module/addCheck.vue b/src/views/archivesManage/archivesCheck/module/addCheck.vue index 3c6d4a8..8521dd0 100644 --- a/src/views/archivesManage/archivesCheck/module/addCheck.vue +++ b/src/views/archivesManage/archivesCheck/module/addCheck.vue @@ -22,7 +22,7 @@ - 生成盘点单 + 生成盘点单 @@ -173,4 +173,7 @@ export default { ::v-deep .el-tag.el-tag--info .el-tag__close{ background-color: #fff; } +::v-deep .el-input__inner{ + height: 30px !important; +} diff --git a/src/views/archivesManage/lendManage/borrowerManage/index.vue b/src/views/archivesManage/lendManage/borrowerManage/index.vue index fe46dfa..2b2bcbb 100644 --- a/src/views/archivesManage/lendManage/borrowerManage/index.vue +++ b/src/views/archivesManage/lendManage/borrowerManage/index.vue @@ -24,7 +24,7 @@ ref="table" :data="tableData" style="min-width: 100%" - height="calc(100vh - 355px)" + height="calc(100vh - 356px)" @selection-change="selectionChangeHandler" @row-click="clickRowHandler" > diff --git a/src/views/archivesManage/lendManage/lendProcess/index.vue b/src/views/archivesManage/lendManage/lendProcess/index.vue index c4be544..43022af 100644 --- a/src/views/archivesManage/lendManage/lendProcess/index.vue +++ b/src/views/archivesManage/lendManage/lendProcess/index.vue @@ -48,7 +48,7 @@ p{ } } .content-container{ - height:636px; + height:calc(100vh - 303px); color: #fff; padding: 0 20px; } diff --git a/src/views/archivesManage/lendManage/lendQuery/index.vue b/src/views/archivesManage/lendManage/lendQuery/index.vue index 68b94ec..ee30d6f 100644 --- a/src/views/archivesManage/lendManage/lendQuery/index.vue +++ b/src/views/archivesManage/lendManage/lendQuery/index.vue @@ -41,7 +41,7 @@ - + @@ -258,8 +258,8 @@ export default { ::v-deep .el-input-number .el-input__inner { text-align: left; } - ::v-deep .vue-treeselect__control,::v-deep .vue-treeselect__placeholder,::v-deep .vue-treeselect__single-value { - height: 30px; - line-height: 30px; - } +// ::v-deep .vue-treeselect__control,::v-deep .vue-treeselect__placeholder,::v-deep .vue-treeselect__single-value { +// height: 30px; +// line-height: 30px; +// }