Commit 06419a7d6f767b36a2e1ebede66fffe7db58e273

Authored by Min
1 parent d3055208

1.修复计划任务的转产,设备停机状态告知翻译

src/mes/indexMes/index.js
@@ -688,7 +688,21 @@ const MachineMessageComponent = ({ e , shutDown, props }) => { @@ -688,7 +688,21 @@ const MachineMessageComponent = ({ e , shutDown, props }) => {
688 const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消'); 688 const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消');
689 const confirmState = commonFunc.showLocalMessage(props, 'confirmState', '确认退出该状态?'); 689 const confirmState = commonFunc.showLocalMessage(props, 'confirmState', '确认退出该状态?');
690 690
691 - const handleMenuClose = () => { 691 + const equipmentShutdown = commonFunc.showLocalMessage(props, 'equipmentShutdown', '设备停机状态告知');
  692 + const beginTime = commonFunc.showLocalMessage(props, 'startTime', '开始时间');
  693 + const downtimeDuration = commonFunc.showLocalMessage(props, 'downtimeDuration', '停机耗时');
  694 + const hour = commonFunc.showLocalMessage(props, 'hour', '时');
  695 + const min = commonFunc.showLocalMessage(props, 'min', '分');
  696 + const second = commonFunc.showLocalMessage(props, 'second', '秒');
  697 + const ExitLogin = commonFunc.showLocalMessage(props, 'ExitLogin', '退出');
  698 + const minimize = commonFunc.showLocalMessage(props, 'minimize', '最小化');
  699 +
  700 + const sct = commonFunc.showLocalMessage(props, 'sct', '系统当前时间:');
  701 + const DowntimeStartTime = commonFunc.showLocalMessage(props, 'DowntimeStartTime', '停机开始时间:');
  702 + const cdd = commonFunc.showLocalMessage(props, 'cdd', '此次停机耗时:');
  703 + const about = commonFunc.showLocalMessage(props, 'about', '约:');
  704 +
  705 + const handleMenuClose = () => {
692 Modal.confirm({ 706 Modal.confirm({
693 title: FriendlyReminder, 707 title: FriendlyReminder,
694 content: <div>{confirmState}</div>, 708 content: <div>{confirmState}</div>,
@@ -730,8 +744,8 @@ const MachineMessageComponent = ({ e , shutDown, props }) =&gt; { @@ -730,8 +744,8 @@ const MachineMessageComponent = ({ e , shutDown, props }) =&gt; {
730 <div ref={draggleRef} className={styles.maxBoxViews} style={{ '--bgColor' : backgroundColor }}> 744 <div ref={draggleRef} className={styles.maxBoxViews} style={{ '--bgColor' : backgroundColor }}>
731 <div className="mixbox" onDoubleClick={()=>isMinMax.current = 'max'}> 745 <div className="mixbox" onDoubleClick={()=>isMinMax.current = 'max'}>
732 <h2>{conent2}</h2> 746 <h2>{conent2}</h2>
733 - <div className="p">开始时间 {startTime}</div>  
734 - <div className="p">停机耗时:{diffHours}时 {diffMins}分 {diffSecs}秒</div> 747 + <div className="p">{beginTime} {startTime}</div>
  748 + <div className="p">{downtimeDuration}{diffHours}{second} {diffMins}{min} {diffSecs}{second}</div>
735 <div className="btn"> 749 <div className="btn">
736 <Button size="large" type="primary" className={styles.btnWg} onClick={()=>isMinMax.current = 'max'} > 最大化 </Button> 750 <Button size="large" type="primary" className={styles.btnWg} onClick={()=>isMinMax.current = 'max'} > 最大化 </Button>
737 <Button size="large" type="primary" className={styles.btnWg} onClick={handleMenuClose} > 退出 </Button> 751 <Button size="large" type="primary" className={styles.btnWg} onClick={handleMenuClose} > 退出 </Button>
@@ -741,28 +755,28 @@ const MachineMessageComponent = ({ e , shutDown, props }) =&gt; { @@ -741,28 +755,28 @@ const MachineMessageComponent = ({ e , shutDown, props }) =&gt; {
741 </Draggable> 755 </Draggable>
742 : 756 :
743 <div className={styles.machineStatusContent} style={{ backgroundColor }}> 757 <div className={styles.machineStatusContent} style={{ backgroundColor }}>
744 - <div className="conent1">设备停机状态告知</div> 758 + <div className="conent1">{equipmentShutdown}</div>
745 <div className="conent2" style={fontSize ? { fontSize } : {}}> 759 <div className="conent2" style={fontSize ? { fontSize } : {}}>
746 {conent2} 760 {conent2}
747 </div> 761 </div>
748 <div className="conent3"> 762 <div className="conent3">
749 - 停机开始时间: 763 + {DowntimeStartTime}
750 {startTime} 764 {startTime}
751 </div> 765 </div>
752 <div className="conent4"> 766 <div className="conent4">
753 - 系统当前时间: 767 + {sct}
754 {currentTime} 768 {currentTime}
755 </div> 769 </div>
756 <div className="conent5"> 770 <div className="conent5">
757 - 此次停机耗时: 771 + {cdd}
758 <span className="conent6"> 772 <span className="conent6">
759 - 约:  
760 - {diffHours}时 {diffMins}分 {diffSecs}秒 773 + {about}
  774 + {diffHours}{hour} {diffMins}{min} {diffSecs}{second}
761 </span> 775 </span>
762 </div> 776 </div>
763 <div className="conent7"> 777 <div className="conent7">
764 - <Button size="large" type="primary" className={styles.btnWg} onClick={()=>isMinMax.current = 'min'} > 最小化 </Button>  
765 - <Button size="large" type="primary" className={styles.btnWg} onClick={handleMenuClose} > 退出 </Button> 778 + <Button size="large" type="primary" className={styles.btnWg} onClick={()=>isMinMax.current = 'min'} > {minimize} </Button>
  779 + <Button size="large" type="primary" className={styles.btnWg} onClick={handleMenuClose} > {ExitLogin} </Button>
766 </div> 780 </div>
767 </div> 781 </div>
768 } 782 }
src/mes/scheduledTasks/machineTasks/index.js
@@ -784,7 +784,7 @@ @@ -784,7 +784,7 @@
784 <h3>{taskInfoData.sStatusNameTitle}:</h3> 784 <h3>{taskInfoData.sStatusNameTitle}:</h3>
785 <p>{taskInfoData.sStatusNameConent}</p> 785 <p>{taskInfoData.sStatusNameConent}</p>
786 </div> 786 </div>
787 - <StatusBtnComponent props = {props}/> 787 + <StatusBtnComponent props ={ props}/>
788 </div> 788 </div>
789 </Col> 789 </Col>
790 <Col span={10} className="taskInfoBox"> 790 <Col span={10} className="taskInfoBox">
@@ -962,12 +962,12 @@ @@ -962,12 +962,12 @@
962 }; 962 };
963 963
964 // 全屏状态 964 // 全屏状态
965 - const StatusBtnComponent = (props) => { 965 + const StatusBtnComponent = ({props}) => {
966 966
967 const test = commonFunc.showLocalMessage(props, 'test', '测试'); 967 const test = commonFunc.showLocalMessage(props, 'test', '测试');
968 - const switchProduction = commonFunc.showLocalMessage(props, 'switchProduction', '转产'); 968 + const switchProduction = commonFunc.showLocalMessage(props, 'switchProduction', '转111产');
969 const maintain = commonFunc.showLocalMessage(props, 'maintain', '保养'); 969 const maintain = commonFunc.showLocalMessage(props, 'maintain', '保养');
970 - const productSampling = commonFunc.showLocalMessage(props, 'productSampling', '产品打样'); 970 + const productSampling = commonFunc.showLocalMessage(props, 'productSampling', '产品打111样');
971 const processTesting = commonFunc.showLocalMessage(props, 'processTesting', '工艺测试'); 971 const processTesting = commonFunc.showLocalMessage(props, 'processTesting', '工艺测试');
972 const dailyMaintenance = commonFunc.showLocalMessage(props, 'dailyMaintenance', '日常保养'); 972 const dailyMaintenance = commonFunc.showLocalMessage(props, 'dailyMaintenance', '日常保养');
973 const firstMaintenance = commonFunc.showLocalMessage(props, 'firstMaintenance', '日常保养'); 973 const firstMaintenance = commonFunc.showLocalMessage(props, 'firstMaintenance', '日常保养');
@@ -975,6 +975,8 @@ @@ -975,6 +975,8 @@
975 const FSMaintenance = commonFunc.showLocalMessage(props, 'FSMaintenance', '一级+二级保养'); 975 const FSMaintenance = commonFunc.showLocalMessage(props, 'FSMaintenance', '一级+二级保养');
976 const annualMaintenance = commonFunc.showLocalMessage(props, 'annualMaintenance', '年度保养'); 976 const annualMaintenance = commonFunc.showLocalMessage(props, 'annualMaintenance', '年度保养');
977 977
  978 + console.log('2222', switchProduction, props);
  979 +
978 const items = [ 980 const items = [
979 { 981 {
980 key: "4", 982 key: "4",