diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index 1e6f4fe..2f9c3ee 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -291,13 +291,20 @@ div.el-time-width{ -// 2021-11-29 13:29 sxm -//.el-form-item--medium .el-form-item__content, .el-form-item--medium .el-form-item__label { -// line-height: 20px; -//} -// -//.el-input--medium .el-input__icon { -// line-height: 30px; -//} +// 2021-12-14 13:29 sxm + .el-form-item--medium .el-form-item__label { + height: 20px; + line-height: 20px; +} +.el-input--medium .el-input__inner,.el-form-item--medium .el-form-item__content { + height: 24px; + line-height: 20px; +} +.el-input--medium .el-input__icon { + line-height: 20px; +} + + + diff --git a/src/views/common/login.vue b/src/views/common/login.vue index 45ac487..5a39041 100644 --- a/src/views/common/login.vue +++ b/src/views/common/login.vue @@ -159,10 +159,6 @@ width: 100%; margin-top: 38px; } - .el-input__inner { - font-size: 30px; - } - .login-main .el-input__inner{ margin-top: 10px; height: 45px; @@ -174,7 +170,5 @@ border-radius: 4px; } } - /deep/ .el-form-item{ - margin-bottom:-5px; - } + diff --git a/src/views/main-content.vue b/src/views/main-content.vue index 4503db0..67dd210 100644 --- a/src/views/main-content.vue +++ b/src/views/main-content.vue @@ -101,6 +101,7 @@ }, // tabs, 关闭当前 tabsCloseCurrentHandle () { + console.log(this.$route.meta.menuId) this.removeTabHandle(this.mainTabsActiveName) }, // tabs, 关闭其它