diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js index 86fce11..6cb6d74 100644 --- a/src/components/Common/CommonTable/index.js +++ b/src/components/Common/CommonTable/index.js @@ -1221,12 +1221,9 @@ class CommonTableRc extends React.Component { /** 行选择 */ onDoubleClick = (name, record) => { if (this.props.onDoubleClickNew) { - console.log('onDoubleClick', 1111); - this.props.onDoubleClickNew({ name, record }); } else if (this.props.onDoubleClick !== undefined) { this.props.onDoubleClick(record); - console.log('onDoubleClick', 2222); } }; diff --git a/src/mes/common/siderInfoComponent/index.js b/src/mes/common/siderInfoComponent/index.js index c90bf75..74e5566 100644 --- a/src/mes/common/siderInfoComponent/index.js +++ b/src/mes/common/siderInfoComponent/index.js @@ -640,6 +640,8 @@ const DeviceTargetInfoComponent = () => { {equipmentTargetInformation} {showConfig.map((config, index) => { + console.log(showConfig, 'showConfig'); + // if (index > 4) return ""; // bPushDiff const { bPushDiff = false } = props?.app?.userinfo @@ -648,12 +650,13 @@ const DeviceTargetInfoComponent = () => { odd: index % 2 === 0 }); const showTypeProps = handleGetShowTypeProps(config); - if (index > 4 && !bPushDiff) { - return '' - } - if (index > 4 && bPushDiff && !['dPieceDefectBQty', 'dPieceDefectAQty', 'dTotalAdjust'].includes(config?.sName)) { - return '' + if ( + ['dPieceDefectAQty', 'dPieceDefectBQty'].includes(config?.sName) && + !bPushDiff + ) { + return null; // 不满足条件,不渲染 } + // 'dTotalAdjust', 'dSpeed' if (config?.sName?.endsWith("Qty")) { return (