浏览代码

feat: unity 弹窗联调

ZhaoJun 1 年之前
父节点
当前提交
353d7975ad

+ 6 - 3
src/pages/EqSelfInspection/index.js

@@ -85,7 +85,10 @@ const EqSelfInspection = (props) => {
       console.log(err);
       console.log(err);
     });
     });
     if (mandateIDs?.length) {
     if (mandateIDs?.length) {
-      console.log('打开任务弹窗');
+      UnityAction.sendMsg(
+        'OpenTaskModal',
+        `/task-manage/pop/${projectId}?mandate_id=${mandateIDs.join()}`,
+      );
     } else {
     } else {
       message.info('未查询到相关任务');
       message.info('未查询到相关任务');
     }
     }
@@ -181,8 +184,8 @@ const EqSelfInspection = (props) => {
         <Item name="设备自检" status={patrolStatus}></Item>
         <Item name="设备自检" status={patrolStatus}></Item>
         <Item name="工艺自检" status={faultAnalysisStatus}></Item>
         <Item name="工艺自检" status={faultAnalysisStatus}></Item>
         <Item name="安全自检" status={secureStatus}>
         <Item name="安全自检" status={secureStatus}>
-          {secureChildren?.map((item) => (
-            <WarningItem label={item.label} status={item.status} />
+          {secureChildren?.map((item, index) => (
+            <WarningItem key={index} label={item.label} status={item.status} />
           ))}
           ))}
         </Item>
         </Item>
         <div className={styles.btnContainer}>
         <div className={styles.btnContainer}>

+ 21 - 4
src/pages/Home/index.js

@@ -259,9 +259,20 @@ const Backlog = (props) => {
   const { data, loading } = useRequest(getPendingList, {
   const { data, loading } = useRequest(getPendingList, {
     defaultParams: [{ project_id: projectId }],
     defaultParams: [{ project_id: projectId }],
   });
   });
-  console.log(data);
-  const handleClick = () => {
-    //TODO
+  const handleClick = (item) => {
+    if (item.type === 0) {
+      // task
+      UnityAction.sendMsg(
+        'OpenTaskModal',
+        `/task-manage/pop/${projectId}?mandate_id=${item.origin_id}`,
+      );
+    } else {
+      // order
+      UnityAction.sendMsg(
+        'OpenWorkOrderModal',
+        `/task-manage/pop/work-order/${projectId}?order_id=${item.origin_id}&order_type=${item.origin_type}`,
+      );
+    }
   };
   };
   return (
   return (
     <Box
     <Box
@@ -278,7 +289,13 @@ const Backlog = (props) => {
           {data?.map((item) => (
           {data?.map((item) => (
             <>
             <>
               <div className={styles.createTime}>{item.time}</div>
               <div className={styles.createTime}>{item.time}</div>
-              <div className={styles.item} onClick={() => handleClick(item)}>
+              <div
+                className={styles.item}
+                onClick={(e) => {
+                  e.stopPropagation();
+                  handleClick(item);
+                }}
+              >
                 <div className={styles.point} />
                 <div className={styles.point} />
                 <div className={styles.titleText}>{item.title}</div>
                 <div className={styles.titleText}>{item.title}</div>
                 <div className={styles.bottomCon}>{item.content}</div>
                 <div className={styles.bottomCon}>{item.content}</div>

+ 9 - 2
src/pages/Smart/OptimizationTasks.js

@@ -6,6 +6,7 @@ import {
   queryMandateChildList,
   queryMandateChildList,
   querySimulationProfit,
   querySimulationProfit,
 } from '@/services/SmartOps';
 } from '@/services/SmartOps';
+import { UnityAction } from '@/utils/utils';
 import { useParams, useRequest } from '@umijs/max';
 import { useParams, useRequest } from '@umijs/max';
 import { Table } from 'antd';
 import { Table } from 'antd';
 import dayjs from 'dayjs';
 import dayjs from 'dayjs';
@@ -70,7 +71,10 @@ const Produce = ({ projectId }) => {
     if (!mandateID) {
     if (!mandateID) {
       return;
       return;
     }
     }
-    console.log(mandateID);
+    UnityAction.sendMsg(
+      'OpenTaskModal',
+      `/task-manage/pop/${projectId}?mandate_id=${mandateID}`,
+    );
   };
   };
 
 
   return (
   return (
@@ -168,7 +172,10 @@ const Cost = ({ projectId }) => {
     if (!mandateID) {
     if (!mandateID) {
       return;
       return;
     }
     }
-    console.log(mandateID);
+    UnityAction.sendMsg(
+      'OpenTaskModal',
+      `/task-manage/pop/${projectId}?mandate_id=${mandateID}`,
+    );
   };
   };
 
 
   return (
   return (

+ 10 - 4
src/pages/TaskManage/components/MandateDetail.js

@@ -1,4 +1,5 @@
 import { queryMandate } from '@/services/SmartOps';
 import { queryMandate } from '@/services/SmartOps';
+import { UnityAction } from '@/utils/utils';
 import { connect, useRequest } from '@umijs/max';
 import { connect, useRequest } from '@umijs/max';
 import {
 import {
   Button,
   Button,
@@ -171,9 +172,11 @@ const MandateDetail = (props) => {
     }
     }
   };
   };
 
 
-  const openWorkOrderModal = () => {
-    // 打开工单弹窗
-    console.log('open work order modal');
+  const openWorkOrderModal = (record) => {
+    UnityAction.sendMsg(
+      'OpenWorkOrderModal',
+      `/task-manage/pop/work-order/${projectID}?order_id=${record.Id}&order_type=${record.RecordType.value}`,
+    );
   };
   };
 
 
   useEffect(() => {
   useEffect(() => {
@@ -239,7 +242,10 @@ const MandateDetail = (props) => {
               </Row>
               </Row>
             </div>
             </div>
             <Divider type="vertical" style={{ height: '40px' }} />
             <Divider type="vertical" style={{ height: '40px' }} />
-            <div className={styles.rightButton} onClick={openWorkOrderModal}>
+            <div
+              className={styles.rightButton}
+              onClick={() => openWorkOrderModal(item)}
+            >
               查看工单
               查看工单
             </div>
             </div>
           </div>
           </div>