init

qmj
1 parent 58323b2c
Showing 17 changed files with 799 additions and 290 deletions
package.json
src/components/Common/CommonHooks/useCommonBase.js
src/components/Common/CommonInstructSet.js
src/components/Common/CommonTable/index.js
src/components/Common/commonFunc.js
src/indexNew.less
src/mes/common/RunningStatus/index.js
src/mes/common/RunningStatus/index.less
src/mes/common/commonModelComponent/index.js
src/mes/common/siderInfoComponent/clockComponent/index.js
src/mes/indexMes/index.js
src/mes/productionExec/productionExecMain/index.js
src/mes/scheduledTasks/machineTasks/index.js
src/mes/scheduledTasks/machineTasks/index.less
src/mes/teamInfo/index.js
src/models/app.js
src/utils/config.js
@@ -3,7 +3,7 @@
   "version": "1.0.5",
   "private": true,
   "scripts": {
-    "start": "set port=8543&roadhog server --progress --watch --colors --profile",
+    "start": "set port=9005&roadhog server --progress --watch --colors --profile",
     "build": "roadhog build",
     "lint": "eslint --ext .js src test",
     "precommit": "npm run lint"
@@ -428,20 +428,20 @@ const useCommonBase = props =&gt; {
     return {};
   };
-  const getSqlCondition = (showConfig, name, record) => {
+  const getSqlCondition = (showConfig, name, record, props = state) => {
     const conditonValues = {};
     if (commonUtils.isNotEmptyStr(showConfig.sSqlCondition)) {
       const conditon = showConfig.sSqlCondition.split(",");
       conditon.forEach(item => {
         // 特殊处理
         if (item === "sBoardNo.sBoardNo") {
-          if (commonUtils.isNotEmptyArr(state["qztable0Data"])) {
+          if (commonUtils.isNotEmptyArr(props["qztable0Data"])) {
             item = "qztable0.sBoardNo";
-          } else if (commonUtils.isNotEmptyArr(state["jytable0Data"])) {
+          } else if (commonUtils.isNotEmptyArr(props["jytable0Data"])) {
             item = "jytable0.sBoardNo";
-          } else if (commonUtils.isNotEmptyArr(state["wytable0Data"])) {
+          } else if (commonUtils.isNotEmptyArr(props["wytable0Data"])) {
             item = "wytable0.sBoardNo";
-          } else if (commonUtils.isNotEmptyArr(state["wytgtable0Data"])) {
+          } else if (commonUtils.isNotEmptyArr(props["wytgtable0Data"])) {
             item = "wytgtable0.sBoardNo";
           }
         }
@@ -457,7 +457,7 @@ const useCommonBase = props =&gt; {
               item.split(".").length > 2 ? item.split(".")[2] : fieldName;
             if (fieldName.indexOf("&Search") > -1) {
               // 参数为&Search时认为是查找数据集中取数据
-              const data = state[`${tableName}Data`];
+              const data = props[`${tableName}Data`];
               if (typeof data === "object" && data.constructor === Object) {
                 Object.keys(data).forEach(dataItem => {
                   if (`&Search${data[dataItem]}` === fieldName) {
@@ -488,6 +488,7 @@ const useCommonBase = props =&gt; {
             if (
               [
                 "userinfo",
+                "changeExecInfo",
                 "currentSelectedMachineTask",
                 "currentStartWorkMachineTask",
                 "currentWorkOrderInfo"
@@ -500,6 +501,7 @@ const useCommonBase = props =&gt; {
               );
               const tempProps = {
                 userinfo: app.userinfo,
+                changeExecInfo: commonUtils.getAppData("changeExecInfo"),
                 currentSelectedMachineTask:
                   globalData?.currentSelectedMachineTask,
                 currentStartWorkMachineTask:
@@ -511,8 +513,8 @@ const useCommonBase = props =&gt; {
               const data = record;
               conditonValues[fieldNameFilter] = data[fieldName];
             } else {
-              const data = state[`${tableName}Data`];
-              const selectedRowKeys = state[`${tableName}SelectedRowKeys`];
+              const data = props[`${tableName}Data`];
+              const selectedRowKeys = props[`${tableName}SelectedRowKeys`];
               if (typeof data === "object" && data.constructor === Object) {
                 conditonValues[fieldNameFilter] = data[fieldName];
               } else if (commonUtils.isNotEmptyArr(selectedRowKeys)) {
@@ -1939,6 +1941,8 @@ const useCommonBase = props =&gt; {
   // 调用通用过程
   const handleProcedureCall = async (params, iFlag) => {
     const {
+      bForemanCheck,
+      getFaceResult,
       btnConfig = {}, // 按钮配置
       sValue = {}, // 额外参数
       tableData: tableDataSelected, // 传过来的数据
@@ -2013,6 +2017,7 @@ const useCommonBase = props =&gt; {
           if (
             [
               "userinfo",
+              "changeExecInfo",
               "currentSelectedMachineTask",
               "currentStartWorkMachineTask",
               "currentWorkOrderInfo"
@@ -2022,6 +2027,7 @@ const useCommonBase = props =&gt; {
             const globalData = commonUtils.getAppData("globalData");
             const tempProps = {
               userinfo: app.userinfo,
+              changeExecInfo: commonUtils.getAppData("changeExecInfo"),
               currentSelectedMachineTask: globalData.currentSelectedMachineTask,
               currentStartWorkMachineTask:
                 globalData.currentStartWorkMachineTask,
@@ -2128,6 +2134,29 @@ const useCommonBase = props =&gt; {
       message.success(msg);
       onSuccess && onSuccess(true);
     } else if (code === -7) {
+      if (bForemanCheck && getFaceResult) {
+        Modal.confirm({
+          title: "温馨提示:",
+          content: <div>{handleGetMsg(msg)}</div>,
+          okText: "领班认证",
+          cancelText: "取消",
+          async onOk() {
+            Modal.destroyAll();
+            const faceResult = await getFaceResult();
+            if (!faceResult) {
+              onError && onError();
+              return;
+            };
+            const paramsNew = { ...params, faceData: { ...faceData, sForemanNo: faceResult.sEmployeeNo } };
+            handleProcedureCall(paramsNew, 1);
+          },
+          onCancel() {
+            onError && onError();
+          }
+        });
+        return;
+      }
+      
       Modal.confirm({
         title: "温馨提示:",
         content: <div>{handleGetMsg(msg)}</div>,
@@ -821,7 +821,7 @@ const handlePopup = (props, instruct) =&gt; {
         const record = filterData[0];
         sParentConditions = {
           ...sParentConditions,
-          ...props.getSqlCondition(props.btnConfig, tableName, record)
+          ...props.getSqlCondition(props.btnConfig, tableName, record, props)
         };
       });
   }
@@ -1514,6 +1514,12 @@ const handleOpenSql = async (props, instruct) =&gt; {
           ...userinfo
         };
       }
+      if (sSqlCondition.includes("changeExecInfo")) {
+        srcDatasetRow = {
+          ...srcDatasetRow,
+          ...commonUtils.getAppData("changeExecInfo")
+        };
+      }
       if (sSqlCondition.includes("currentWorkOrderInfo")) {
         srcDatasetRow = {
           ...srcDatasetRow,
@@ -2277,6 +2283,7 @@ const handleComputeData = (props, str, datasetList) =&gt; {
     [fordosetName]: fordosetData,
     ...datasetList,
     userinfo,
+    changeExecInfo: commonUtils.getAppData("changeExecInfo"),
     currentSelectedMachineTask,
     currentStartWorkMachineTask,
     currentWorkOrderInfo
@@ -2290,6 +2297,7 @@ const handleComputeData = (props, str, datasetList) =&gt; {
       key.includes("@") ||
       [
         "userinfo",
+        "changeExecInfo",
         "currentSelectedMachineTask",
         "currentStartWorkMachineTask",
         "currentWorkOrderInfo"
@@ -2454,6 +2462,9 @@ const utils = {
     if (tableName === "userinfo") {
       return [props.app.userinfo];
     }
+    if (tableName === "changeExecInfo") {
+      return [commonUtils.getAppData("changeExecInfo")];
+    }
     let _props = props;
@@ -2799,6 +2810,7 @@ const utils = {
       [fordosetName]: fordosetData,
       ...datasetListExtra,
       userinfo,
+      changeExecInfo: commonUtils.getAppData("changeExecInfo"),
       currentSelectedMachineTask,
       currentStartWorkMachineTask,
       currentWorkOrderInfo
@@ -2812,6 +2824,7 @@ const utils = {
         key.includes("@") ||
         [
           "userinfo",
+          "changeExecInfo",
           "currentSelectedMachineTask",
           "currentStartWorkMachineTask",
           "currentWorkOrderInfo"
@@ -3046,6 +3059,7 @@ const utils = {
     // 全局参数
     let allData = {
       userinfo,
+      changeExecInfo: commonUtils.getAppData("changeExecInfo"),
       currentSelectedMachineTask,
       currentStartWorkMachineTask,
       currentWorkOrderInfo,
@@ -4552,7 +4552,7 @@ class CommonTableRc extends React.Component {
           // 人检-产量上报信息-上报数量 复制第一行到全部功能
           if (
             this.props.name === "table131" &&
-            ["dProcessCalQty", "dWageHour", "dTimeHour"].includes(
+            ["dProcessCalQty", "dWageHour", "dOvertimeHour", "dTimeHour"].includes(
               column.dataIndex
             )
           ) {
@@ -4707,13 +4707,13 @@ class CommonTableRc extends React.Component {
           tableBtnsWidth = Math.max(75, tableBtnsWidth);
         }
         if (
-          ["12710101117087404588200", "12710101117260270570210"].includes(
+          (["12710101117087404588200", "12710101117260270570210"].includes(
             props.formId
           ) &&
-          props.name === "table0"
-          //   ||
-          // (props.formId === "12710101117087371044360" &&
-          //   props.name === "slave0")
+          props.name === "table0")
+            ||
+          (props.formId === "12710101117087371044360" &&
+            props.name === "slave0")
         ) {
           tableBtnsWidth = Math.max(110, tableBtnsWidth);
         }
@@ -4829,15 +4829,13 @@ class CommonTableRc extends React.Component {
             操作
             <div className={styles.mesOpr}>
               {/* 班组报工行车记录 */}
-              {["12710101117087404588200", "12710101117260270570210"].includes(
+              {(["12710101117087404588200", "12710101117260270570210"].includes(
                 props.formId
-              ) && props.name === "table0" ? (
-                //   ||
-                // (props.formId === "12710101117087371044360" &&
-                //   props.name === "slave0")
+              ) && props.name === "table0") ||
+                (props.formId === "12710101117087371044360" && props.name === "slave0") ? (
                 <Button
                   className={styles.mesCopy}
-                  disabled={!props.data.length}
+                  disabled={!props.data?.filter(item => props.selectedRowKeys?.includes(item.sId)).some(item => item.bCanBeCopy)}
                   style={{ width: "auto", height: 32, fontSize: 16 }}
                   // icon={<CopyOutlined />}
                   onClick={async e => {
@@ -4938,7 +4936,7 @@ class CommonTableRc extends React.Component {
                       cancelText: "取消",
                       onOk() {
                         props.parentProps.onExecInstructSet({
-                          nextProps: { ...props, table0Data: table0DataNew },
+                          nextProps: { ...props, [`${props.name}Data`]: table0DataNew },
                           btnConfig: {
                             showName: "保存",
                             sInstruct: JSON.stringify([
@@ -4948,7 +4946,7 @@ class CommonTableRc extends React.Component {
                                 data: [
                                   {
                                     tablename: "mftproductionreportslave",
-                                    srcDataset: "table0"
+                                    srcDataset: props.name
                                   }
                                 ]
                               },
@@ -6942,7 +6940,7 @@ class CommonTableRc extends React.Component {
         if ( this.props.parentProps.slaveConfig.sId == "12710101117056272345580" && tbName === "slave" ) {
             let newTableData = tableData.filter(e => e.sBoardName) || [];
-            
+
             // 如果版号已存在则过滤
             // const result = selectData.filter(item1 =>!newTableData.some(item2 => item2.sBoardName === item1.sBoardName));
             let newSelectData = selectData.map((item, index) => {
@@ -6974,7 +6972,7 @@ class CommonTableRc extends React.Component {
-      
+
       selectData.forEach((item, index) => {
         const newCopyTo = {};
@@ -8835,9 +8833,9 @@ class CommonTableRc extends React.Component {
       if (showTypeNewProps.enabled) {
         if (
           (props.name === "table131" &&
-            ["dProcessCalQty", "dTimeHour"].includes(sName)) ||
+            ["dProcessCalQty", "dOvertimeHour", "dTimeHour"].includes(sName)) ||
           (props.name === "table132" &&
-            ["dWageHour", "dTimeHour"].includes(sName))
+            ["dWageHour", "dOvertimeHour", "dTimeHour"].includes(sName))
         ) {
           // 人检/包装特殊处理
           res = (
@@ -11913,7 +11911,7 @@ const useCommonTableEvent = props =&gt; {
         <div className={styles.totalDiv}>
           <div className="total">已报合计</div>
           <div className="totalName">计件工时:</div>
-          <div className="totalValue">{dWageHour}</div>
+          <div className="totalValue">{dWageHour.toFixed(2)}</div>
           <div className="totalName">计时工时:</div>
           <div className="totalValue">{dTimeHour}</div>
           <div className="totalName">报工产量:</div>
@@ -11925,6 +11923,58 @@ const useCommonTableEvent = props =&gt; {
     };
   }
+  if (["12710101117087404588200"].includes(props.formId) && props.name === "table1") {
+
+    const headerColumn = props.headerColumn || [];
+
+    // 获取需要合计的列配置（bSum=true的列）
+    const sumColumns = headerColumn?.filter(col => col.dataIndex.indexOf('Report') > -1 &&  col.bSum === true || col.bSum === 1) || [];
+
+    addState.getTotalDiv = () => {
+      // 初始化合计对象，根据sumColumns动态生成初始值
+      const initialValues = sumColumns.reduce((obj, col) => {
+        obj[col.dataIndex] = 0;
+        return obj;
+      }, {});
+
+      // 动态计算合计值
+      const totalData = data.reduce((pre, item) => {
+        sumColumns.forEach(col => {
+          const dataIndex = col.dataIndex;
+          if (item[dataIndex] !== undefined && item[dataIndex] !== null) {
+            pre[dataIndex] += Number(item[dataIndex]) || 0;
+          }
+        });
+        return pre;
+      }, initialValues);
+
+      return (
+        <div className={styles.totalDiv}>
+          <div className="total">已报合计</div>
+          {sumColumns.map((col, index) => {
+            const value = totalData[col.dataIndex];
+            // 根据数值类型决定是否保留两位小数
+            const displayValue = typeof value === 'number' && !Number.isInteger(value)
+              ? value.toFixed(2)
+              : value;
+
+            return (
+              <>
+                <div key={`totalName-${index}`} className="totalName">
+                  {col.title}:
+                </div>
+                <div key={`totalValue-${index}`} className="totalValue">
+                  {displayValue}
+                </div>
+              </>
+            );
+          })}
+        </div>
+      );
+    };
+  }
+
+
   if (
     ["12710101117087404588200", "12710101117260270570210"].includes(
       props.formId
@@ -102,6 +102,7 @@ export function getHeaderConfig(config) {
         sTitleBgColor: child.sFontBgColor, /* 设置表格标题背景颜色 */
         sTitleColor: child.sFontColor, /* 设置表格标题字体颜色 */
         bCheckBox: child.bCheckBox, /* 是否支持表头多选 */
+        bSum: child.bSum, /* 是否合计 */
       });
     }
   }
@@ -372,6 +372,10 @@
       border-radius: 5px;
       height: 40px !important;
     }
+
+    .ant-select-selection-item {
+      font-size: 18px;
+    }
   }
   .ant-btn-primary[disabled],
 /*
-	* @Author: Sakura
+  * @Author: Sakura
  * @LastEditors: Sakura
-	* @Date: 2024-02-28 9:55:04
-	* @Description: 设备状态组件
+  * @Date: 2024-02-28 9:55:04
+  * @Description: 设备状态组件
 */
-import React, { useEffect, useState } from "react";
+import React, { useRef, useEffect, useState } from "react";
 import { Button, message } from "antd";
 import * as commonFunc from "@/components/Common/commonFunc";
 import * as commonUtils from "@/utils/utils";
 import useCommonBase from "@/components/Common/CommonHooks/useCommonBase";
+import * as commonBusiness from "@/components/Common/commonBusiness";
+import CommonViewTable from "@/components/Common/CommonViewTable";
 import ShowType from "@/components/Common/CommonComponent";
+import ReportInfo from "@/mes/productionExec/noticeModal/reportInfoButton";
 import styles from "./index.less";
 import { cloneDeep } from "lodash";
@@ -56,10 +59,13 @@ const businessTier = props =&gt; {
     for (let i = 0; i < formData.length; i++) {
       const config = formData[i];
       const column = commonFunc.getHeaderConfig(config);
+      if (i === 1) {
+        addState.slave2Data = [{ sId: commonUtils.createSid() }];
+      }
       addState = {
         ...addState,
-        [`slave${i}Column`]: column,
-        [`slave${i}Config`]: config
+        [`slave${i > 0 ? i + 1 : i}Column`]: column,
+        [`slave${i > 0 ? i + 1 : i}Config`]: config
       };
     }
     if (isWait) {
@@ -150,18 +156,39 @@ const RunningStatusModal = _props =&gt; {
       const addState = {
         [`${tableName}SelectedRowKeys`]: [sId],
         table1SelectedRowKeys: [sId],
-        table1Data: [data]
+        table1Data: [data],
+        slave1SelectedRowKeys: [sId],
+        slave1Data: [data],
+        slave2Data: [{ sId: commonUtils.createSid() }]
       };
-      props.onSaveState(addState);
+      props.onSaveState(addState, (nextProps) => {
+        // 如果配置了指令集，调用指令集
+        const btnConfig = props[
+          `${tableName}Config`
+        ]?.gdsconfigformslave?.find(item => item.sControlName === "clickOpr");
+
+        if (btnConfig) {
+          props.onExecInstructSet({
+            btnConfig,
+            tableLineParams: {
+              name: tableName,
+              record: data
+            },
+            nextProps
+          });
+        }
+      });
+
     }
   };
   const [record, setRecord] = useState({});
+  const [loading, setLoading] = useState(false);
   const bXingchejiluClick = () => {
-    const { table1Data = [] } = props;
+    const { table1Data = [], slave2Data = [] } = props;
     const { tableS1Data = [], tableS1SelectedRowKeys = [] } = props.parentProps;
-    const rowData1 = { ...table1Data[0], ...record };
+    const rowData1 = { ...table1Data[0], ...slave2Data[0], ...record };
     const rowData2 = tableS1Data.find(
       item => item.sId === tableS1SelectedRowKeys[0]
     );
@@ -203,16 +230,19 @@ const RunningStatusModal = _props =&gt; {
       item => item.sName === "sStatusNameSetting"
     );
     if (config) {
-      const { table1Data = [] } = props;
-      props.onTableBtnClick({
-        name: "table1",
-        record: table1Data[0],
-        config,
-        onSuccess: () => {
-          props.parentProps.onSaveState({ refreshDeviceTargetInfo: true });
-          props.app.globalFun.onCloseCommonModal({ type: "commonModal" });
-        }
-      });
+      const { table1Data = [], slave2Data = [] } = props;
+      setLoading(true);
+      setTimeout(() => {
+        props.onTableBtnClick({
+          name: "table1",
+          record: { ...table1Data[0], ...slave2Data[0] },
+          config,
+          onSuccess: () => {
+            props.parentProps.onSaveState({ refreshDeviceTargetInfo: true });
+            props.app.globalFun.onCloseCommonModal({ type: "commonModal" });
+          }
+        });
+      }, 100);
     } else {
       message.info("请先配置sStatusNameSetting！");
     }
@@ -222,12 +252,17 @@ const RunningStatusModal = _props =&gt; {
     className: styles.settingBtn,
     type: "primary",
     size: "large",
+    disabled: loading,
     onClick: () => {
       if (commonUtils.isEmptyArr(selectedRowKeys)) {
         message.warning("请先选择一个状态！");
         return;
       }
+      if (!commonBusiness.validateTable(props.slave2Config, props.slave2Data, props)) {
+        return;
+      }
+
       if (window.bXingchejiluModal) {
         bXingchejiluClick();
         return;
@@ -415,10 +450,57 @@ const RunningStatusModal = _props =&gt; {
     );
   }
+  const [reportInfoVisible, setReportInfoVisible] = useState(false);
+  const reportRef = useRef(null);
+
+  const handleReportInfo = (config = null) => {
+    reportRef.current = config;
+    setReportInfoVisible(!reportInfoVisible);
+  };
+
+  const { slave2Config: slave2ConfigOld, slave2Data = [] } = props;
+  const slave2Config = props.onMergeTableConfig(slave2ConfigOld);
+  const viewConfigsOld = slave2Config?.gdsconfigformslave?.filter(
+    item =>
+      item.sName &&
+      item.bControl &&
+      item.sControlName.indexOf("Btn") === -1 &&
+      item.sControlName.indexOf("_") === -1
+  );
+
+  const viewConfigs = cloneDeep(viewConfigsOld);
+
+  const iIndex1 =
+    viewConfigs?.findIndex(item => item.sName === "bRepairRequest") || -1;
+  if (iIndex1 !== -1 && !slave2Data[0]?.sAbnormalStatusName?.startsWith("W")) {
+    viewConfigs[iIndex1].iTag = 1;
+  }
+
+  const viewProps = {
+    ...props,
+    viewConfigs,
+    tableConfig: slave2Config,
+    iColValueView: 24,
+    viewRow: slave2Data[0],
+    tableName: 'slave2',
+    enabled: true,
+    handleReportInfo
+  };
+
   return (
     <div className={styles.runningContent}>
       <RunningContent {...contentProps} />
       {TimeComponent}
+      <div className={styles.runningForm}>
+        <CommonViewTable {...viewProps} />
+        <ReportInfo
+          reportInfoVisible={reportInfoVisible}
+          handleReportInfo={handleReportInfo}
+          {...props}
+          reportRef={reportRef.current || {}}
+          hasShowInfo={viewProps.viewRow}
+        />
+      </div>
       <Button {...btnProps}>
         {window.deviceTargetInfoModal ? "确定" : "设置"}
       </Button>
@@ -538,13 +620,16 @@ const RunningContent = props =&gt; {
             status: [
               ...group.filter((_, index) => index >= i * 6 && index < i * 6 + 6)
             ].map(rowData => {
-              const { sStatusName, sId } = rowData;
+              const { sStatusName, sId, sResponsibilityType, sResponsibilityColor } = rowData;
               const [name, status] = sStatusName.split(" ");
               return {
                 name,
                 status,
                 className: selectedRowKeys.includes(sId) ? classNameTd : "",
-                rowData: { ...rowData, sClassifyName1: title }
+                rowData: { ...rowData, sClassifyName1: title },
+                // 添加停机原因字段
+                responsibilityType: sResponsibilityType || "",
+                responsibilityColor: sResponsibilityColor || ""
               };
             })
           };
@@ -563,6 +648,55 @@ const RunningContent = props =&gt; {
     [JSON.stringify(dataList), JSON.stringify(selectedRowKeys)]
   );
+
+  // 计算停机原因的rowspan
+  const calculateResponsibilityRowspan = (data) => {
+    const rowspans = [];
+    const colors = []; // 存储每行的颜色
+    let currentValue = null;
+    let currentColor = null;
+    let currentCount = 0;
+    let startIndex = 0;
+
+    // 遍历所有行，计算连续的相同responsibilityType的行数
+    for (let i = 0; i < data.length; i++) {
+      const trData = data[i];
+      const responsibilityType = trData.status[0]?.responsibilityType || "";
+      const responsibilityColor = trData.status[0]?.responsibilityColor || "";
+
+      if (responsibilityType === currentValue) {
+        currentCount++;
+      } else {
+        // 处理前一段相同值
+        if (currentValue !== null) {
+          for (let j = startIndex; j < startIndex + currentCount; j++) {
+            rowspans[j] = j === startIndex ? currentCount : 0;
+            colors[j] = currentColor; // 设置颜色
+          }
+        }
+
+        // 开始新的计数
+        currentValue = responsibilityType;
+        currentColor = responsibilityColor;
+        currentCount = 1;
+        startIndex = i;
+      }
+    }
+
+    // 处理最后一段
+    if (currentValue !== null) {
+      for (let j = startIndex; j < startIndex + currentCount; j++) {
+        rowspans[j] = j === startIndex ? currentCount : 0;
+        colors[j] = currentColor; // 设置颜色
+      }
+    }
+
+    return { rowspans, colors };
+  };
+
+
+
+
   const pattern = title => {
     const regex = /(.+?)\((.+)\)/;
     const result = title.match(regex);
@@ -578,14 +712,31 @@ const RunningContent = props =&gt; {
       return title;
     }
   };
+  // 计算停机原因的rowspan数组和颜色数组
+  const { rowspans: responsibilityRowspans, colors: responsibilityColors } = calculateResponsibilityRowspan(data);
   return (
     <div
       className={props.bModal ? styles.runStatusTable1 : styles.runStatusTable}
     >
       <table border={"1px"}>
-        {data.map(trData => (
+        {data.map((trData, trIndex) => (
           <tr>
+            {/* 第一列：停机原因列 */}
+            {responsibilityRowspans[trIndex] > 0 && (
+              <td
+                className={`tdTitleContent ${trData.status[0]?.className || ""}`}
+                rowspan={responsibilityRowspans[trIndex]}
+                style={{
+                  backgroundColor: responsibilityColors[trIndex] || 'transparent'
+                }}
+
+              >
+                <div>
+                  <p>{trData.status[0]?.responsibilityType || ""}</p>
+                </div>
+              </td>
+            )}
             {trData.type === 1 && (
               <td
                 className={`${trData.className} tdTitle`}
@@ -10,6 +10,7 @@
 .runningContent {
   .size();
+  overflow: auto;
   .showType {
     .size(100%, 68px);
@@ -45,7 +46,7 @@
     }
     .input12 {
-      .size(50%, auto);
+      // .size(50%, auto);
     }
     .mesInputBlueBg,
@@ -53,10 +54,14 @@
       display: none;
     }
-    .ant-form-item-control {
+    .table-title-formStyle {
+      top: 29.5px;
+    }
+
+    .ant-form-item-control, .ant-form-item-control-input {
       height: 68px !important;
-      flex-basis: 80% !important;
-      max-width: 80% !important;
+      flex-basis: calc(100% - 90px) !important;
+      max-width: calc(100% - 90px) !important;
       .ant-picker-input {
         height: 60px;
@@ -262,6 +262,18 @@ const useCommonModelEvent = props =&gt; {
         delete tabConfigFilter[0].configList[1].children[2].configList[7];
       } catch (error) {}
     }
+
+    tabConfigFilter[0].configList[0].children[1].configList = tabConfigFilter[0].configList[0].children[1].configList.filter(item => !!item);
+
+    [
+      tabConfigFilter[0].configList[0].children[1].configList[0],
+      tabConfigFilter[0].configList[0].children[1].configList[1]
+    ] =
+    [
+      tabConfigFilter[0].configList[0].children[1].configList[1],
+      tabConfigFilter[0].configList[0].children[1].configList[0]
+    ];
+
     return [tableListFilter, tabConfigFilter];
   };
@@ -574,10 +586,12 @@ const useCommonModelEvent = props =&gt; {
           runningTime = isBefore8AM
             ? now.subtract(1, "days").format("YYYY-MM-DD")
             : now.format("YYYY-MM-DD"),
-          runningShift = props.app?.userinfo?.sShift.toString()
+          runningShift = props.app?.userinfo?.sShift.toString(),
+          iShowType = 1
         } = props;
         conditonValues.tCreateTime = runningTime;
         conditonValues.sShiftNew = runningShift;
+        conditonValues.iShowType = iShowType;
       }
       //【班组报工特殊处理】历史日报查看详情如果班组报工没查到数据，用sSReserve1当历史日报的sId
@@ -698,9 +712,9 @@ const useCommonModelEvent = props =&gt; {
       //【班组报工特殊处理】历史日报查看详情如果班组报工没查到数据，用sSReserve1当历史日报的sId
       if (
-        refreshTableList.length === 1 &&
+        refreshTableList?.length === 1 &&
         refreshTableList[0] === "table0" &&
-        !addState.table0Data.length &&
+        !addState.table0Data?.length &&
         props.sSReserve1
       ) {
         addState.refreshTableList = ["tableS0"];
@@ -1106,7 +1120,7 @@ const useComputedCommonDivHeight = props =&gt; {
   ) {
     returnHeight = `calc(${returnHeight} - 40px)`;
   }
-  
+
   // 下料界面板材信息
   if(sTabName=='版材信息'){
     returnHeight = `calc(100% - 10px)`;
@@ -1253,7 +1267,11 @@ const CommonModelComponent = props =&gt; {
         bFirstComponent: level === 0 && index === -1
       };
-      const commonDivHeight = useComputedCommonDivHeight(componentProps);
+      let commonDivHeight = useComputedCommonDivHeight(componentProps);
+
+      if(sName === 'table1'){
+        commonDivHeight = "calc(calc(100% - 50px))";
+      }
       return (
         <div
           className={`commonDiv ${sName}`}
@@ -1478,7 +1496,7 @@ const CommonViewTableComponent = props =&gt; {
   const config = props.onMergeTableConfig(configOld);
   const { gdsconfigformslave: gdsconfigformslaveOld = [] } = config;
-  const gdsconfigformslave = cloneDeep(gdsconfigformslaveOld);
+  let gdsconfigformslave = cloneDeep(gdsconfigformslaveOld);
   // 展示的数据
   let viewRow = {};
@@ -1538,6 +1556,8 @@ const CommonViewTableComponent = props =&gt; {
           });
         }
       });
+
+      gdsconfigformslave = props.onMergeTableConfig({ ...configOld, gdsconfigformslave }).gdsconfigformslave;
     }
   }
@@ -1601,7 +1621,7 @@ const CommonViewTableComponent = props =&gt; {
         if(viewProps.tableS0Data && viewProps.tableS0Data.length!==0){
             viewProps.reportPeopleSelectedRowKeys = viewProps.tableS0Data[0].sMainAssistantTransId?.split(",")
-            
+
         }
         if (commonUtils.isEmptyObject(viewRow)) {
@@ -1619,8 +1639,8 @@ const CommonViewTableComponent = props =&gt; {
                 reportRef={reportRef.current || {}}
                 hasShowInfo={viewProps.viewRow}
             />
-            
-            
+
+
           </>
         );
       })}
@@ -1926,7 +1946,15 @@ const CommonRepairComponent = props =&gt; {
   const viewProps = {
     ...props,
     enabled,
-    viewConfigs: filterConfig.map(item => ({ ...item, iColValue: 24 })),
+    viewConfigs: filterConfig.map(item => {
+      if (item.sName === 'dAdvanceReportQty') {
+        return {
+          ...item,
+          iTag: viewRow.bAutoReport ? 1 : 3
+        }
+      }
+      return item;
+    }).map(item => ({ ...item, iColValue: 24 })),
     tableConfig: config,
     iColValueView: 24,
     viewRow,
@@ -2098,6 +2126,8 @@ const RunningStatusConditionComponent = props =&gt; {
         : now
   );
+  const [iShowType, setShowType] = useState(1);
+
   const flag = useRef(false);
   useEffect(
     () => {
@@ -2106,12 +2136,13 @@ const RunningStatusConditionComponent = props =&gt; {
         props.onSaveState({
           runningTime: dateValue.format("YYYY-MM-DD"),
           runningShift: value,
+          iShowType,
           refreshTableList: ["table0"],
           runningStatusConditionFlag: true // 行车记录修改时间标记
         });
       }
     },
-    [value, dateValue]
+    [value, dateValue, iShowType]
   );
   const [visible, setVisible] = useState(false);
@@ -2193,9 +2224,19 @@ const RunningStatusConditionComponent = props =&gt; {
     }
   };
+  const handleSwitchShowType = (e) => {
+    const { value } = e.target;
+    flag.current = true;
+    setShowType(value);
+  }
+
   return (
     <div className={styles.runningStatusCondition}>
       <Space size={15}>
+        <Radio.Group defaultValue={0} buttonStyle="solid" size="large" onChange={handleSwitchShowType}>
+          <Radio.Button value={0}>未上报</Radio.Button>
+          <Radio.Button value={1}>全部</Radio.Button>
+        </Radio.Group>
         <DatePicker
           value={dateValue}
           format="YYYY-MM-DD"
 import React, { useEffect, useRef, useState } from "react";
 import { Modal } from "antd";
 import Draggable from "react-draggable";
+import * as commonUtils from "@/utils/utils";
 import styles from "./index.less";
@@ -11,20 +12,22 @@ const ClockComponent = ({ num: numNew = 0, ...props }) =&gt; {
   const [disabled, setDisabled] = useState(true);
   const [bounds, setBounds] = useState({ left: 0, top: 0, bottom: 0, right: 0 });
   const draggleRef = useRef(null);
+  const [freshCount, setFreshCount] = useState(0);
   const [data, setData] = useState([]);
   useEffect(
     () => {
       if (ModalVisible) {
+        const changeExecInfoNew = commonUtils.getAppData("changeExecInfo");
         const deviceTargetInfoDataPart = [
-          { ...(props.deviceTargetInfoData?.[0] || {}) },
+          { ...(props.deviceTargetInfoData?.[0] || {}), ...changeExecInfoNew },
           ...(data || [])
         ].slice(0, 30); // 弹框展示内容
         setData(deviceTargetInfoDataPart);
       }
     },
-    [props.deviceTargetInfoData, ModalVisible]
+    [props.deviceTargetInfoData, freshCount, ModalVisible]
   );
   const timer = useRef(null);
@@ -33,6 +36,7 @@ const ClockComponent = ({ num: numNew = 0, ...props }) =&gt; {
       if (numNew === 0) return;
       if (num === numNew) return;
+      setFreshCount(pre => pre + 1);
       if (num === 0 && numNew > 0) {
         setNum(numNew);
         return;
@@ -22,10 +22,13 @@ import {
   Input,
   Divider,
   message,
-  Button
+  Button,
+  Form,
+  DatePicker,
+  Select,
 } from "antd";
 import {
-  UndoOutlined,
+  CloseOutlined,
   UserAddOutlined,
   SwapOutlined,
   AppstoreOutlined
@@ -102,9 +105,8 @@ const OpenModalEditPwd = props =&gt; {
   });
   // 确认修改密码
   const handleOk = () => {
-    const url = `${
-      commonConfig.server_host
-    }sftlogininfo/updatePasswordUserName/update?sModelsId=${100}`;
+    const url = `${commonConfig.server_host
+      }sftlogininfo/updatePasswordUserName/update?sModelsId=${100}`;
     props.dispatch({
       type: "app/editPwd",
       payload: {
@@ -330,26 +332,54 @@ const useIndexMesEvent = props =&gt; {
     [currentContent, sModelsId, sModelType]
   );
+  const { webSocket: ws } = props.app;
+  const { url } = ws || {};
+  const wsRef = useRef(ws);
+  useEffect(() => {
+    if (url) {
+      wsRef.current = ws;
+    }
+  }, [url]);
+
   useEffect(() => {
     const connectWs = () => {
-      if (
-        props.app.webSocket === null ||
-        props.app.webSocket?.readyState !== WebSocket.OPEN
-      ) {
-        console.log("================webSocket连接======================");
+      if (!wsRef.current) {
+        console.log("================webSocket不存在,创建webSocket连接======================");
         props.dispatch({
           type: "app/createWebSocket",
           payload: { reStart: true, dispatch: props.dispatch }
         });
+        return;
       }
+      if (wsRef.current.readyState !== WebSocket.OPEN) return;
+      const message = {
+        connectTest: 'test',
+        key: 'test',
+        flag: 'test',
+        msg: 'test',
+        sId: 'test',
+        showType: 'test',
+        sendFrom: props.app.userinfo.sId,
+      };
+      wsRef.current.send(JSON.stringify(message));
+      window.wsTimer = setTimeout(() => {
+        console.log("================未收到Test返回消息,webSocket重新连接======================");
+        props.dispatch({
+          type: "app/createWebSocket",
+          payload: { reStart: true, dispatch: props.dispatch }
+        });
+      }, 3000);
     };
     connectWs();
     const timer = setInterval(() => {
       connectWs();
-    }, 50000);
+    }, 20000);
-    return () => clearInterval(timer);
+    return () => {
+      clearInterval(timer);
+      clearTimeout(window.wsTimer);
+    }
   }, []);
   useEffect(() => {
@@ -414,9 +444,8 @@ const IndexMes = baseProps =&gt; {
     token,
     sModelsId
   ) => {
-    const url = `${
-      commonConfig.server_host
-    }procedureCall/doGenericProcedureCall?sModelsId=${sModelsId}`;
+    const url = `${commonConfig.server_host
+      }procedureCall/doGenericProcedureCall?sModelsId=${sModelsId}`;
     const returnData = (await commonServices.postValueService(
       token,
       value,
@@ -501,16 +530,16 @@ const HeaderConponent = () =&gt; {
-    const [ isModalOpen, setIsModalOpen ] = useState(false);
-    const objRef = useRef({});
-    const handleCancel = () => setIsModalOpen(false);
-    window.$wkcFullStatus = (item , is) =>{
-        objRef.current = {
-            ...objRef.current,
-            ...item
-        }
-        setIsModalOpen(is);
+  const [isModalOpen, setIsModalOpen] = useState(false);
+  const objRef = useRef({});
+  const handleCancel = () => setIsModalOpen(false);
+  window.$wkcFullStatus = (item, is) => {
+    objRef.current = {
+      ...objRef.current,
+      ...item
     }
+    setIsModalOpen(is);
+  }
@@ -550,20 +579,20 @@ const HeaderConponent = () =&gt; {
         <div className="logout" onClick={logout} />
       </div>
-        <Modal 
-            title="Basic Modal" 
-            open={isModalOpen} 
-            width={'100vw'}
-            height={'100vh'}
-            onCancel={handleCancel} 
-            footer={null} 
-            mask={false}
-            closable={false}
-            destroyOnClose={true}
-            maskClosable={false} 
-            wrapClassName={ styles.ztwwwww }>
-            <MachineMessageComponent e={objRef.current} shutDown={handleCancel} />
-        </Modal>
+      <Modal
+        title="Basic Modal"
+        open={isModalOpen}
+        width={'100vw'}
+        height={'100vh'}
+        onCancel={handleCancel}
+        footer={null}
+        mask={false}
+        closable={false}
+        destroyOnClose={true}
+        maskClosable={false}
+        wrapClassName={styles.ztwwwww}>
+        <MachineMessageComponent e={objRef.current} shutDown={handleCancel} />
+      </Modal>
     </div>
   );
@@ -571,125 +600,125 @@ const HeaderConponent = () =&gt; {
 // 停机状态栏
-const MachineMessageComponent = ({ e  , shutDown }) => {
-    const value = e.item?.props?.value || {};
-    const { current: startTime } = useRef(moment().format("YYYY-MM-DD HH:mm:ss"));
-    const { backgroundColor, conent2, fontSize } = value;
-    const [currentTime, setCurrentTime] = useState("");
-    const [diffHours, setDiffHours] = useState(0);
-    const [diffMins, setDiffMins] = useState(0);
-    const [diffSecs, setDiffSecs] = useState(0);
-    useEffect(() => {
-      const getTime = () => {
-        const currentTimeNew = moment().format("YYYY-MM-DD HH:mm:ss");
-        setCurrentTime(currentTimeNew);
-  
-        const duration = moment.duration(
-          moment(currentTimeNew).diff(moment(startTime))
-        );
-        const hours = duration.asHours().toString().split(".")[0];
-        const minutes = (duration.asMinutes() % 60).toString().split(".")[0];
-        const seconds = duration.asSeconds() % 60;
-  
-        setDiffHours(hours<=9? `0${hours}`: hours);
-        setDiffMins(minutes<=9? `0${minutes}`: minutes );
-        setDiffSecs(seconds<=9? `0${seconds}`: seconds);
-      };
-  
-      getTime();
-      const timer = setInterval(() => {
-        console.log('定时器状态')
-        getTime();
-      }, 1000);
-  
-      return () => {
-          clearInterval(timer);
-      };
-    }, []);
-  
-    const handleMenuClose = () => {
-      Modal.confirm({
-        title: "温馨提示:",
-        content: <div>确认退出该状态？</div>,
-        okText: "确认",
-        cancelText: "取消",
-        zIndex: 2000,
-        onOk() {
-          shutDown()
-        },
-        onCancel() {}
-      });
+const MachineMessageComponent = ({ e, shutDown }) => {
+  const value = e.item?.props?.value || {};
+  const { current: startTime } = useRef(moment().format("YYYY-MM-DD HH:mm:ss"));
+  const { backgroundColor, conent2, fontSize } = value;
+  const [currentTime, setCurrentTime] = useState("");
+  const [diffHours, setDiffHours] = useState(0);
+  const [diffMins, setDiffMins] = useState(0);
+  const [diffSecs, setDiffSecs] = useState(0);
+  useEffect(() => {
+    const getTime = () => {
+      const currentTimeNew = moment().format("YYYY-MM-DD HH:mm:ss");
+      setCurrentTime(currentTimeNew);
+
+      const duration = moment.duration(
+        moment(currentTimeNew).diff(moment(startTime))
+      );
+      const hours = duration.asHours().toString().split(".")[0];
+      const minutes = (duration.asMinutes() % 60).toString().split(".")[0];
+      const seconds = duration.asSeconds() % 60;
+
+      setDiffHours(hours <= 9 ? `0${hours}` : hours);
+      setDiffMins(minutes <= 9 ? `0${minutes}` : minutes);
+      setDiffSecs(seconds <= 9 ? `0${seconds}` : seconds);
     };
-    
-    const isMinMax = useRef('max');
-    const draggleRef = useRef(null);
-    const [bounds, setBounds] = useState({ left: 0, top: 0, bottom: 0, right: 0 });
-    const onStart = (_event, uiData) => {
-        const { clientWidth, clientHeight } = window.document.documentElement;
-        const targetRect = draggleRef.current?.getBoundingClientRect();
-        if (!targetRect) {
-          return;
-        }
-        setBounds({
-          left: -targetRect.left + uiData.x,
-          right: clientWidth - (targetRect.right - uiData.x),
-          top: -targetRect.top + uiData.y,
-          bottom: clientHeight - (targetRect.bottom - uiData.y),
-        });
+    getTime();
+    const timer = setInterval(() => {
+      console.log('定时器状态')
+      getTime();
+    }, 1000);
+
+    return () => {
+      clearInterval(timer);
     };
+  }, []);
-  
-    return (
-        <div className={`${styles.modalBoxStyle} ${isMinMax.current}`}>
-
-            {
-                isMinMax.current == 'min'?
-                <Draggable defaultPosition={{ x: document.body.clientWidth-400-30, y: 70 }} bounds={bounds}  onStart={(event, uiData) => onStart(event, uiData)}>
-                    <div ref={draggleRef} className={styles.maxBoxViews} style={{ '--bgColor' : backgroundColor }}>
-                        <div className="mixbox" onDoubleClick={()=>isMinMax.current = 'max'}>
-                            <h2>{conent2}</h2>
-                            <div className="p">开始时间 {startTime}</div>
-                            <div className="p">停机耗时：{diffHours}时 {diffMins}分 {diffSecs}秒</div>
-                            <div className="btn">
-                                <Button size="large" type="primary" className={styles.btnWg} onClick={()=>isMinMax.current = 'max'} > 最大化 </Button>
-                                <Button size="large" type="primary" className={styles.btnWg} onClick={handleMenuClose} > 退出 </Button>
-                            </div>
-                        </div>
-                    </div>
-                </Draggable>
-                :
-                <div className={styles.machineStatusContent} style={{ backgroundColor }}>
-                    <div className="conent1">设备停机状态告知</div>
-                    <div className="conent2" style={fontSize ? { fontSize } : {}}>
-                    {conent2}
-                    </div>
-                    <div className="conent3">
-                    停机开始时间：
-                    {startTime}
-                    </div>
-                    <div className="conent4">
-                    系统当前时间：
-                    {currentTime}
-                    </div>
-                    <div className="conent5">
-                    此次停机耗时：
-                    <span className="conent6">
-                        约：
-                        {diffHours}时 {diffMins}分 {diffSecs}秒
-                    </span>
-                    </div>
-                    <div className="conent7">
-                        <Button size="large" type="primary" className={styles.btnWg} onClick={()=>isMinMax.current = 'min'} > 最小化 </Button>
-                        <Button size="large" type="primary" className={styles.btnWg} onClick={handleMenuClose} > 退出 </Button>
-                    </div>
+  const handleMenuClose = () => {
+    Modal.confirm({
+      title: "温馨提示:",
+      content: <div>确认退出该状态？</div>,
+      okText: "确认",
+      cancelText: "取消",
+      zIndex: 2000,
+      onOk() {
+        shutDown()
+      },
+      onCancel() { }
+    });
+  };
+
+
+  const isMinMax = useRef('max');
+  const draggleRef = useRef(null);
+  const [bounds, setBounds] = useState({ left: 0, top: 0, bottom: 0, right: 0 });
+  const onStart = (_event, uiData) => {
+    const { clientWidth, clientHeight } = window.document.documentElement;
+    const targetRect = draggleRef.current?.getBoundingClientRect();
+    if (!targetRect) {
+      return;
+    }
+    setBounds({
+      left: -targetRect.left + uiData.x,
+      right: clientWidth - (targetRect.right - uiData.x),
+      top: -targetRect.top + uiData.y,
+      bottom: clientHeight - (targetRect.bottom - uiData.y),
+    });
+  };
+
+
+  return (
+    <div className={`${styles.modalBoxStyle} ${isMinMax.current}`}>
+
+      {
+        isMinMax.current == 'min' ?
+          <Draggable defaultPosition={{ x: document.body.clientWidth - 400 - 30, y: 70 }} bounds={bounds} onStart={(event, uiData) => onStart(event, uiData)}>
+            <div ref={draggleRef} className={styles.maxBoxViews} style={{ '--bgColor': backgroundColor }}>
+              <div className="mixbox" onDoubleClick={() => isMinMax.current = 'max'}>
+                <h2>{conent2}</h2>
+                <div className="p">开始时间 {startTime}</div>
+                <div className="p">停机耗时：{diffHours}时 {diffMins}分 {diffSecs}秒</div>
+                <div className="btn">
+                  <Button size="large" type="primary" className={styles.btnWg} onClick={() => isMinMax.current = 'max'} > 最大化 </Button>
+                  <Button size="large" type="primary" className={styles.btnWg} onClick={handleMenuClose} > 退出 </Button>
                 </div>
-            }
+              </div>
+            </div>
+          </Draggable>
+          :
+          <div className={styles.machineStatusContent} style={{ backgroundColor }}>
+            <div className="conent1">设备停机状态告知</div>
+            <div className="conent2" style={fontSize ? { fontSize } : {}}>
+              {conent2}
+            </div>
+            <div className="conent3">
+              停机开始时间：
+              {startTime}
+            </div>
+            <div className="conent4">
+              系统当前时间：
+              {currentTime}
+            </div>
+            <div className="conent5">
+              此次停机耗时：
+              <span className="conent6">
+                约：
+                {diffHours}时 {diffMins}分 {diffSecs}秒
+              </span>
+            </div>
+            <div className="conent7">
+              <Button size="large" type="primary" className={styles.btnWg} onClick={() => isMinMax.current = 'min'} > 最小化 </Button>
+              <Button size="large" type="primary" className={styles.btnWg} onClick={handleMenuClose} > 退出 </Button>
+            </div>
+          </div>
+      }
-        </div>
-    );
+    </div>
+  );
 };
-  
+
@@ -838,28 +867,75 @@ const SystemFunComponent = () =&gt; {
   };
   // 调用通用过程
+  const [form] = Form.useForm();
   const handleProcedureCall = async (params, iFlag) => {
+
+    const extraValues = await new Promise(resolve => {
+      form.setFieldsValue({
+        tReportDate: moment(),
+        sTeamType: props.app.sShift
+      });
+      Modal.confirm({
+        title: "切换手动",
+        content: (
+          <ConfigProvider locale={zhCN}>
+            <Form layout="vertical" size="large" form={form}>
+              <Form.Item label="报工日期" name="tReportDate">
+                <DatePicker
+                  style={{ width: "100%" }}
+                  placeholder="请选择"
+                  format="YYYY-MM-DD"
+                />
+              </Form.Item>
+              <Form.Item label="班次" name="sTeamType">
+                <Select placeholder="请选择">
+                  <Select.Option value="1">白班</Select.Option>
+                  <Select.Option value="2">夜班</Select.Option>
+                </Select>
+              </Form.Item>
+            </Form>
+          </ConfigProvider>
+        ),
+        wrapClassName: "mesCommonModal mesLoginForm",
+        cancelText: "取消",
+        okText: "确定",
+        onOk() {
+          const values = form.getFieldsValue();
+          const tReportDate = values?.tReportDate.format("YYYY-MM-DD") || "";
+          const sTeamType = values.sTeamType;
+          resolve({ tReportDate, sTeamType });
+        },
+        onCancel() {
+          resolve(false);
+        }
+      });
+    });
+
+    if (!extraValues) return;
+
     const { onSuccess } = params;
     const { app } = props;
     const { sMachineNameSId, sTeamNameSId, sShift, token, sModelsId } = app;
     const value = {
-      sBtnName: "restDailyReport",
+      sBtnName: "BtnEventAuto",
       sProName: "sp_ResetDailyReport",
       sProInParam: JSON.stringify({
         changeValue: {},
         sButtonParam: {
           sproName: "sp_ResetDailyReport",
-          inMap: "userinfo.sMachineGuid,userinfo.sTeamId"
+          inMap: "userinfo.sMachineGuid,userinfo.sTeamId,userinfo.tReportDate,userinfo.sTeamType"
         },
         params: [
           {
             key: "userinfo",
             value: [
               {
+                ...extraValues,
                 sMachineGuid: sMachineNameSId,
                 sTeamGuid: sTeamNameSId,
+                tOperationDate: moment().format("YYYY-MM-DD HH:mm:ss"),
                 sShift,
                 sTeamId: sTeamNameSId,
                 iFlag: iFlag
@@ -874,9 +950,8 @@ const SystemFunComponent = () =&gt; {
       value.iFlag = iFlag;
     }
-    const url = `${
-      commonConfig.server_host
-    }procedureCall/doGenericProcedureCall?sModelsId=${sModelsId}`;
+    const url = `${commonConfig.server_host
+      }procedureCall/doGenericProcedureCall?sModelsId=12710101117241578202960`;
     const returnData = (await commonServices.postValueService(
       token,
       value,
@@ -895,7 +970,7 @@ const SystemFunComponent = () =&gt; {
         onOk() {
           handleProcedureCall(params, 1);
         },
-        onCancel() {}
+        onCancel() { }
       });
     } else if (code === -8) {
       Modal.info({
@@ -914,11 +989,53 @@ const SystemFunComponent = () =&gt; {
   // 切换手动/切换自动
   const handleProcedureCall1 = async (params = {}, iFlag) => {
+    const extraValues = await new Promise(resolve => {
+      form.setFieldsValue({
+        tReportDate: moment(),
+        sTeamType: props.app.sShift
+      });
+      Modal.confirm({
+        title: "取消手动",
+        content: (
+          <ConfigProvider locale={zhCN}>
+            <Form layout="vertical" size="large" form={form}>
+              <Form.Item label="报工日期" name="tReportDate">
+                <DatePicker
+                  style={{ width: "100%" }}
+                  placeholder="请选择"
+                  format="YYYY-MM-DD"
+                />
+              </Form.Item>
+              <Form.Item label="班次" name="sTeamType">
+                <Select placeholder="请选择">
+                  <Select.Option value="1">白班</Select.Option>
+                  <Select.Option value="2">夜班</Select.Option>
+                </Select>
+              </Form.Item>
+            </Form>
+          </ConfigProvider>
+        ),
+        wrapClassName: "mesCommonModal mesLoginForm",
+        cancelText: "取消",
+        okText: "确定",
+        onOk() {
+          const values = form.getFieldsValue();
+          const tReportDate = values?.tReportDate.format("YYYY-MM-DD") || "";
+          const sTeamType = values.sTeamType;
+          resolve({ tReportDate, sTeamType });
+        },
+        onCancel() {
+          resolve(false);
+        }
+      });
+    });
+
+    if (!extraValues) return;
+
     const { onSuccess } = params;
     const { app } = props;
     const { sMachineNameSId, sTeamNameSId, sShift, token, sModelsId } = app;
-    const userinfo = commonUtils.getAppData("userinfo");
     const value = {
       sBtnName: "switchReportType",
@@ -927,18 +1044,19 @@ const SystemFunComponent = () =&gt; {
         changeValue: {},
         sButtonParam: {
           sproName: "sp_SwitchReportType",
-          inMap: "userinfo.sMachineGuid,userinfo.sTeamId,userinfo.bPlcSd"
+          inMap: "userinfo.sMachineGuid,userinfo.sTeamId,userinfo.tReportDate,userinfo.sTeamType"
         },
         params: [
           {
             key: "userinfo",
             value: [
               {
+                ...extraValues,
                 sMachineGuid: sMachineNameSId,
                 sTeamGuid: sTeamNameSId,
+                tOperationDate: moment().format("YYYY-MM-DD HH:mm:ss"),
                 sShift,
                 sTeamId: sTeamNameSId,
-                bPlcSd: userinfo.bPlcSd,
                 iFlag: iFlag
               }
             ]
@@ -951,9 +1069,8 @@ const SystemFunComponent = () =&gt; {
       value.iFlag = iFlag;
     }
-    const url = `${
-      commonConfig.server_host
-    }procedureCall/doGenericProcedureCall?sModelsId=${sModelsId}`;
+    const url = `${commonConfig.server_host
+      }procedureCall/doGenericProcedureCall?sModelsId=${sModelsId}`;
     const returnData = (await commonServices.postValueService(
       token,
       value,
@@ -970,9 +1087,9 @@ const SystemFunComponent = () =&gt; {
         okText: "确认",
         cancelText: "取消",
         onOk() {
-          handleProcedureCall1(params, 1);
+          handleProcedureCall(params, 1);
         },
-        onCancel() {}
+        onCancel() { }
       });
     } else if (code === -8) {
       Modal.info({
@@ -1005,10 +1122,12 @@ const SystemFunComponent = () =&gt; {
       case "restDailyReport":
         handleProcedureCall({
           onSuccess: () => {
-            location.reload();
+            message.success("操作成功, 请等待页面刷新", 2);
+            setTimeout(() => {
+              location.reload();
+            }, 1500);
           }
         });
-
         break;
       case "faceCollection":
         dispatch(["saveState", { faceCollectionModalVisible: true }]);
@@ -1016,10 +1135,10 @@ const SystemFunComponent = () =&gt; {
       case "switchStatus":
         handleProcedureCall1({
           onSuccess: () => {
-            const userInfoNew = commonUtils.getAppData("userinfo");
-            userInfoNew.bPlcSd = !userInfoNew.bPlcSd;
-            commonUtils.setAppData("userinfo", userInfoNew);
-            location.reload();
+            message.success("操作成功, 请等待页面刷新", 2);
+            setTimeout(() => {
+              location.reload();
+            }, 1500);
           }
         });
         break;
@@ -1078,8 +1197,8 @@ const SystemFunComponent = () =&gt; {
                   handleSystemFunClick("restDailyReport");
                 }}
               >
-                <UndoOutlined />
-                <span>重置日报</span>
+                <SwapOutlined />
+                <span>切换手动</span>
               </div>
               <div
                 className="restDailyReport"
@@ -1087,8 +1206,8 @@ const SystemFunComponent = () =&gt; {
                   handleSystemFunClick("switchStatus");
                 }}
               >
-                <SwapOutlined />
-                <span>{bPlcSd ? "切换自动" : "切换手动"}</span>
+                <CloseOutlined />
+                <span>取消手动</span>
               </div>
             </div>
           }
-import React, { useEffect, useState, useRef, useMemo } from "react";
-import { Button, Spin, Row, Col } from "antd";
-import { operationFetch } from "./operationFetch";
+import React, {useEffect, useMemo, useRef, useState} from "react";
+import {Button, Col, Input, message, Modal, Row, Select, Space, Spin} from "antd";
+import {operationFetch} from "./operationFetch";
 import * as commonUtils from "@/utils/utils";
+import * as commonConfig from "@/utils/config";
+import * as commonServices from "@/services/services";
 import useCommonBase from "@/components/Common/CommonHooks/useCommonBase";
 import SiderInfoComponent from "@/mes/common/siderInfoComponent";
 import * as commonBusiness from "@/components/Common/commonBusiness";
@@ -12,20 +14,9 @@ import CommonViewTable from &quot;@/components/Common/CommonViewTable&quot;;
 import CommonOperationBarComponent from "@/mes/common/commonOperationBarComponent";
 import styles from "./index.less";
-import {
-  DoubleLeftOutlined,
-  LeftOutlined,
-  MinusOutlined,
-  PlusOutlined,
-  RightOutlined
-} from "@ant-design/icons";
-import { Space } from "antd";
+import {DoubleLeftOutlined, LeftOutlined, MinusOutlined, PlusOutlined, RightOutlined} from "@ant-design/icons";
 import CommonModelComponent from "../../common/commonModelComponent";
-import { message } from "antd";
-import { Modal } from "antd";
-import { Select } from "antd";
-import { Input } from "antd";
-import { cloneDeep } from "lodash";
+import {cloneDeep} from "lodash";
 const list = [
   { sName: "qztable0", sGrd: "qztable0" }, // 切纸生产执行
@@ -408,8 +399,20 @@ const ProductionExecMain = baseProps =&gt; {
     const getValue = () => {
       const changeExecInfo = commonUtils.getAppData("changeExecInfo");
       if (changeExecInfo.dReplyPalletERp === 1) {
-        props.onRefresh();
-        setRefreshCount(pre => pre + 1);
+        try {
+          const { sId } = changeExecInfo;
+          const url = `${commonConfig.server_host}mqtt/updateFlushmes/${sId}`;
+          commonServices.postValueService(null, {}, url).then(() => {
+            props.onRefresh();
+            setRefreshCount(pre => pre + 1);
+          })
+        } catch (error) {
+          console.log("=====updateFlushmes报错", {
+            error, changeExecInfo,
+          });
+          props.onRefresh();
+          setRefreshCount(pre => pre + 1);
+        }
       }
     };
@@ -905,19 +908,43 @@ const ProductionExecContent0 = props =&gt; {
     tableProps: {}
   };
-  const viewConfigs = config.gdsconfigformslave
-    .filter(item => item.bControl && item.sControlName.indexOf("Btn") === -1)
-    // .filter((_, index) => index < 8)
-    .map(item => ({
-      ...item,
-      iColValue: 24
-    }));
-
   const viewRow =
     (selectedRowKeys[0]
       ? data.find(item => item.sId === selectedRowKeys[0])
       : data[0]) || {};
+  const viewConfigs = config.gdsconfigformslave
+    .filter(item => item.bControl && item.sControlName.indexOf("Btn") === -1)
+    // .filter((_, index) => index < 8)
+    .map(item => {
+      let iTag = item.iTag;
+      if (item.sName === 'dReportQty' && (viewRow.bAutoReport || viewRow.bReport)) {
+        iTag = 1;
+      }
+      if (['dLockUpFei', 'dMadeUpFei', 'iLaminatingPaper'].includes(item.sName) && (viewRow.bReport|| viewRow.iJobStatus != 3)) {
+         iTag = 1;
+      }
+      if (["dAdvanceMadeUpFei", "dAdvanceLockUpFei", "iAdvanceLaminatingPaper"].includes(item.sName)) {
+        if (!viewRow.bAdvanceReport && viewRow.iJobStatus && viewRow.bAdvance) {
+          iTag = 3;
+        } else {
+          iTag = 1;
+        }
+      }
+      if (item.sName === "dAdvanceReportQty") {
+        if (!viewRow.bAdvanceReport && !viewRow.bAutoReport && viewRow.iJobStatus && viewRow.bAdvance) {
+          iTag = 3;
+        } else {
+          iTag = 1;
+        }
+      }
+      return {
+        ...item,
+        iColValue: 24,
+        iTag
+      }
+    });
+
   const viewProps = {
     ...props,
     viewConfigs,
@@ -939,9 +966,11 @@ const ProductionExecContent0 = props =&gt; {
       config.gdsconfigformslave.find(
         item => item.sControlName === sControlName
       ) || {};
+    const { showName = '' } = btnConfig;
     return {
       ...btnConfig,
       disabled: props.onGetBtnStatus(tableName, btnConfig),
+      style: { width: showName.length <= 4 ? 80 : showName.length * 20 },
       onClick: async () => {
         if (!props.onGetBtnContinue()) return;
         await props.awaitPromiseReturn();
@@ -1029,7 +1058,13 @@ const ProductionExecContent0 = props =&gt; {
                     {...btnProps}
                     {...getBtnConfigByControlName("BtnEventBlanking")}
                   >
-                    下料
+                    { getBtnConfigByControlName("BtnEventBlanking").showName }
+                  </Button>
+                  <Button
+                    {...btnProps}
+                    {...getBtnConfigByControlName("BtnEventBlanking2")}
+                  >
+                    { getBtnConfigByControlName("BtnEventBlanking2").showName }
                   </Button>
                 </Space>
                 <Space>
@@ -1056,7 +1091,13 @@ const ProductionExecContent0 = props =&gt; {
                     {...btnProps}
                     {...getBtnConfigByControlName("BtnCancel")}
                   >
-                    撤销
+                    { getBtnConfigByControlName("BtnCancel").showName }
+                  </Button>
+                  <Button
+                    {...btnProps}
+                    {...getBtnConfigByControlName("BtnEventBlanking3")}
+                  >
+                    { getBtnConfigByControlName("BtnEventBlanking3").showName }
                   </Button>
                 </Space>
                 <Space className="rightPart">
@@ -1166,19 +1207,44 @@ const ProductionExecContent1 = props =&gt; {
     tableProps: {}
   };
-  const viewConfigs = config.gdsconfigformslave
-    .filter(item => item.bControl && item.sControlName.indexOf("Btn") === -1)
-    // .filter((_, index) => index < 8)
-    .map(item => ({
-      ...item,
-      iColValue: 24
-    }));
-
   const viewRow =
     (selectedRowKeys[0]
       ? data.find(item => item.sId === selectedRowKeys[0])
       : data[0]) || {};
+  const viewConfigs = config.gdsconfigformslave
+    .filter(item => item.bControl && item.sControlName.indexOf("Btn") === -1)
+    // .filter((_, index) => index < 8)
+    .map(item => {
+      let iTag = item.iTag;
+      if (item.sName === 'dReportQty' && (viewRow.bAutoReport || viewRow.bReport)) {
+        iTag = 1;
+      }
+      if (['dLockUpFei', 'dMadeUpFei', 'iLaminatingPaper'].includes(item.sName) && (viewRow.bReport || viewRow.iJobStatus != 3)) {
+         iTag = 1;
+      }
+      if (["dAdvanceMadeUpFei", "dAdvanceLockUpFei", "iAdvanceLaminatingPaper"].includes(item.sName)) {
+        if (!viewRow.bAdvanceReport && viewRow.iJobStatus && viewRow.bAdvance) {
+          iTag = 3;
+        } else {
+          iTag = 1;
+        }
+      }
+      if (item.sName === "dAdvanceReportQty") {
+        if (!viewRow.bAdvanceReport && !viewRow.bAutoReport && viewRow.iJobStatus && viewRow.bAdvance) {
+          iTag = 3;
+        } else {
+          iTag = 1;
+        }
+      }
+      return {
+        ...item,
+        iColValue: 24,
+        iTag
+      }
+    });
+
+
   const viewProps = {
     ...props,
     viewConfigs,
@@ -1226,7 +1292,7 @@ const ProductionExecContent1 = props =&gt; {
   };
   const getBtnProps = btnConfig => {
-    const { sFontColor } = btnConfig;
+    const { sFontColor, showName = '' } = btnConfig;
     const style = sFontColor
       ? { backgroundColor: sFontColor, borderColor: sFontColor }
@@ -1234,7 +1300,7 @@ const ProductionExecContent1 = props =&gt; {
     return {
       type: "primary",
       size: "large",
-      style: { width: 80, ...style },
+      style: { width: showName.length <= 4 ? 80 : showName.length * 20, ...style },
       disabled: props.onGetBtnStatus(tableName, btnConfig),
       onClick: async () => {
         if (!props.onGetBtnContinue()) return;
@@ -733,7 +733,14 @@
                   {carouselData.map(item => (
                     <div key={item.id} className={`tasksCarousel`}>
                       <h2>{item.title}</h2>
-                      <p>{item.content}</p>
+                      <p onDoubleClick={() => {
+                        if (item.id === 999) return;
+                        Modal.info({
+                          width: "40vw",
+                          title: item.title,
+                          content: item.content
+                        });
+                      }}>{item.content}</p>
                     </div>
                   ))}
                 </Carousel>
@@ -172,7 +172,9 @@
       }
       .tasksCarousel {
-        height: calc(100% - 8px);
+        height: 100%;
+        display: flex !important;
+        flex-direction: column;
         h2 {
           padding-left: 30px;
@@ -184,9 +186,13 @@
         }
         p {
-          margin-top: @margin-top;
+          flex: 1;
+          overflow: auto;
+          margin: @margin-top 0 0 0;
           line-height: 28px;
           font-size: 18px;
+          cursor: default;
+          user-select: none;
         }
       }
     }
@@ -332,6 +332,8 @@ const useTeamInfoEvent = props =&gt; {
     const { config, record, name } = params;
     props.onProcedureCall({
+      bForemanCheck: true,
+      getFaceResult,
       btnConfig: config,
       tableData: [record],
       faceData: { sEmployeeNo: faceResult.sEmployeeNo },
@@ -584,7 +584,7 @@ export default {
         // }
         url = `${config.ws_host}websocket/${userinfo.sId}?reStart=true`;
         if (userinfo.sUserLoginType) {
-          url = `${config.ws_host}websocket/${userinfo.sId}?reStart=true&sLoginType=${userinfo.sUserLoginType}`;
+          url = `${config.ws_host}websocket/${userinfo.sId}?reStart=true&createTime=${new Date().getTime()}&sLoginType=${userinfo.sUserLoginType}`;
         }
       }
       const reset = (ws, config1) => {
@@ -598,13 +598,23 @@ export default {
           ws.send(JSON.stringify(message));
         }, config1.timeoutServer);
       };
+      const oldWebSocket = yield select(state => state.app.webSocket);
       const ws = new WebSocket(url);
       ws.onopen = function (e) {
         console.log('连接上 webscoket 服务端了', e);
         start(ws, config);
+        if (oldWebSocket && oldWebSocket !== ws) {
+          try {
+            oldWebSocket.close();
+            console.log('================已关闭旧的WebSocket连接======================');
+          } catch (error) {
+            console.log('================关闭旧WebSocket连接时出错======================', error);
+          }
+        }
       };
       // 全局通用的自定义onmessage的方法
       ws.homeAction = (msg) => {
+        clearTimeout(window.wsTimer);
         const rtmsg = JSON.parse(msg.data);
         if (false && rtmsg.action === 'showImg' && location.pathname.indexOf('/indexOee') < 0) {
           const msgData = JSON.parse(msg.data);
 /* eslint-disable */
 const isDev = process.env.NODE_ENV === 'development';
-const bHttps = location.protocol === 'https:' ;
+const bHttps = location.protocol === 'https:';
 export const webSite = {
   // ipAddress: '//t0.xlyprint.com:8000/xlyEntry/', /* 服务器地址 */
   // faceAddress: isDev ? '//192.168.11.22:8080/xlyFace' : '//' + location.host + '/xlyFace',
   fileAddress: isDev ? '//127.0.0.1:8080/xlyEntry/' : '//' + location.host + '/xlyReport/', // 接口地址
-  faceAddress: isDev ? '//172.19.18.26:8080/xlyFace' : '//' + location.host + '/xlyFace',
-  ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//127.0.0.1:8080/xlyEntry/' : '//' + location.host + '/xlyMes/',
-  interfaceAddress: isDev ? '//127.0.0.1:8088/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址
+  faceAddress: isDev ? '//172.19.18.50:8543/xlyFace' : '//' + location.host + '/xlyFace',
+  ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//127.0.0.1:8080/xlyEntry/' : '//' + location.host + '/xlyEntry/',
+  interfaceAddress: isDev ? '//172.19.18.50:8543/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址
   // ipAddress: isDev ? '//ebc.jinjia.com:8091/xlyEntry/' : '//' + location.host + '/xlyEntry/',
   // interfaceAddress: isDev ? '//ebc.jinjia.com:8091/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址
   // ipAddress: isDev ? '//192.168.11.26:8080/xlyEntry/' : '//' + location.host + '/xlyEntry/',
@@ -24,7 +24,7 @@ module.exports = {
   hasSum: false,
   isWeiXin: false,
   server_host: bHttps && !localStorage.ipAddress ? `https:${webSite.ipAddress}` : `http:${webSite.ipAddress}`, /* 外网连内网服务器地址 */
-//   server_host: bHttps && !localStorage.ipAddress ? `http://172.19.18.21:8543/xlyMes/` : `http://172.19.18.21:8543/xlyMes/`, /* 外网连内网服务器地址 */
+//   server_host: bHttps && !localStorage.ipAddress ? `http://172.19.18.50:8543:8543/xlyMes/` : `http://172.19.18.50:8543:8543/xlyMes/`, /* 外网连内网服务器地址 */
   ws_host: bHttps && !localStorage.ipAddress ? `wss:${webSite.ipAddress}` : `ws:${webSite.ipAddress}`,
   file_host: bHttps ? `https:${webSite.fileAddress}` : `http:${webSite.fileAddress}`, /* 外网连内网服务器地址 */
   face_host: bHttps ? `https:${webSite.faceAddress}` : `http:${webSite.faceAddress}`, /* 外网连内网服务器地址 */