diff --git a/src/mes/common/RunningStatus/index.js b/src/mes/common/RunningStatus/index.js index bee4acd..ba1f056 100644 --- a/src/mes/common/RunningStatus/index.js +++ b/src/mes/common/RunningStatus/index.js @@ -13,7 +13,7 @@ import ShowType from "@/components/Common/CommonComponent"; import styles from "./index.less"; import { cloneDeep } from "lodash"; -const sTypeJson = { +const sTypeJson1 = { sType1: ["行车状态", "green", "greenTd"], sType2: ["正常待机", "cyan", "cyanTd"], sType3: ["不正常待机(材料异常)", "red", "redTd"], @@ -26,6 +26,19 @@ const sTypeJson = { "": ["其它", "blue", "blueTd"] }; +const sTypeJson = { + sType1: ["Vehicle Status", "green", "greenTd"], + sType2: ["Normal Standby", "cyan", "cyanTd"], + sType3: ["Abnormal Standby (Material Issue)", "red", "redTd"], + sType4: ["Abnormal Standby (Process Issue", "red", "redTd"], + sType5: ["Abnormal Standby (Production Issue)", "red", "redTd"], + sType6: ["Abnormal Standby (Other)", "red", "redTd"], + sType7: ["Abnormal Standby", "red", "redTd"], + sType8: ["Equipment Maintenance", "blue", "blueTd"], + sType9: ["Equipment Repair", "blue", "blueTd"], + "": ["其它", "blue", "blueTd"] +}; + // 业务层 const businessTier = props => { const { formData = [], copyTo = {} } = props; diff --git a/src/mes/common/buttonComponent/index.js b/src/mes/common/buttonComponent/index.js index 28c98d0..d7263d1 100644 --- a/src/mes/common/buttonComponent/index.js +++ b/src/mes/common/buttonComponent/index.js @@ -199,7 +199,7 @@ const ButtonComponent = props => { ["Production Execution", 10], ["First Approval Sample Notice", 11], ["Exception/Assistance Reporting", 12], - ["Completion & Clearance", 13], + ["Post-Completion Clearance/Confirmation", 13], ["Plate Splitting/Combining", 14], null, null, diff --git a/src/mes/common/commonModelComponent/index.js b/src/mes/common/commonModelComponent/index.js index b0c06a9..5ab4d0c 100644 --- a/src/mes/common/commonModelComponent/index.js +++ b/src/mes/common/commonModelComponent/index.js @@ -1258,6 +1258,8 @@ const CommonModelComponent = props => { bFirstComponent: level === 0 && index === -1 }; + console.log('222', sName, componentProps) + const commonDivHeight = useComputedCommonDivHeight(componentProps); return (
{ width = "100%", height = "100%" } = item; - console.log('ssconfigLists', configList); + console.log('ssconfigLists', configList, sEntireTabName ); const sEntireTabNameNew = sLanguage === 'sEnglish' ? sEnglishEntireTabName + '1111' : sLanguage === 'sBig5EntireTabName' ? sBig5EntireTabName : sEntireTabName; const advancedStyle = @@ -1465,8 +1467,9 @@ const TabTitleComponent = props => { return
; } } + console.log('sTabNsme', sTabName); - if (sTabName.split("_")[0] === "空") return ""; + if (sTabName.split("_")[0] === "空" || sTabName.split("_")[0] === "Empty" ) return ""; const costomTitle = props.costomTitle && sTabName === "下料信息" ? props.costomTitle : ""; @@ -1502,7 +1505,7 @@ const CommonViewTableComponent = props => { if (selectedRowKeys.length) { viewRow = dataArr.find(item => item.sId === selectedRowKeys[0]); } - + console.log('111111第', sTabName) if (sTabName?.startsWith("第") && sTabName?.endsWith("转")) { viewRow = data.filter(item => item.sRev === sTabName)[0]; } @@ -1510,7 +1513,7 @@ const CommonViewTableComponent = props => { if (commonUtils.isEmptyObject(viewRow)) { viewRow = Array.isArray(data) ? data[0] || {} : data; } - + console.log('viewRow', viewRow) if ( commonUtils.isNotEmptyObject(viewRow) && !selectedRowKeys[0] && @@ -1556,12 +1559,9 @@ const CommonViewTableComponent = props => { }); } } + const groupList = sTabName?.split(",") || []; - const sLanguage = props.app.userinfo?.sLanguage; - - const sTabLocalName = sLanguage === 'sEnglish' ? sEnglishTabName : sTabName; - - const groupList = sTabLocalName?.split(",") || []; + console.log('groupList', groupList) const viewConfigsList = groupList.map((tabName, index) => { if (tabName === "隐藏") { return []; @@ -1583,6 +1583,7 @@ const CommonViewTableComponent = props => { ); } }); + console.log('viewConfigsList', viewConfigsList); const operationBarProps = { ...props, @@ -1599,6 +1600,11 @@ const CommonViewTableComponent = props => { setReportInfoVisible(!reportInfoVisible); }; + + const sLanguage = props.app.userinfo?.sLanguage; + const sTabLocalName = sLanguage === 'sEnglish' ? sEnglishTabName : sTabName; + const groupListNew = sTabLocalName?.split(",") || []; + return ( <> {sName === "master" ? ( @@ -1630,7 +1636,7 @@ const CommonViewTableComponent = props => { return ( <> - + { }; const stepName = sTabName?.split("_")[1] || ""; + + console.log('ssss', stepName); if (stepName.startsWith("第") && stepName.endsWith("转")) { tableProps.data = tableProps.data.filter(item => item.sRev === stepName); } diff --git a/src/mes/scheduledTasks/abnormalEventReporting/index.js b/src/mes/scheduledTasks/abnormalEventReporting/index.js index ee8dafd..de8c8fd 100644 --- a/src/mes/scheduledTasks/abnormalEventReporting/index.js +++ b/src/mes/scheduledTasks/abnormalEventReporting/index.js @@ -416,7 +416,7 @@ const RightPartComponent = props => { // ); } }; - + const report = commonFunc.showLocalMessage(props, 'report', '提报'); return (
@@ -433,7 +433,7 @@ const RightPartComponent = props => { />
- +
);