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

双机架完成全局样式替换，并且完成工艺管理和生产计划管理，以及完成udp电文数据贯通能力

Browse Source
This commit is contained in:
wangyu
2026-04-28 14:44:13 +08:00
parent 3e0484b55c
commit f1e0303645
20 changed files with 447 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -45,3 +45,5 @@ nbdist/
!*/build/*.java
!*/build/*.html
!*/build/*.xml
.cursor

3
.vscode/settings.json vendored Normal file
View File

@@ -0,0 +1,3 @@
{
"java.compile.nullAnalysis.mode": "automatic"
}

5
ruoyi-mill/pom.xml
View File

@@ -19,6 +19,11 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-framework</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

3
ruoyi-mill/src/main/java/com/ruoyi/mill/controller/MillProductionPlanController.java
View File

@@ -2,7 +2,6 @@ package com.ruoyi.mill.controller;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.mill.domain.MillProductionPlan;
import com.ruoyi.mill.service.IMillProductionPlanService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +9,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping("/mill/plan")
@RequestMapping("/mill/production-plan")
public class MillProductionPlanController extends BaseController {
@Autowired

62
ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillPlan.java
View File

@@ -2,13 +2,18 @@ package com.ruoyi.mill.domain;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import java.math.BigDecimal;
/**
* 冷轧生产计划 — 对应 2FK101 作业命令信息
*/
@Data
public class MillPlan extends BaseEntity {
private Long planId;
@Excel(name = "计划号")
private String planNo;
@@ -67,62 +72,5 @@ public class MillPlan extends BaseEntity {
@Excel(name = "备注")
private String remark;
// ---- getters / setters ----
public String getPlanNo() { return planNo; }
public void setPlanNo(String v) { this.planNo = v; }
public String getMatSeqNo() { return matSeqNo; }
public void setMatSeqNo(String v) { this.matSeqNo = v; }
public String getUnitCode() { return unitCode; }
public void setUnitCode(String v) { this.unitCode = v; }
public String getPlanType() { return planType; }
public void setPlanType(String v) { this.planType = v; }
public Integer getPlanStatus() { return planStatus; }
public void setPlanStatus(Integer v) { this.planStatus = v; }
public String getInMatNo() { return inMatNo; }
public void setInMatNo(String v) { this.inMatNo = v; }
public BigDecimal getInMatThick() { return inMatThick; }
public void setInMatThick(BigDecimal v) { this.inMatThick = v; }
public BigDecimal getInMatThickMax() { return inMatThickMax; }
public void setInMatThickMax(BigDecimal v) { this.inMatThickMax = v; }
public BigDecimal getInMatThickMin() { return inMatThickMin; }
public void setInMatThickMin(BigDecimal v) { this.inMatThickMin = v; }
public BigDecimal getInMatWidth() { return inMatWidth; }
public void setInMatWidth(BigDecimal v) { this.inMatWidth = v; }
public BigDecimal getInMatWt() { return inMatWt; }
public void setInMatWt(BigDecimal v) { this.inMatWt = v; }
public BigDecimal getInMatLen() { return inMatLen; }
public void setInMatLen(BigDecimal v) { this.inMatLen = v; }
public BigDecimal getInMatInDia() { return inMatInDia; }
public void setInMatInDia(BigDecimal v) { this.inMatInDia = v; }
public BigDecimal getInMatDia() { return inMatDia; }
public void setInMatDia(BigDecimal v) { this.inMatDia = v; }
public String getPono() { return pono; }
public void setPono(String v) { this.pono = v; }
public String getSgSign() { return sgSign; }
public void setSgSign(String v) { this.sgSign = v; }
public String getOutMatNo() { return outMatNo; }
public void setOutMatNo(String v) { this.outMatNo = v; }
public String getCustInMatNo() { return custInMatNo; }
public void setCustInMatNo(String v) { this.custInMatNo = v; }
public String getRemark() { return remark; }
public void setRemark(String v) { this.remark = v; }
}

33
ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProcessPass.java
View File

@@ -2,11 +2,16 @@ package com.ruoyi.mill.domain;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import java.math.BigDecimal;
/** 工艺方案道次详情 */
@Data
public class MillProcessPass extends BaseEntity {
private Long passId;
private Long recipeId;
@Excel(name = "道次")
@@ -47,32 +52,4 @@ public class MillProcessPass extends BaseEntity {
private String delFlag;
public Long getRecipeId() { return recipeId; }
public void setRecipeId(Long v) { this.recipeId = v; }
public Integer getPassNo() { return passNo; }
public void setPassNo(Integer v) { this.passNo = v; }
public BigDecimal getInThick() { return inThick; }
public void setInThick(BigDecimal v) { this.inThick = v; }
public BigDecimal getOutThick() { return outThick; }
public void setOutThick(BigDecimal v) { this.outThick = v; }
public BigDecimal getWidth() { return width; }
public void setWidth(BigDecimal v) { this.width = v; }
public BigDecimal getRollForce() { return rollForce; }
public void setRollForce(BigDecimal v) { this.rollForce = v; }
public BigDecimal getInTension() { return inTension; }
public void setInTension(BigDecimal v) { this.inTension = v; }
public BigDecimal getOutTension() { return outTension; }
public void setOutTension(BigDecimal v) { this.outTension = v; }
public BigDecimal getMaxSpeed() { return maxSpeed; }
public void setMaxSpeed(BigDecimal v) { this.maxSpeed = v; }
public BigDecimal getInUnitTension() { return inUnitTension; }
public void setInUnitTension(BigDecimal v) { this.inUnitTension = v; }
public BigDecimal getOutUnitTension() { return outUnitTension; }
public void setOutUnitTension(BigDecimal v){ this.outUnitTension = v; }
public BigDecimal getReduction() { return reduction; }
public void setReduction(BigDecimal v) { this.reduction = v; }
public BigDecimal getTotalReduction() { return totalReduction; }
public void setTotalReduction(BigDecimal v){ this.totalReduction = v; }
public String getDelFlag() { return delFlag; }
public void setDelFlag(String v) { this.delFlag = v; }
}

24
ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProcessRecipe.java
View File

@@ -2,12 +2,17 @@ package com.ruoyi.mill.domain;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/** 工艺方案主表 */
@Data
public class MillProcessRecipe extends BaseEntity {
private Long recipeId;
@Excel(name = "方案记录号")
private String recipeNo;
@@ -34,23 +39,4 @@ public class MillProcessRecipe extends BaseEntity {
/** 关联道次列表（非数据库字段） */
private List<MillProcessPass> passList;
public String getRecipeNo() { return recipeNo; }
public void setRecipeNo(String v) { this.recipeNo = v; }
public String getAlloyNo() { return alloyNo; }
public void setAlloyNo(String v) { this.alloyNo = v; }
public Integer getPassCount() { return passCount; }
public void setPassCount(Integer v) { this.passCount = v; }
public BigDecimal getInThick() { return inThick; }
public void setInThick(BigDecimal v) { this.inThick = v; }
public BigDecimal getOutThick() { return outThick; }
public void setOutThick(BigDecimal v) { this.outThick = v; }
public BigDecimal getOutWidth() { return outWidth; }
public void setOutWidth(BigDecimal v) { this.outWidth = v; }
public String getStatus() { return status; }
public void setStatus(String v) { this.status = v; }
public String getDelFlag() { return delFlag; }
public void setDelFlag(String v) { this.delFlag = v; }
public List<MillProcessPass> getPassList() { return passList; }
public void setPassList(List<MillProcessPass> v) { this.passList = v; }
}

48
ruoyi-mill/src/main/java/com/ruoyi/mill/domain/MillProductionPlan.java
View File

@@ -2,11 +2,16 @@ package com.ruoyi.mill.domain;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import java.math.BigDecimal;
/** 生产计划（轧制队列） */
@Data
public class MillProductionPlan extends BaseEntity {
private Long planId;
@Excel(name = "计划号")
private String planNo;
@@ -65,47 +70,4 @@ public class MillProductionPlan extends BaseEntity {
private String recipeNo;
private String delFlag;
public String getPlanNo() { return planNo; }
public void setPlanNo(String v) { this.planNo = v; }
public String getMatSeqNo() { return matSeqNo; }
public void setMatSeqNo(String v) { this.matSeqNo = v; }
public String getUnitCode() { return unitCode; }
public void setUnitCode(String v) { this.unitCode = v; }
public String getPlanType() { return planType; }
public void setPlanType(String v) { this.planType = v; }
public String getPlanStatus() { return planStatus; }
public void setPlanStatus(String v) { this.planStatus = v; }
public String getProdStatus() { return prodStatus; }
public void setProdStatus(String v) { this.prodStatus = v; }
public Integer getSortNo() { return sortNo; }
public void setSortNo(Integer v) { this.sortNo = v; }
public String getInMatNo() { return inMatNo; }
public void setInMatNo(String v) { this.inMatNo = v; }
public BigDecimal getInMatThick() { return inMatThick; }
public void setInMatThick(BigDecimal v) { this.inMatThick = v; }
public BigDecimal getInMatWidth() { return inMatWidth; }
public void setInMatWidth(BigDecimal v) { this.inMatWidth = v; }
public BigDecimal getInMatWt() { return inMatWt; }
public void setInMatWt(BigDecimal v) { this.inMatWt = v; }
public BigDecimal getInMatLen() { return inMatLen; }
public void setInMatLen(BigDecimal v) { this.inMatLen = v; }
public BigDecimal getInMatInDia() { return inMatInDia; }
public void setInMatInDia(BigDecimal v) { this.inMatInDia = v; }
public BigDecimal getInMatDia() { return inMatDia; }
public void setInMatDia(BigDecimal v) { this.inMatDia = v; }
public String getPono() { return pono; }
public void setPono(String v) { this.pono = v; }
public String getSgSign() { return sgSign; }
public void setSgSign(String v) { this.sgSign = v; }
public String getOutMatNo() { return outMatNo; }
public void setOutMatNo(String v) { this.outMatNo = v; }
public BigDecimal getOutThick() { return outThick; }
public void setOutThick(BigDecimal v) { this.outThick = v; }
public Long getRecipeId() { return recipeId; }
public void setRecipeId(Long v) { this.recipeId = v; }
public String getRecipeNo() { return recipeNo; }
public void setRecipeNo(String v) { this.recipeNo = v; }
public String getDelFlag() { return delFlag; }
public void setDelFlag(String v) { this.delFlag = v; }
}

4
ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MillProcessRecipeServiceImpl.java
View File

@@ -48,7 +48,7 @@ public class MillProcessRecipeServiceImpl implements IMillProcessRecipeService {
recipe.setUpdateBy(SecurityUtils.getUsername());
recipeMapper.update(recipe);
// 先删除旧道次，再重新插入
passMapper.deleteByRecipeId(recipe.getId());
passMapper.deleteByRecipeId(recipe.getRecipeId());
savePassList(recipe);
return 1;
}
@@ -67,7 +67,7 @@ public class MillProcessRecipeServiceImpl implements IMillProcessRecipeService {
if (list == null || list.isEmpty()) return;
String user = SecurityUtils.getUsername();
for (MillProcessPass p : list) {
p.setRecipeId(recipe.getId());
p.setRecipeId(recipe.getRecipeId());
p.setCreateBy(user);
p.setUpdateBy(user);
}

8
ruoyi-mill/src/main/java/com/ruoyi/mill/service/impl/MillProductionPlanServiceImpl.java
View File

@@ -58,8 +58,8 @@ public class MillProductionPlanServiceImpl implements IMillProductionPlanService
.filter(p -> p.getSortNo() == cur.getSortNo() - 1)
.findFirst().orElse(null);
if (prev == null) return 0;
planMapper.updateSortNo(cur.getId(), prev.getSortNo());
planMapper.updateSortNo(prev.getId(), cur.getSortNo());
planMapper.updateSortNo(cur.getPlanId(), prev.getSortNo());
planMapper.updateSortNo(prev.getPlanId(), cur.getSortNo());
return 1;
}
@@ -73,8 +73,8 @@ public class MillProductionPlanServiceImpl implements IMillProductionPlanService
.filter(p -> p.getSortNo() == cur.getSortNo() + 1)
.findFirst().orElse(null);
if (next == null) return 0;
planMapper.updateSortNo(cur.getId(), next.getSortNo());
planMapper.updateSortNo(next.getId(), cur.getSortNo());
planMapper.updateSortNo(cur.getPlanId(), next.getSortNo());
planMapper.updateSortNo(next.getPlanId(), cur.getSortNo());
return 1;
}
}

4
ruoyi-mill/src/main/resources/mapper/mill/MillProcessPassMapper.xml
View File

@@ -4,7 +4,7 @@
<mapper namespace="com.ruoyi.mill.mapper.MillProcessPassMapper">
<resultMap id="BaseRM" type="com.ruoyi.mill.domain.MillProcessPass">
<id property="id" column="id"/>
<id property="passId" column="pass_id"/>
<result property="recipeId" column="recipe_id"/>
<result property="passNo" column="pass_no"/>
<result property="inThick" column="in_thick"/>
@@ -27,7 +27,7 @@
</resultMap>
<select id="selectByRecipeId" resultMap="BaseRM">
SELECT id, recipe_id, pass_no, in_thick, out_thick, width,
SELECT pass_id, recipe_id, pass_no, in_thick, out_thick, width,
roll_force, in_tension, out_tension, max_speed,
in_unit_tension, out_unit_tension, reduction, total_reduction,
del_flag, create_by, create_time, update_by, update_time, remark

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

@@ -4,7 +4,7 @@
<mapper namespace="com.ruoyi.mill.mapper.MillProcessRecipeMapper">
<resultMap id="BaseRM" type="com.ruoyi.mill.domain.MillProcessRecipe">
<id property="id" column="id"/>
<id property="recipeId" column="recipe_id"/>
<result property="recipeNo" column="recipe_no"/>
<result property="alloyNo" column="alloy_no"/>
<result property="passCount" column="pass_count"/>
@@ -21,7 +21,7 @@
</resultMap>
<sql id="cols">
id, recipe_no, alloy_no, pass_count, in_thick, out_thick, out_width,
recipe_id, recipe_no, alloy_no, pass_count, in_thick, out_thick, out_width,
status, del_flag, create_by, create_time, update_by, update_time, remark
</sql>
@@ -38,12 +38,12 @@
<if test="status != null and status != ''">
AND status = #{status}
</if>
ORDER BY id ASC
ORDER BY recipe_id ASC
</select>
<select id="selectById" resultMap="BaseRM">
SELECT <include refid="cols"/> FROM mill_process_recipe
WHERE id = #{id} AND del_flag = '0'
WHERE recipe_id = #{recipeId} AND del_flag = '0'
</select>
<select id="selectByRecipeNo" resultMap="BaseRM">
@@ -73,17 +73,17 @@
update_by = #{updateBy},
update_time = NOW(),
remark = #{remark}
WHERE id = #{id}
WHERE recipe_id = #{recipeId}
</update>
<update id="deleteById">
UPDATE mill_process_recipe SET del_flag = '2', update_time = NOW() WHERE id = #{id}
UPDATE mill_process_recipe SET del_flag = '2', update_time = NOW() WHERE recipe_id = #{recipeId}
</update>
<update id="deleteBatchByIds">
UPDATE mill_process_recipe SET del_flag = '2', update_time = NOW()
WHERE id IN
<foreach collection="array" item="id" open="(" separator="," close=")">#{id}</foreach>
WHERE recipe_id IN
<foreach collection="array" item="recipeId" open="(" separator="," close=")">#{recipeId}</foreach>
</update>
</mapper>

12
ruoyi-mill/src/main/resources/mapper/mill/MillProductionPlanMapper.xml
View File

@@ -4,7 +4,7 @@
<mapper namespace="com.ruoyi.mill.mapper.MillProductionPlanMapper">
<resultMap id="BaseRM" type="com.ruoyi.mill.domain.MillProductionPlan">
<id property="id" column="id"/>
<id property="planId" column="plan_id"/>
<result property="planNo" column="plan_no"/>
<result property="matSeqNo" column="mat_seq_no"/>
<result property="unitCode" column="unit_code"/>
@@ -34,7 +34,7 @@
</resultMap>
<sql id="cols">
id, plan_no, mat_seq_no, unit_code, plan_type, plan_status, prod_status, sort_no,
plan_id, plan_no, mat_seq_no, unit_code, plan_type, plan_status, prod_status, sort_no,
in_mat_no, in_mat_thick, in_mat_width, in_mat_wt, in_mat_len, in_mat_in_dia, in_mat_dia,
pono, sg_sign, out_mat_no, out_thick, recipe_id, recipe_no,
del_flag, create_by, create_time, update_by, update_time, remark
@@ -63,7 +63,7 @@
<select id="selectById" resultMap="BaseRM">
SELECT <include refid="cols"/> FROM mill_production_plan
WHERE id = #{id} AND del_flag = '0'
WHERE plan_id = #{planId} AND del_flag = '0'
</select>
<select id="selectByPlanNo" resultMap="BaseRM">
@@ -106,11 +106,11 @@
update_by = #{updateBy},
update_time = NOW(),
remark = #{remark}
WHERE id = #{id}
WHERE plan_id = #{planId}
</update>
<update id="deleteById">
UPDATE mill_production_plan SET del_flag = '2', update_time = NOW() WHERE id = #{id}
UPDATE mill_production_plan SET del_flag = '2', update_time = NOW() WHERE plan_id = #{planId}
</update>
<update id="incrementSortFrom">
@@ -119,7 +119,7 @@
</update>
<update id="updateSortNo">
UPDATE mill_production_plan SET sort_no = #{sortNo} WHERE id = #{id}
UPDATE mill_production_plan SET sort_no = #{sortNo} WHERE plan_id = #{planId}
</update>
</mapper>

29
ruoyi-ui/src/api/mill/productionPlan.js Normal file
View File

@@ -0,0 +1,29 @@
import request from '@/utils/request'
export function listProductionPlan(query) {
return request({ url: '/mill/production-plan/list', method: 'get', params: query })
}
export function getProductionPlan(id) {
return request({ url: `/mill/production-plan/${id}`, method: 'get' })
}
export function addProductionPlan(data) {
return request({ url: '/mill/production-plan', method: 'post', data })
}
export function updateProductionPlan(data) {
return request({ url: '/mill/production-plan', method: 'put', data })
}
export function delProductionPlan(id) {
return request({ url: `/mill/production-plan/${id}`, method: 'delete' })
}
export function moveUpProductionPlan(id) {
return request({ url: `/mill/production-plan/moveUp/${id}`, method: 'put' })
}
export function moveDownProductionPlan(id) {
return request({ url: `/mill/production-plan/moveDown/${id}`, method: 'put' })
}

16
ruoyi-ui/src/assets/styles/btn.scss
View File

@@ -2,9 +2,13 @@
@mixin colorBtn($color) {
background: $color;
border-color: $color;
&:hover {
color: $color;
&:hover,
&:focus {
color: $color !important;
border-color: $color !important;
background: lighten($color, 6%);
&:before,
&:after {
@@ -30,11 +34,11 @@
}
.green-btn {
@include colorBtn($green)
@include colorBtn($blue)
}
.tiffany-btn {
@include colorBtn($tiffany)
@include colorBtn($blue)
}
.yellow-btn {
@@ -86,8 +90,9 @@
line-height: 1;
white-space: nowrap;
cursor: pointer;
background: #fff;
background: #1d4e89;
color: #fff;
appearance: none;
-webkit-appearance: none;
text-align: center;
box-sizing: border-box;
@@ -96,4 +101,5 @@
padding: 10px 15px;
font-size: 14px;
border-radius: 4px;
border: 1px solid #1d4e89;
}

190
ruoyi-ui/src/assets/styles/element-ui.scss
View File

@@ -1,12 +1,40 @@
// cover some element-ui styles
.el-button--primary {
color: #fff !important;
background-color: #1d4e89 !important;
border-color: #1d4e89 !important;
&:hover,
&:focus,
&:active {
color: #fff !important;
background-color: #2471a3 !important;
border-color: #2471a3 !important;
}
}
.el-button--primary.is-plain {
color: #1d4e89 !important;
background: #eaf2fb !important;
border-color: #9fbfe0 !important;
&:hover,
&:focus,
&:active {
color: #fff !important;
background: #1d4e89 !important;
border-color: #1d4e89 !important;
}
}
.el-breadcrumb__inner,
.el-breadcrumb__inner a {
font-weight: 400 !important;
}
.el-upload {
input[type="file"] {
input[type='file'] {
display: none !important;
}
}
@@ -17,7 +45,7 @@
.cell {
.el-tag {
margin-right: 0px;
margin-right: 0;
}
}
@@ -41,7 +69,7 @@
text-align: center;
.el-tag {
margin-right: 0px;
margin-right: 0;
}
}
}
@@ -69,7 +97,7 @@
// dropdown
.el-dropdown-menu {
a {
display: block
display: block;
}
}
@@ -89,4 +117,156 @@
> .el-submenu__title
.el-submenu__icon-arrow {
display: none;
}
}
// industrial theme overrides
.el-button {
border-radius: 3px;
font-weight: 500;
transition: all 0.2s ease;
&:not(.is-disabled):hover,
&:not(.is-disabled):focus {
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.08);
}
}
.el-button--primary {
background-color: #1d4e89;
border-color: #1d4e89;
&:hover,
&:focus {
background-color: #2471a3;
border-color: #2471a3;
}
}
.el-button--success {
background-color: #2471a3;
border-color: #2471a3;
}
.el-button--warning {
background-color: #d68910;
border-color: #d68910;
}
.el-button--danger {
background-color: #c0392b;
border-color: #c0392b;
}
.el-button--mini,
.el-button--small {
padding-top: 7px;
padding-bottom: 7px;
}
.el-input__inner,
.el-textarea__inner {
background-color: #ffffff;
border-color: #dce2ea;
border-radius: 3px;
color: #2c3e50;
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.02);
&:hover {
border-color: #b9c8d8;
}
&:focus {
border-color: #1d4e89;
box-shadow: 0 0 0 2px rgba(29, 78, 137, 0.08);
}
}
.el-input.is-disabled .el-input__inner,
.el-textarea.is-disabled .el-textarea__inner {
background-color: #f5f7fa;
color: #a0a8b0;
}
.el-input-group__append,
.el-input-group__prepend {
background-color: #f7f9fc;
border-color: #dce2ea;
color: #4a5568;
}
.el-select .el-input.is-focus .el-input__inner,
.el-select .el-input__inner:focus {
border-color: #1d4e89;
}
.el-checkbox__input.is-checked .el-checkbox__inner,
.el-radio__input.is-checked .el-radio__inner {
background-color: #1d4e89;
border-color: #1d4e89;
}
.el-checkbox__input.is-focus .el-checkbox__inner,
.el-radio__input.is-focus .el-radio__inner {
border-color: #1d4e89;
}
.el-table {
color: #2c3e50;
th {
background-color: #f7f9fc !important;
color: #1c2b3a;
font-weight: 600;
}
.el-table__header-wrapper th,
.el-table__fixed-header-wrapper th {
background-color: #f7f9fc !important;
}
td,
th.is-leaf {
border-bottom-color: #e4e7ed;
}
.el-table__body tr:hover > td {
background-color: #eef4fb !important;
}
.el-table__row--striped td {
background: #fafcff;
}
}
.el-tag {
border-radius: 2px;
font-weight: 500;
}
.el-tag--info {
background-color: #eef2f7;
border-color: #dce2ea;
color: #4a5568;
}
.el-tag--warning {
background-color: #fff4e0;
border-color: #f3d19e;
color: #b9770e;
}
.el-tag--danger {
background-color: #fbeaea;
border-color: #efb3b3;
color: #a93226;
}
.el-tag--success {
background-color: #e8f4f0;
border-color: #b7ddd1;
color: #1f7a5a;
}
.el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: #1d4e89;
}

