From 7236585846c37994ea3bf02304cca9289c10a115 Mon Sep 17 00:00:00 2001
From: pengm <674192343@qq.com>
Date: Fri, 26 Sep 2025 13:34:03 +0800
Subject: [PATCH] 1.修复当前设备状态整体界面样式，翻译合计数量

---
 src/components/Common/CommonComponent/index.js |  3 ++-
 src/components/Common/CommonTable/index.js     |  8 +++++---
 src/components/Common/CommonView/index.js      |  4 +++-
 src/default.less                               | 10 ++++++----
 src/mes/common/commonModelComponent/index.js   |  4 +++-
 src/mes/indexMes/index.less                    |  8 ++++----
 src/mes/scheduledTasks/machineTasks/index.js   |  2 +-
 src/mes/scheduledTasks/machineTasks/index.less |  4 ++--
 8 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/components/Common/CommonComponent/index.js b/src/components/Common/CommonComponent/index.js
index 70f0d9d..4324048 100644
--- a/src/components/Common/CommonComponent/index.js
+++ b/src/components/Common/CommonComponent/index.js
@@ -2969,8 +2969,9 @@ export default class CommonComponent extends Component {
     /* commonClassify 制单日期、制单人员新增时设置保存时自动生成 */
     let speacilNote = '';
     const { record } = this.props;
+    const afterSave = commonFunc.showLocalMessage(this.props, 'afterSave', '保存后自动生成');
     if (commonUtils.isNotEmptyObject(record) && commonUtils.isEmptyObject(record[sName]) && commonUtils.isNotEmptyObject(sName) && (sName === 'tCreateDate' || sName === 'sMakePerson')) {
-      speacilNote = (<div className="speacialNote" style={{ position: 'absolute', padding: '0px 4px' }}> 保存后自动生成</div>);
+      speacilNote = (<div className="speacialNote" style={{ position: 'absolute', padding: '0px 4px' }}> {afterSave}</div>);
     }
 
     /* 如果是图片类型 ，加载图片 */
diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js
index 17ee1df..dc14a2c 100644
--- a/src/components/Common/CommonTable/index.js
+++ b/src/components/Common/CommonTable/index.js
@@ -8815,7 +8815,7 @@ class CommonTableRc extends React.Component {
                   }
                 >
                   {" "}
-                  {sValue}热热热
+                  {sValue}
                 </span>
               </Tooltip>
             )}
