Merge remote-tracking branch 'origin/release/customer/2025/五彩' into release/customer/2025/五彩

qmj
2 parents 9509a46c 3dcb678d
Showing 3 changed files with 20 additions and 7 deletions
src/mes/indexMes/index.js
src/mes/login/index.js
src/mes/scheduledTasks/machineTasks/index.js
@@ -992,6 +992,8 @@ const SystemFunComponent = () =&gt; {
     const resetDailyReport = commonFunc.showLocalMessage(props, 'resetDailyReport', '关机');
     const switchToManual = commonFunc.showLocalMessage(props, 'switchToManual', '切换手动');
     const SwitchAuto = commonFunc.showLocalMessage(props, 'SwitchAuto', '切换自动');
+    const ClearCache = commonFunc.showLocalMessage(props, 'ClearCache', '清空缓存');
+    const sSuccess = commonFunc.showLocalMessage(props, 'sSuccess', '成功');
     const { bPlcSd } = userinfo;
@@ -1036,7 +1038,7 @@ const SystemFunComponent = () =&gt; {
           overlayClassName={styles.systemFun}
           content={
             <div className="systemFunContent">
-              <div
+              {/* <div
                 className="restDailyReport"
                 onClick={() => {
                   handleSystemFunClick("restDailyReport");
@@ -1053,6 +1055,17 @@ const SystemFunComponent = () =&gt; {
               >
                 <SwapOutlined />
                 <span>{bPlcSd ? SwitchAuto : switchToManual}</span>
+              </div> */}
+               <div
+                className="restDailyReport"
+                onClick={() => {
+                setTimeout(() => {
+                    message.success(  ClearCache + sSuccess + '!');
+                }, 1000);
+                }}
+              >
+                <UndoOutlined />
+                <span>{ClearCache}</span>
               </div>
             </div>
           }
@@ -736,7 +736,7 @@ const FaceLoginAfterModal = props =&gt; {
       }}
     >
       <div className={styles.faceLogin1}>
-        <Form form={form} layout="vertical" size="large">
+        <Form form={form} layout="horizontal" size="large" labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
           {configs
             .filter(item => item.sName !== "sPassWord")
             .map(item => handleGetFormItem(props, item, true))}
@@ -432,11 +432,11 @@ const useInfoEvent = props =&gt; {
             tempTaskId: ""
           });
         }
-        // props.onChangeRouter({
-        //   type: "name",
-        //   path: ["生产执行", "生产执行"]
-        // });
-        handleRefresh();
+        props.onChangeRouter({
+          type: "name",
+          path: ["生产执行", "生产执行"]
+        });
+        // handleRefresh();
       } else if (code === -7) {
         // 如果有开工中的任务，即接口返回-7，弹出确认窗体
         itemClickRef.current = { data: item };