From da40b6816fc489e739ca67298c7679950cc2586e Mon Sep 17 00:00:00 2001 From: pengm <674192343@qq.com> Date: Mon, 22 Sep 2025 11:41:21 +0800 Subject: [PATCH] 1.MES系统功能 修复样式问题 --- src/mes/common/RunningStatus/index.js | 23 +++++++++++++++++------ src/mes/indexMes/assets/logout.svg | 2 +- src/mes/indexMes/assets/shutdown.svg | 4 ++-- src/mes/indexMes/index.js | 7 +++++++ src/mes/indexMes/index.less | 104 ++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------- 5 files changed, 67 insertions(+), 73 deletions(-) diff --git a/src/mes/common/RunningStatus/index.js b/src/mes/common/RunningStatus/index.js index 7538784..beccf5f 100644 --- a/src/mes/common/RunningStatus/index.js +++ b/src/mes/common/RunningStatus/index.js @@ -489,6 +489,9 @@ const RunningStatus = props => { }, [sAbClassifycode, sAbsStatusName, tableData.length] ); + const selectDrivingFirst = commonFunc.showLocalMessage(props, 'selectDrivingFirst', '请先选择一条行车记录'); + + const fillRecordTime = commonFunc.showLocalMessage(props, 'fillRecordTime', '请先填写新增行车记录的结束时间!'); const contentProps = { ...props, @@ -498,14 +501,14 @@ const RunningStatus = props => { if (!data) return; const { sPlcMachineStatusName, bUnChanged } = viewRow; if (commonUtils.isEmptyObject(viewRow)) { - message.info("请先选择一条行车记录！", 3); + message.info(selectDrivingFirst, 3); return; } if (viewRow.bSaveAbnormal) { return; } if (bUnChanged) { - message.info("请先填写新增行车记录的结束时间！", 3); + message.info(fillRecordTime, 3); return; } // if (sPlcMachineStatusName === "运行" && data.sClassifyName !== "sType1") { @@ -540,8 +543,10 @@ const RunningContent = props => { if (!dataList.length) return; const tempData = []; + console.log('dataList123', dataList); dataList.filter(item => item.sClassifyName).forEach(item => { const { sClassifyName, group } = item; + console.log('sss', group); const rowspan = Math.ceil(group.length / 6); for (let i = 0; i < rowspan; i++) { const [title, className, classNameTd] = sTypeJson[sClassifyName]; @@ -553,11 +558,14 @@ const RunningContent = props => { status: [ ...group.filter((_, index) => index >= i * 6 && index < i * 6 + 6) ].map(rowData => { - const { sStatusName, sId } = rowData; + console.log('2122', rowData); + const { sStatusName, sId, sName } = rowData; const [name, status] = sStatusName.split(" "); + console.log('aaaa', name , status); + const statusValue = sStatusName?.replace(sName , ''); return { - name, - status, + name:sName, + status:statusValue, className: selectedRowKeys.includes(sId) ? classNameTd : "", rowData: { ...rowData, sClassifyName1: title } }; @@ -594,6 +602,9 @@ const RunningContent = props => { } }; + + console.log('ddata', data); + return (
{ >

{tdData.name}

-

{tdData.status}

+

{tdData.status}

))} diff --git a/src/mes/indexMes/assets/logout.svg b/src/mes/indexMes/assets/logout.svg index 339b37c..fdaf263 100644 --- a/src/mes/indexMes/assets/logout.svg +++ b/src/mes/indexMes/assets/logout.svg @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/src/mes/indexMes/assets/shutdown.svg b/src/mes/indexMes/assets/shutdown.svg index 11b73aa..a1512f7 100644 --- a/src/mes/indexMes/assets/shutdown.svg +++ b/src/mes/indexMes/assets/shutdown.svg @@ -1,6 +1,6 @@  - + - \ No newline at end of file + diff --git a/src/mes/indexMes/index.js b/src/mes/indexMes/index.js index 2461c81..0de2301 100644 --- a/src/mes/indexMes/index.js +++ b/src/mes/indexMes/index.js @@ -35,6 +35,10 @@ import zhCN from "antd/lib/locale-provider/zh_CN"; import enUS from 'antd/lib/locale-provider/en_US'; // 导入英文语言包 import zhTW from 'antd/lib/locale-provider/zh_TW'; // 导入繁体中文语言包 import Draggable from 'react-draggable'; +import changePwdIcon from './assets/changePwd.svg'; +import logoutIcon from './assets/logout.svg'; +import shutdownIcon from './assets/shutdown.svg'; + // 内容展示组件 @@ -1164,6 +1168,7 @@ const SystemFunComponent = () => { handleSystemFunClick("changePwd"); }} > + {ModifyPassword}
{ handleSystemFunClick("logout"); }} > + {Logout}
{ handleSystemFunClick("shutdown"); }} > + {shutDown}
div { - .size(209px, 48px); - .flex(center, center); - - &:hover { - background-color: #555555; - } - - span { - font-size: 18px; - color: @base-color; - cursor: default; - } - } - - .restDailyReport { - span[role="img"] { - margin-right: 9px; - font-size: 25px; - } - } - - .changePwd { - background: url(./assets/changePwd.svg) no-repeat; - } - - .logout { - background: url(./assets/shutdownIcon.png) no-repeat; - } - - .shutdown { - background: url(./assets/shutdown.svg) no-repeat; - } - - .restDailyReport { - &:hover { - background-size: 24px 24px; + .systemFunContent { + &>div { + display: flex; + align-items: center; + margin: 8px 0; + .size(209px, 48px); + //.flex(center, center); + + &:hover { + background-color: #555555; + } + span:first-child{ + width: 40px; + margin-left: 20px; + } + + span { + font-size: 18px; + color: @base-color; + cursor: default; + } + } + .restDailyReport { + span[role="img"] { + //margin-right: 9px; + font-size: 25px; + } + } + + .restDailyReport { + &:hover { + background-size: 24px 24px; + + span:nth-child(1) { + font-size: 28px; + } + + + } + } - span:nth-child(1) { - font-size: 28px; - } - - span:nth-child(2) { - font-size: 20px; - } - } - } - - .changePwd, - .logout, - .shutdown { - background-size: 20px 20px; - padding-left: 30px; - background-position-x: 28%; - background-position-y: center; - - &:hover { - background-size: 24px 24px; - - span { - font-size: 20px; - } - } - } } -- libgit2 0.22.2