6
ruoyi-ui/src/assets/styles/element-variables.scss
View File

@@ -4,8 +4,10 @@
/* 主色：深海军蓝 */
$--color-primary: #1d4e89;
/* 成功：用钢蓝替代绿色 */
$--color-success: #2471a3;
$--button-primary-background-color: #1d4e89;
$--button-primary-border-color: #1d4e89;
/* 成功：统一使用主蓝，避免草绿色视觉 */
$--color-success: #1d4e89;
/* 警告：琥珀 */
$--color-warning: #d68910;
/* 危险：暗红 */

205
ruoyi-ui/src/assets/styles/index.scss
View File

@@ -10,23 +10,45 @@ body {
margin: 0;
background-color: #f0f2f5;
color: #2c3e50;
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
text-rendering: optimizeLegibility;
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
text-rendering: optimizeLegibility;
font-family: 'Helvetica Neue', Helvetica, 'PingFang SC', 'Microsoft YaHei',
'Source Han Sans CN', Arial, sans-serif;
'Source Han Sans CN', Arial, sans-serif;
font-size: 12px;
}
label { font-weight: 600; color: #4a5568; }
label {
font-weight: 600;
color: #4a5568;
}
html { height: 100%; box-sizing: border-box; }
#app { height: 100%; }
*, *:before, *:after { box-sizing: inherit; }
html {
height: 100%;
box-sizing: border-box;
}
a:focus, a:active { outline: none; }
a, a:focus, a:hover { cursor: pointer; color: inherit; text-decoration: none; }
div:focus { outline: none; }
#app {
height: 100%;
}
*, *:before, *:after {
box-sizing: inherit;
}
a:focus, a:active {
outline: none;
}
a, a:focus, a:hover {
cursor: pointer;
color: inherit;
text-decoration: none;
}
div:focus {
outline: none;
}
// ── 工具类 ──────────────────────────────────────────────────
.fr { float: right; }
@@ -41,20 +63,27 @@ div:focus { outline: none; }
.padding-content { padding: 4px 0; }
.clearfix:after {
visibility: hidden; display: block; font-size: 0;
content: " "; clear: both; height: 0;
visibility: hidden;
display: block;
font-size: 0;
content: ' ';
clear: both;
height: 0;
}
// ── 页面容器 ─────────────────────────────────────────────────
.app-container { padding: 12px 16px; }
.app-container {
padding: 12px 16px;
}
// ── 搜索栏 ───────────────────────────────────────────────────
// ── 搜索栏 / 筛选容器 ───────────────────────────────────────
.filter-container {
padding: 10px 12px;
margin-bottom: 10px;
background: #ffffff;
border: 1px solid #dde1e6;
border-radius: 3px;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.05);
.filter-item {
display: inline-block;
@@ -68,7 +97,7 @@ div:focus { outline: none; }
.navbar {
background-color: #1c2b3a !important;
border-bottom: 1px solid #253547 !important;
box-shadow: 0 1px 4px rgba(0,0,0,.2) !important;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2) !important;
height: 44px !important;
line-height: 44px !important;
}
@@ -112,11 +141,20 @@ div:focus { outline: none; }
}
// ── 面包屑 ───────────────────────────────────────────────────
.el-breadcrumb__inner { color: #7f8c8d !important; }
.el-breadcrumb__inner.is-link:hover { color: #1d4e89 !important; }
.el-breadcrumb__separator { color: #bdc3c7 !important; }
.el-breadcrumb__inner,
.el-breadcrumb__inner a {
color: #7f8c8d !important;
}
// ── 右侧 aside 提示 ──────────────────────────────────────────
.el-breadcrumb__inner.is-link:hover {
color: #1d4e89 !important;
}
.el-breadcrumb__separator {
color: #bdc3c7;
}
// ── 提示 / 链接样式 ─────────────────────────────────────────
aside {
background: #eaf2fb;
padding: 6px 14px;
@@ -126,53 +164,132 @@ aside {
line-height: 28px;
font-size: 12px;
color: #4a5568;
a { color: #1d4e89; &:hover { color: #2e86c1; } }
a {
color: #1d4e89;
&:hover {
color: #2e86c1;
}
}
}
.link-type, .link-type:focus {
color: #1d4e89; cursor: pointer;
&:hover { color: #2979cc; }
color: #1d4e89;
cursor: pointer;
&:hover {
color: #2979cc;
}
}
.sub-navbar {
height: 40px; line-height: 40px;
position: relative; width: 100%;
text-align: right; padding-right: 16px;
height: 40px;
line-height: 40px;
position: relative;
width: 100%;
text-align: right;
padding-right: 16px;
background: linear-gradient(90deg, #1c2b3a 0%, #1d4e89 100%);
.subtitle { font-size: 13px; color: #fff; }
.subtitle {
font-size: 13px;
color: #fff;
}
}
.components-container { margin: 16px 24px; position: relative; }
.components-container {
margin: 16px 24px;
position: relative;
}
// ── 通用卡片容器 ────────────────────────────────────────────
.page-card,
.filter-container,
.table-card,
.comm-card,
.stand-card,
.kpi-card {
border-radius: 3px;
}
// ── 机组状态指示 ─────────────────────────────────────────────
.status-dot {
display: inline-block;
width: 7px; height: 7px;
width: 7px;
height: 7px;
border-radius: 50%;
margin-right: 5px;
&.running { background-color: #2471a3; box-shadow: 0 0 4px #2471a3; }
&.stopped { background-color: #c0392b; box-shadow: 0 0 4px #c0392b; }
&.standby { background-color: #d68910; box-shadow: 0 0 4px #d68910; }
&.offline { background-color: #95a5a6; }
&.running {
background-color: #2471a3;
box-shadow: 0 0 4px #2471a3;
}
&.stopped {
background-color: #c0392b;
box-shadow: 0 0 4px #c0392b;
}
&.standby {
background-color: #d68910;
box-shadow: 0 0 4px #d68910;
}
&.offline {
background-color: #95a5a6;
}
}
// ── 工艺参数数值 ─────────────────────────────────────────────
.param-value {
font-family: 'Courier New', Courier, monospace;
font-size: 18px; font-weight: 700;
color: #1d4e89; letter-spacing: 1px;
font-size: 18px;
font-weight: 700;
color: #1d4e89;
letter-spacing: 1px;
}
.param-unit {
font-size: 11px;
color: #7f8c8d;
margin-left: 3px;
}
.param-unit { font-size: 11px; color: #7f8c8d; margin-left: 3px; }
// ── 告警闪烁 ─────────────────────────────────────────────────
@keyframes alarmBlink { 0%,100%{opacity:1} 50%{opacity:.3} }
.alarm-blink { animation: alarmBlink 1s ease-in-out infinite; color: #c0392b; }
@keyframes alarmBlink {
0%, 100% { opacity: 1; }
50% { opacity: 0.3; }
}
.alarm-blink {
animation: alarmBlink 1s ease-in-out infinite;
color: #c0392b;
}
// ── 滚动条 ───────────────────────────────────────────────────
::-webkit-scrollbar { width: 5px; height: 5px; }
::-webkit-scrollbar-track { background: #f0f2f5; }
::-webkit-scrollbar-thumb { background: #bdc3c7; border-radius: 3px; }
::-webkit-scrollbar-thumb:hover { background: #95a5a6; }
::-webkit-scrollbar {
width: 5px;
height: 5px;
}
.multiselect { line-height: 16px; }
.multiselect--active { z-index: 1000 !important; }
::-webkit-scrollbar-track {
background: #f0f2f5;
}
::-webkit-scrollbar-thumb {
background: #bdc3c7;
border-radius: 3px;
}
::-webkit-scrollbar-thumb:hover {
background: #95a5a6;
}
.multiselect {
line-height: 16px;
}
.multiselect--active {
z-index: 1000 !important;
}

2
ruoyi-ui/src/store/modules/settings.js
View File

@@ -5,7 +5,7 @@ const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dyn
const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
const state = {
title: '',
theme: storageSetting.theme || '#11A983',
theme: storageSetting.theme || '#1d4e89',
sideTheme: storageSetting.sideTheme || sideTheme,
showSettings: showSettings,
topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,

6
sql/mill_tables.sql
View File

@@ -7,7 +7,7 @@
-- ----------------------------
DROP TABLE IF EXISTS `mill_process_recipe`;
CREATE TABLE `mill_process_recipe` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
`recipe_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
`recipe_no` varchar(30) NOT NULL COMMENT '方案记录号/方案名称',
`alloy_no` varchar(24) NOT NULL COMMENT '合金号（钢种）',
`pass_count` int(4) NOT NULL DEFAULT 0 COMMENT '道次数量',
@@ -31,7 +31,7 @@ CREATE TABLE `mill_process_recipe` (
-- ----------------------------
DROP TABLE IF EXISTS `mill_process_pass`;
CREATE TABLE `mill_process_pass` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
`pass_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
`recipe_id` bigint(20) NOT NULL COMMENT '方案ID',
`pass_no` int(4) NOT NULL COMMENT '道次号',
`in_thick` decimal(9,3) NOT NULL DEFAULT 0.000 COMMENT '入口厚度(mm)',
@@ -61,7 +61,7 @@ CREATE TABLE `mill_process_pass` (
-- ----------------------------
DROP TABLE IF EXISTS `mill_production_plan`;
CREATE TABLE `mill_production_plan` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
`plan_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
`plan_no` varchar(30) NOT NULL COMMENT '计划号',
`mat_seq_no` varchar(3) DEFAULT '' COMMENT 'L3序号',
`unit_code` varchar(4) DEFAULT '' COMMENT '机组代码',