DeXun/double-rack
9
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

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,