1.MES去掉模块

Min
1 parent d1adef5b
Showing 4 changed files with 29 additions and 27 deletions
src/mes/common/buttonComponent/index.js
src/mes/login/index.js
src/mes/scheduledTasks/machineTasks/index.js
src/mes/teamInfo/index.js
@@ -193,13 +193,13 @@ const ButtonComponent = props =&gt; {
     ["首签样通知", 11],
     ["异常/协助提报", 12],
     ["完工清场/确认单据", 13],
-    ["拆合版", 14],
+    // ["拆合版", 14],
     null,
     null,
     ["质量巡检", 15],
     ["班组报工", 16],
     ["签样/完成", 17],
-    ["班组交接", 18],
+    // ["班组交接", 18],
     ["工单变更信息", 19],
     ["其它机台日报", 16],
     null,
@@ -212,13 +212,13 @@ const ButtonComponent = props =&gt; {
     ["First Approval Sample Notice", 11],
     ["Exception/Assistance Reporting", 12],
     ["Post-Completion Clearance/Confirmation", 13],
-    ["Plate Splitting/Combining", 14],
+    // ["Plate Splitting/Combining", 14],
     null,
     null,
     ["Quality Patrol Inspection List", 15],
     ["Team Production Reporting", 16],
     ["Sign-off/Completion", 17],
-    ["Team Handover", 18],
+    // ["Team Handover", 18],
     ["Work Order Change Information", 19],
     ["Other Machine Daily Report", 16],
     null,
@@ -277,6 +277,8 @@ const ButtonComponent = props =&gt; {
     }
   });
  
+  console.log(',enulist', menuList);
+
  
  
   // 点击
@@ -425,7 +425,7 @@ const login = baseProps =&gt; {
   const props = useLoginEvent(useCommonBase(baseProps));
   const { configs , app, companys } = props;
   const sysObj = commonUtils.isNotEmptyArr(companys) ?  companys[0] : [];
-  console.log('222', sysObj);
+
   const sLanguage = sysObj?.sLanguage || 'sEnglish';
  
   const oeeTitle =
@@ -1042,15 +1042,15 @@
                         backgroundColor: "#FF6600"
                     }
                     },
-                    {
-                    key: "2-4",
-                    label: <span className={styles.statusDropdown}>{FSMaintenance}</span>,
-                    value: {
-                        conent2: FSMaintenance,
-                        backgroundColor: "#FF6600",
-                        fontSize: 130
-                    }
-                    },
+                    // {
+                    // key: "2-4",
+                    // label: <span className={styles.statusDropdown}>{FSMaintenance}</span>,
+                    // value: {
+                    //     conent2: FSMaintenance,
+                    //     backgroundColor: "#FF6600",
+                    //     fontSize: 130
+                    // }
+                    // },
                     {
                     key: "2-5",
                     label: <span className={styles.statusDropdown}>{annualMaintenance}</span>,
@@ -698,7 +698,7 @@ const TeamJoinInfo = props =&gt; {
   const joinInfoTableData = commonUtils
     .filteredArr(
       props.formData?.map((e, i) => {
-        if (i >= 3 && i <= 5) {
+        if (i >= 3 && i <= 4) {
           return { showName: e.showName, tableName: e.sGrd };
         }
       })
@@ -712,7 +712,7 @@ const TeamJoinInfo = props =&gt; {
         onChange: () => {}
       },
       onTableBtnClick: props.onTableBtnClick,
-      fixedHeight: tableName === "slave4" ? "230px" : "160px"
+      fixedHeight: tableName === "slave4" ? "400px" : "160px"
     };
  
     result.tableBtnsConfig = result.config?.gdsconfigformslave
@@ -743,17 +743,17 @@ const TeamJoinInfo = props =&gt; {
         </h2>
       </Row>
       <Row className="teamInfoBox">
-        <Col span={6} className="teamInfoLeft">
-          {joinInfoData?.map((item, i) => (
-            <div key={i} className="infoBox">
-              <h2>{item.showName}</h2>
-              <div className="infoBorBox">
-                {slave1Data.length > 0 ? slave1Data[0][item.sName] : ""}
-              </div>
-            </div>
-          ))}
-        </Col>
-        <Col span={18} className="teamInfoRight">
+        {/*<Col span={6} className="teamInfoLeft">*/}
+        {/*  {joinInfoData?.map((item, i) => (*/}
+        {/*    <div key={i} className="infoBox">*/}
+        {/*      <h2>{item.showName}</h2>*/}
+        {/*      <div className="infoBorBox">*/}
+        {/*        {slave1Data.length > 0 ? slave1Data[0][item.sName] : ""}*/}
+        {/*      </div>*/}
+        {/*    </div>*/}
+        {/*  ))}*/}
+        {/*</Col>*/}
+        <Col span={24} className="teamInfoRight">
           {joinInfoTableData?.map((item, i) => (
             <div key={i} className="infoBox">
               <h2>{item.showName}</h2>