@@ -11893,6 +11893,8 @@ const useCommonTableEvent = props => {
   const Outputproduction = commonFunc.showLocalMessage(props, 'Outputproduction', '报工产量');
   const Workinghours = commonFunc.showLocalMessage(props, 'Workinghours', '计时工时');
   const pieceworkHours = commonFunc.showLocalMessage(props, 'pieceworkHours', '计件工时');
+  const productQuantity = commonFunc.showLocalMessage(props, 'productQuantity', '成品数量(万套):');
+  const sumSet = commonFunc.showLocalMessage(props, 'sumSet', '合计');
 
   if (
     (["12710101117087404588200", "12710101117260270570210"].includes(
@@ -11969,8 +11971,8 @@ const useCommonTableEvent = props => {
 
         return (
           <div className={styles.totalDiv}>
-            <div className="total">合计</div>
-            <div className="totalName">成品数量(万套):</div>
+            <div className="total">{sumSet}</div>
+            <div className="totalName">{productQuantity}</div>
             <div className="totalValue">
               {commonUtils.convertFixNum(dProductionCount, maxDigits)}
             </div>
diff --git a/src/components/Common/CommonView/index.js b/src/components/Common/CommonView/index.js
index 3519ea8..a375a7b 100644
--- a/src/components/Common/CommonView/index.js
+++ b/src/components/Common/CommonView/index.js
@@ -7,6 +7,7 @@ import ShowType from '@/components/Common/CommonComponent';
 import AntdDraggableModal from '@/components/Common/AntdDraggableModal';
 import CommonListSelectTree from '@/components/Common/CommonListSelectTree';
 import * as commonUtils from '@/utils/utils';/* 通用方法 */
+import * as commonFunc from "@/components/Common/commonFunc";
 
 const FormItem = Form.Item;
 // const EachInputHeight = 32;
@@ -136,6 +137,7 @@ export default class CommonView extends Component {
   render() {
     const { sModelsId, enabled, sUseInfo, app, sModelsType, tableConfigType, isEnabledPlcNo } = this.props;
     const { commonFieldPopupVisible, randomId, previewVisible, previewImage } = this.state;
+    const afterSave = commonFunc.showLocalMessage(this.props, 'afterSave', '保存后自动2222生成');
     let { masterData } = this.props;
     const masterConfig = this.props.masterconfig ? this.props.masterconfig : this.props.masterConfig;
     masterData = masterData === undefined ? {} : masterData;
@@ -241,7 +243,7 @@ export default class CommonView extends Component {
                   <ShowType {...showTypeProps} />
                   {masterData !== undefined && commonUtils.isEmptyObject(masterData[child.sName]) && (child.sName === 'sBillNo' || child.sName === 'sMakePerson' || child.sName === 'tCheckDate' || child.sName === 'sCheckPerson') ?
                     <Col style={{ display: enabled ? 'block' : 'none' }} className="speacialNote" key={child.sId} span="12">
-                      {sModelsType !== 'smg/sendMailMsg' ? '保存后自动生成' : '发送消息无需生成单据号'}
+                      {sModelsType !== 'smg/sendMailMsg' ? afterSave : '发送消息无需生成单据号'}
                     </Col> : '' }
                 </Col>
               );
diff --git a/src/default.less b/src/default.less
index 332c04e..c00f473 100644
--- a/src/default.less
+++ b/src/default.less
@@ -936,13 +936,15 @@
   }
 
   .masterLinkSpan {
-    width: auto;
-    height: 26px;
-    line-height: 26px;
+    font-size: 18px!important;
+    width: 120%; /* 设置宽度为100% */
+    height: 100%; /* 设置高度为100% */
+    //line-height: 26px;
     overflow: hidden;
     color: #2f54eb;
     position: absolute;
     padding-right: 2px;
+    background-color: #f3f9ff; /* 添加背景色 */
     z-index: 10;
     cursor: pointer;
   }
@@ -1012,4 +1014,4 @@
       display: none;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/mes/common/commonModelComponent/index.js b/src/mes/common/commonModelComponent/index.js
index d6f71cb..b62556b 100644
--- a/src/mes/common/commonModelComponent/index.js
+++ b/src/mes/common/commonModelComponent/index.js
@@ -1926,6 +1926,8 @@ const CommonRepairComponent = props => {
   const modalName = "commonRepairModal";
   const { [`${modalName}Params`]: params = {} } = props;
 
+  const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消');
+
   const {
     visible,
     title,
@@ -2050,7 +2052,7 @@ const CommonRepairComponent = props => {
                 params.tableName=='slaveWyrj2'? <Button size="large" onClick={onEmptyClick}>清空</Button> : null
             }
           <Button size="large" onClick={onCancel}>
-            取消
+            {BtnCancel}
           </Button>
           <Button size="large" type="primary" onClick={onOk}>
             {confirmBtnName}
diff --git a/src/mes/indexMes/index.less b/src/mes/indexMes/index.less
index 8cd466a..a01492d 100644
--- a/src/mes/indexMes/index.less
+++ b/src/mes/indexMes/index.less
@@ -294,23 +294,23 @@
     top: 0;
     .size(1076px, 100%);
     .flex(flex-start, center);
-    padding-left: 160px;
+    padding-left: 120px;
     flex-direction: column;
     text-align: left;
     color: #FFF;
 
     :global {
       .conent1 {
-        font-size: 64px;
+        font-size: 50px;
       }
 
       .conent2 {
-        font-size: 160px;
+        font-size: 120px;
         font-weight: bold;
       }
 
       .conent3 {
-        font-size: 36px;
+        font-size: 28px;
       }
 
       .conent4 {
diff --git a/src/mes/scheduledTasks/machineTasks/index.js b/src/mes/scheduledTasks/machineTasks/index.js
index 619e62a..406dcc8 100644
--- a/src/mes/scheduledTasks/machineTasks/index.js
+++ b/src/mes/scheduledTasks/machineTasks/index.js
@@ -975,7 +975,7 @@
       const FSMaintenance = commonFunc.showLocalMessage(props, 'FSMaintenance', '一级+二级保养');
       const annualMaintenance = commonFunc.showLocalMessage(props, 'annualMaintenance', '年度保养');
 
-      console.log('2222', switchProduction, props);
+
 
         const items = [
             {
diff --git a/src/mes/scheduledTasks/machineTasks/index.less b/src/mes/scheduledTasks/machineTasks/index.less
index 61dd262..9c0f9b6 100644
--- a/src/mes/scheduledTasks/machineTasks/index.less
+++ b/src/mes/scheduledTasks/machineTasks/index.less
@@ -424,7 +424,7 @@
 // }
 
 .statusDropdown {
-  font-size: 20px;
+  font-size: 16px;
 }
 
 
@@ -460,4 +460,4 @@
 //     height: 100%;
 //     width: 100%;
 //     position: relative;
-// }
\ No newline at end of file
+// }
--
libgit2 0.22.2