DeXun/double-rack
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

样式优化

Browse Source
This commit is contained in:
朱昊天
2026-06-17 02:11:05 +08:00
parent 2798133412
commit 73ede33466
3 changed files with 50 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ruoyi-mill/src/main/resources/mapper/mill/MillProcessRecipeMapper.xml
View File

@@ -29,12 +29,22 @@
SELECT <include refid="cols"/>
FROM mill_process_recipe
WHERE del_flag = '0'
<if test="recipeNo != null and recipeNo != ''">
AND recipe_no LIKE CONCAT('%', #{recipeNo}, '%')
</if>
<if test="alloyNo != null and alloyNo != ''">
AND alloy_no LIKE CONCAT('%', #{alloyNo}, '%')
</if>
<choose>
<when test="recipeNo != null and recipeNo != '' and alloyNo != null and alloyNo != '' and recipeNo == alloyNo">
AND (
recipe_no LIKE CONCAT('%', #{recipeNo}, '%')
OR alloy_no LIKE CONCAT('%', #{alloyNo}, '%')
)
</when>
<otherwise>
<if test="recipeNo != null and recipeNo != ''">
AND recipe_no LIKE CONCAT('%', #{recipeNo}, '%')
</if>
<if test="alloyNo != null and alloyNo != ''">
AND alloy_no LIKE CONCAT('%', #{alloyNo}, '%')
</if>
</otherwise>
</choose>
<if test="status != null and status != ''">
AND status = #{status}
</if>

38
ruoyi-ui/src/layout/components/Sidebar/Logo.vue
View File

@@ -7,7 +7,9 @@
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
<div class="sidebar-logo-inner">
<img v-if="logo" :src="logo" class="sidebar-logo" />
<h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }}</h1>
<h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">
<span v-for="(line, index) in titleLines" :key="index" class="sidebar-title-line">{{ line }}</span>
</h1>
</div>
</router-link>
</transition>
@@ -32,6 +34,12 @@ export default {
},
sideTheme() {
return this.$store.state.settings.sideTheme
},
titleLines() {
if (this.title === '科伦普冷轧双机架控制平台') {
return ['科伦普冷轧', '双机架控制平台']
}
return [this.title]
}
},
data() {
@@ -72,12 +80,14 @@ export default {
text-decoration: none;
& .sidebar-logo-inner {
display: flex;
display: inline-flex;
align-items: center;
justify-content: flex-start;
justify-content: center;
gap: 10px;
width: 100%;
padding: 0 12px;
width: auto;
max-width: calc(100% - 20px);
margin: 0 auto;
transform: translate(-6px, 5px);
}
& .sidebar-logo {
@@ -91,18 +101,24 @@ export default {
& .sidebar-title {
display: block;
margin: 0;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
color: #fff;
font-weight: 700;
line-height: 18px;
font-size: 13px;
font-family: Avenir, Helvetica Neue, Arial, 'PingFang SC', 'Microsoft YaHei', sans-serif;
vertical-align: middle;
letter-spacing: 0.2px;
white-space: normal;
word-break: break-all;
overflow: hidden;
max-height: 36px;
text-align: left;
text-align: center;
max-width: 150px;
}
& .sidebar-title-line {
display: block;
line-height: 18px;
white-space: nowrap;
}
}

14
ruoyi-ui/src/views/index.vue
View File

@@ -195,7 +195,7 @@ export default {
display: flex;
align-items: center;
justify-content: space-between;
background: #1c2b3a;
background: #2b4358;
color: #ecf0f1;
padding: 0 16px;
height: 36px;
@@ -215,10 +215,10 @@ export default {
}
}
.system-name { font-weight: 700; font-size: 13px; letter-spacing: .5px; }
.divider { color: #4a6275; }
.unit-tag { background: #1d4e89; padding: 1px 8px; border-radius: 2px; font-size: 11px; }
.sys-status { font-size: 11px; &.online { color: #7fb3d3; } }
.clock { font-family: 'Courier New', monospace; font-size: 12px; color: #aab7c4; }
.divider { color: #89a0b4; }
.unit-tag { background: rgba(133, 193, 233, 0.20); color: #eef7ff; padding: 1px 8px; border-radius: 2px; font-size: 11px; }
.sys-status { font-size: 11px; &.online { color: #abd4ee; } }
.clock { font-family: 'Courier New', monospace; font-size: 12px; color: #c4d3de; }
/* ── KPI 卡片 ── */
.kpi-row { margin-bottom: 12px; }
@@ -262,7 +262,7 @@ export default {
overflow: hidden;
&__header {
background: #1c2b3a;
background: #2b4358;
color: #ecf0f1;
padding: 7px 12px;
display: flex;
@@ -294,7 +294,7 @@ export default {
.stand-badge {
font-size: 11px; padding: 2px 8px;
border-radius: 2px; font-weight: 600;
&.running { background: #1d4e89; color: #fff; }
&.running { background: rgba(133, 193, 233, 0.20); color: #eef7ff; }
&.stopped { background: #c0392b; color: #fff; }
}