设备及目标信息根据bPushDiff展示字段

chenxt
1 parent 7209c814
Showing 4 changed files with 26 additions and 21 deletions
src/components/Common/CommonHooks/useCommonBase.js
src/mes/common/siderInfoComponent/index.js
src/mes/common/siderInfoComponent/index.less
src/utils/config.js
@@ -2975,7 +2975,6 @@ const useCommonBase = props =&gt; {
     }
  
     const newData = bAddFirst ? [addRowData, ...data] : [...data, addRowData];
-    console.log("🚀 ~ handleMesTableLineAdd ~ newData:", newData,masterData,state,props)
     const selectedRowKeys = [newSid];
     const addState = {};
     if (location.pathname.includes("indexPad")) {
@@ -352,8 +352,8 @@ const WorkOrderTypeComponent = () =&gt; {
   const [productionDivId] = useState(
     `productionDivId_${commonUtils.createSid()}`
   );
-  const task= commonFunc.showLocalMessage(props, 'task', '任务：工单信息');
-  const specialFocus= commonFunc.showLocalMessage(props, 'specialFocus', '任务：工单信息');
+  const task = commonFunc.showLocalMessage(props, 'task', '任务：工单信息');
+  const specialFocus = commonFunc.showLocalMessage(props, 'specialFocus', '任务：工单信息');
  
   return (
     <div className={styles.workOrdertype} ref={ref}>
@@ -404,7 +404,7 @@ const WorkOrderTypeComponent = () =&gt; {
                       const { sProcessName, sState } = item;
                       let colorValue;
                       switch (
-                        Number(sState) // 根据状态显示颜色
+                      Number(sState) // 根据状态显示颜色
                       ) {
                         case 2:
                           colorValue = "#FF7E37"; /* 2：等待:黄色 */
@@ -501,12 +501,12 @@ const WorkOrderTypeComponent = () =&gt; {
                           >
                             {viewRow.specialMemo
                               ? viewRow.specialMemo
-                                  .split(",")
-                                  .map(item => (
-                                    <div className={styles.mesSpecial}>
-                                      {item}
-                                    </div>
-                                  ))
+                                .split(",")
+                                .map(item => (
+                                  <div className={styles.mesSpecial}>
+                                    {item}
+                                  </div>
+                                ))
                               : ""}
                           </Col>
                         </Row>
@@ -533,11 +533,10 @@ const WorkOrderTypeComponent = () =&gt; {
                             style={{ cursor: "not-allowed", gap: 5 }}
                           >
                             <span
-                              className={`noInput ${
-                                viewRow.sLabelColor
-                                  ? styles[`mesColor${colorIndex}`]
-                                  : ""
-                              }`}
+                              className={`noInput ${viewRow.sLabelColor
+                                ? styles[`mesColor${colorIndex}`]
+                                : ""
+                                }`}
                             >
                               <span>{viewRow.sLabelColor}</span>
                             </span>
@@ -634,7 +633,6 @@ const DeviceTargetInfoComponent = () =&gt; {
     };
   };
   const equipmentTargetInformation = commonFunc.showLocalMessage(props, 'equipmentTargetInformation', '设备及目标信息');
-
   return (
     <div className={styles.deviceTargetInfo}>
       <div className="mesTitle" style={{ padding: "10px 10px 5px" }}>
@@ -642,13 +640,20 @@ const DeviceTargetInfoComponent = () =&gt; {
         {equipmentTargetInformation}
       </div>
       {showConfig.map((config, index) => {
-        if (index > 4) return "";
+        // if (index > 4) return "";
+        // bPushDiff
+        const { bPushDiff = false } = props?.app?.userinfo
         const className = cx({
           mesShowType: true,
           odd: index % 2 === 0
         });
         const showTypeProps = handleGetShowTypeProps(config);
-
+        if (index > 4 && !bPushDiff) {
+          return ''
+        }
+        if (index > 4 && bPushDiff && !['dPieceDefectBQty', 'dPieceDefectAQty'].includes(config?.sName)) {
+          return ''
+        }
         if (config?.sName?.endsWith("Qty")) {
           return (
             <div className={`${className} dynamicClock`}>
@@ -754,7 +759,7 @@ const TeamInfoComponent = () =&gt; {
   const teamShiftInfo = props.teamShiftInfoData?.[0] || {};
   const { sEmployeeName = "", sEmployeeNo = "" } = teamShiftInfo;
  
-  const teamInformation= commonFunc.showLocalMessage(props, 'teamInformation', '班组信息');
+  const teamInformation = commonFunc.showLocalMessage(props, 'teamInformation', '班组信息');
  
   const captain = commonFunc.showLocalMessage(props, 'captain', '机长');
  
@@ -218,7 +218,8 @@
 // 设备及目标信息
 .deviceTargetInfo {
   //   .size(100%, 25%);
-  .size(100%, 230px);
+  .size(100%);
+  max-height: 330px;
   //   margin-bottom: 15px;
   background-color: #FFF6DE;
  
@@ -6,7 +6,7 @@ export const webSite = {
   // faceAddress: isDev ? '//192.168.11.22:8080/xlyFace' : '//' + location.host + '/xlyFace',
   fileAddress: isDev ? '//km5cjx.gnway.cc:43920/xlyReport/' : '//' + location.host + '/xlyReport/', // 接口地址
   faceAddress: isDev ? '//km5cjx.gnway.cc:43920/xlyFace' : '//' + location.host + '/xlyFace',
-  ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//km5cjx.gnway.cc:47400/xlyEntry/' : '//' + location.host + '/xlyEntry/',
+  ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//km5cjx.gnway.cc:43920/xlyEntry/' : '//' + location.host + '/xlyEntry/',
   interfaceAddress: isDev ? '//km5cjx.gnway.cc:43920/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址
   // ipAddress: isDev ? '//ebc.jinjia.com:8091/xlyEntry/' : '//' + location.host + '/xlyEntry/',
   // interfaceAddress: isDev ? '//ebc.jinjia.com:8091/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址