From 41abb2337ae542a2fc2e122136794b2736d8347f Mon Sep 17 00:00:00 2001 From: wangyu <823267011@qq.com> Date: Tue, 28 Apr 2026 15:54:45 +0800 Subject: [PATCH] =?UTF-8?q?fix(ui):=20=E4=BF=AE=E5=A4=8D=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E9=87=8D=E5=8F=A0=E3=80=81=E6=94=B9=E5=90=8D=E3=80=81=E5=8E=BB?= =?UTF-8?q?=E5=A4=B4=E5=83=8F=E3=80=81=E9=87=8D=E6=9E=84=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复全局紧凑样式导致前缀图标与输入框文字重叠问题 （补充 .el-input--prefix 的 padding-left 覆盖规则） - 登录页恢复 38px 输入高度并修正前缀图标对齐 - 所有环境标题统一改为「科伦普冷轧双机架控制平台」 （env.development / env.production / env.staging / vue.config.js / settings.js） - Navbar 去除用户头像图片，改用图标+用户名文字，移除「布局设置」菜单项 - 生产计划页重构为左侧钢卷列表+右侧详情布局（与工艺管理页一致） 工艺方案改为可选项，支持不绑定方案直接新建钢卷 Co-Authored-By: Claude Sonnet 4.6 --- ruoyi-ui/.env.development | 4 +- ruoyi-ui/.env.production | 4 +- ruoyi-ui/.env.staging | 4 +- .../src/assets/styles/element-variables.scss | 5 + ruoyi-ui/src/layout/components/Navbar.vue | 42 +- ruoyi-ui/src/settings.js | 2 +- ruoyi-ui/src/views/login.vue | 19 +- ruoyi-ui/src/views/mill/plan.vue | 654 +++++++++--------- ruoyi-ui/vue.config.js | 2 +- 9 files changed, 397 insertions(+), 339 deletions(-) diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development index 18b2a3ed..9d890263 100644 --- a/ruoyi-ui/.env.development +++ b/ruoyi-ui/.env.development @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = 科伦普冷轧双机架控制平台 # 开发环境配置 ENV = 'development' -# 若依管理系统/开发环境 +# 科伦普冷轧双机架控制平台/开发环境 VUE_APP_BASE_API = '/dev-api' # 路由懒加载 diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production index cb064ec8..0b558e88 100644 --- a/ruoyi-ui/.env.production +++ b/ruoyi-ui/.env.production @@ -1,8 +1,8 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = 科伦普冷轧双机架控制平台 # 生产环境配置 ENV = 'production' -# 若依管理系统/生产环境 +# 科伦普冷轧双机架控制平台/生产环境 VUE_APP_BASE_API = '/prod-api' diff --git a/ruoyi-ui/.env.staging b/ruoyi-ui/.env.staging index 730af342..6804076f 100644 --- a/ruoyi-ui/.env.staging +++ b/ruoyi-ui/.env.staging @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = 科伦普冷轧双机架控制平台 BABEL_ENV = production @@ -8,5 +8,5 @@ NODE_ENV = production # 测试环境配置 ENV = 'staging' -# 若依管理系统/测试环境 +# 科伦普冷轧双机架控制平台/测试环境 VUE_APP_BASE_API = '/stage-api' diff --git a/ruoyi-ui/src/assets/styles/element-variables.scss b/ruoyi-ui/src/assets/styles/element-variables.scss index 2ac856fa..0c1c639b 100644 --- a/ruoyi-ui/src/assets/styles/element-variables.scss +++ b/ruoyi-ui/src/assets/styles/element-variables.scss @@ -37,9 +37,14 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts'; font-size: 12px !important; padding: 0 8px !important; } +// 有前缀图标时恢复左侧 padding，避免图标与文字重叠 +.el-input--prefix .el-input__inner { padding-left: 28px !important; } +.el-input__prefix { height: 28px !important; line-height: 28px !important; display: flex; align-items: center; } .el-input--medium .el-input__inner { height: 28px !important; line-height: 28px !important; } .el-input--small .el-input__inner { height: 24px !important; line-height: 24px !important; } .el-input--mini .el-input__inner { height: 22px !important; line-height: 22px !important; } +.el-input--mini.el-input--prefix .el-input__inner { padding-left: 26px !important; } +.el-input--small.el-input--prefix .el-input__inner { padding-left: 26px !important; } // textarea .el-textarea__inner { font-size: 12px !important; padding: 4px 8px !important; } diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue index 14db4d34..d5d780c4 100644 --- a/ruoyi-ui/src/layout/components/Navbar.vue +++ b/ruoyi-ui/src/layout/components/Navbar.vue @@ -27,16 +27,14 @@
- + + {{ name }}
个人中心 - - 布局设置 - 退出登录 @@ -71,7 +69,7 @@ export default { computed: { ...mapGetters([ 'sidebar', - 'avatar', + 'name', 'device' ]), setting: { @@ -173,25 +171,33 @@ export default { } .avatar-container { - margin-right: 30px; + margin-right: 16px; .avatar-wrapper { - margin-top: 5px; - position: relative; + display: flex; + align-items: center; + gap: 6px; + cursor: pointer; + color: #5a6f85; + font-size: 12px; - .user-avatar { - cursor: pointer; - width: 40px; - height: 40px; - border-radius: 10px; + .user-icon { + font-size: 16px; + color: #1d4e89; + } + + .user-name { + font-size: 12px; + color: #2c3e50; + max-width: 80px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .el-icon-caret-bottom { - cursor: pointer; - position: absolute; - right: -20px; - top: 25px; - font-size: 12px; + font-size: 11px; + color: #909399; } } } diff --git a/ruoyi-ui/src/settings.js b/ruoyi-ui/src/settings.js index ac0358ab..a687e32d 100644 --- a/ruoyi-ui/src/settings.js +++ b/ruoyi-ui/src/settings.js @@ -2,7 +2,7 @@ module.exports = { /** * 网站标题 */ - title: '冷轧双机架二级控制系统', + title: '科伦普冷轧双机架控制平台', /** * 侧边栏主题：固定使用工业深色主题 diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index 108e82a6..074ebb44 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -56,7 +56,7 @@ @@ -178,14 +178,23 @@ export default { padding: 25px 25px 5px 25px; .el-input { height: 38px; - input { - height: 38px; + .el-input__inner { + height: 38px !important; + line-height: 38px !important; + } + &.el-input--prefix .el-input__inner { + padding-left: 34px !important; + } + .el-input__prefix { + height: 38px !important; + line-height: 38px !important; } } .input-icon { - height: 39px; - width: 14px; + height: 38px; + width: 16px; margin-left: 2px; + vertical-align: middle; } } .login-tip { diff --git a/ruoyi-ui/src/views/mill/plan.vue b/ruoyi-ui/src/views/mill/plan.vue index fe26b2a2..e5448bed 100644 --- a/ruoyi-ui/src/views/mill/plan.vue +++ b/ruoyi-ui/src/views/mill/plan.vue @@ -1,208 +1,190 @@