Commit 8400249e07a64b74c8dd04a5607ab2333c1c81c2

Authored by chenxt
1 parent dcb8e995

礼盒机上班拉长

Showing 1 changed file with 9 additions and 5 deletions
src/mes/teamInfo/index.js
@@ -579,6 +579,8 @@ const TeamInfo = baseProps => { @@ -579,6 +579,8 @@ const TeamInfo = baseProps => {
579 } 579 }
580 }); 580 });
581 } 581 }
  582 + const {sMachineNameStr} = props?.app || {}
  583 + const isSMachineNameStr = sMachineNameStr && sMachineNameStr.includes('礼盒')
582 return ( 584 return (
583 <div className={styles.teamInfo}> 585 <div className={styles.teamInfo}>
584 {bManual ? ( 586 {bManual ? (
@@ -717,7 +719,7 @@ const TeamInfo = baseProps =&gt; { @@ -717,7 +719,7 @@ const TeamInfo = baseProps =&gt; {
717 ) : ( 719 ) : (
718 // bManual = false 时的布局:维持原样 720 // bManual = false 时的布局:维持原样
719 <> 721 <>
720 - <div className="teamPost"> 722 + <div className="teamPost" style={{ height: isSMachineNameStr ? '50%' : '31%' }}>
721 <div className="teamInfo"> 723 <div className="teamInfo">
722 <h2> 724 <h2>
723 <img src={teaIcon} /> 725 <img src={teaIcon} />
@@ -774,7 +776,7 @@ const TeamInfo = baseProps =&gt; { @@ -774,7 +776,7 @@ const TeamInfo = baseProps =&gt; {
774 </div> 776 </div>
775 <div className="postList"> 777 <div className="postList">
776 <Spin spinning={props.loadings} delay={500}> 778 <Spin spinning={props.loadings} delay={500}>
777 - <StaticEditTable {...tableProps} /> 779 + <StaticEditTable {...tableProps} fixedHeight={isSMachineNameStr?300:130} />
778 <CommonOperationBarComponent {...operationBarProps} /> 780 <CommonOperationBarComponent {...operationBarProps} />
779 </Spin> 781 </Spin>
780 </div> 782 </div>
@@ -871,7 +873,8 @@ const TeamJoinInfo = props =&gt; { @@ -871,7 +873,8 @@ const TeamJoinInfo = props =&gt; {
871 }) 873 })
872 ) 874 )
873 ?.filter(item => item.tableName !== "slave3"); 875 ?.filter(item => item.tableName !== "slave3");
874 - 876 + const {sMachineNameStr} = props?.app || {}
  877 + const isSMachineNameStr = sMachineNameStr && sMachineNameStr.includes('礼盒')
875 const tableProps = tableName => { 878 const tableProps = tableName => {
876 const result = { 879 const result = {
877 ...commonBusiness.getTableTypes(tableName, props), 880 ...commonBusiness.getTableTypes(tableName, props),
@@ -879,7 +882,7 @@ const TeamJoinInfo = props =&gt; { @@ -879,7 +882,7 @@ const TeamJoinInfo = props =&gt; {
879 onChange: () => { } 882 onChange: () => { }
880 }, 883 },
881 onTableBtnClick: props.onTableBtnClick, 884 onTableBtnClick: props.onTableBtnClick,
882 - fixedHeight: tableName === "slave4" ? "230px" : "160px" 885 + fixedHeight: isSMachineNameStr? (tableName === "slave4" ? "100px" : "80px") : tableName === "slave4" ? "230px" : "160px"
883 }; 886 };
884 887
885 result.tableBtnsConfig = result.config?.gdsconfigformslave 888 result.tableBtnsConfig = result.config?.gdsconfigformslave
@@ -901,8 +904,9 @@ const TeamJoinInfo = props =&gt; { @@ -901,8 +904,9 @@ const TeamJoinInfo = props =&gt; {
901 props.onChangeRouter({ type: "name", path: ["计划任务", "机台任务"] }); 904 props.onChangeRouter({ type: "name", path: ["计划任务", "机台任务"] });
902 }; 905 };
903 const workHandoverInformation = commonFunc.showLocalMessage(props, 'workHandoverInformation', '上班交接信息'); 906 const workHandoverInformation = commonFunc.showLocalMessage(props, 'workHandoverInformation', '上班交接信息');
  907 +
904 return ( 908 return (
905 - <div className="joinInfo"> 909 + <div className="joinInfo" style={{ height: isSMachineNameStr ? '49%' : '68%' }}>
906 <Row className="teamTitle"> 910 <Row className="teamTitle">
907 <h2 style={{ color: "#1890ff", margin: 0 }}> 911 <h2 style={{ color: "#1890ff", margin: 0 }}>
908 <img src={joinIcon} /> 912 <img src={joinIcon} />