feat: 任务列表调整

src/views/MenuLayout/index.tsx

@@ -19,18 +19,21 @@ const MenuLayout = observer(() => {
         <CurrentProject />
         <List className={style.list}>
           {permissionStore.sidebarRouters.map((item, index) => {
-            return (
-              <li
-                key={"sidebar" + index}
-                className={classnames({
-                  [style.listItem]: true,
-                  [style.active]: item.path === pathname,
-                })}
-                onClick={() => item.type === "page" && navigate(item.path)}
-              >
-                {item.name}
-              </li>
-            );
+            if (item.show) {
+              return (
+                <li
+                  key={"sidebar" + index}
+                  className={classnames({
+                    [style.listItem]: true,
+                    [style.active]: item.path === pathname,
+                  })}
+                  onClick={() => item.type === "page" && navigate(item.path)}
+                >
+                  {item.name}
+                </li>
+              );
+            }
+            return null;
           })}
         </List>
       </Box>

src/views/Project/ProjectJobDetail/index.tsx

@@ -2,7 +2,7 @@
  * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
  * @Date: 2022-06-21 20:03:56
  * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
- * @LastEditTime: 2022-06-26 10:26:48
+ * @LastEditTime: 2022-06-28 11:22:47
  * @FilePath: /bkunyun/src/views/Project/ProjectSubmitWork/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -33,10 +33,11 @@ const ProjectSubmitWork = () => {
   });
 
   useEffect(() => {
+    const locationInfo: any = location?.state;
     run({
-      id: "b1044787-9618-4324-bc44-8d38e781aa44",
+      id: locationInfo.taskId,
     });
-  }, [run]);
+  }, [location?.state, run]);
 
   return (
     <div className={styles.swBox}>

src/views/Project/ProjectSubmitWork/WorkFlow/index.tsx

@@ -2,7 +2,7 @@
  * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
  * @Date: 2022-06-21 15:25:25
  * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
- * @LastEditTime: 2022-06-24 17:13:33
+ * @LastEditTime: 2022-06-27 20:50:36
  * @FilePath: /bkunyun/src/views/Project/ProjectSubmitWork/WorkFlow/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */

src/views/Project/ProjectWorkbench/workbenchList/index.tsx

@@ -2,24 +2,25 @@
  * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
  * @Date: 2022-05-31 10:18:13
  * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
- * @LastEditTime: 2022-06-07 21:39:30
+ * @LastEditTime: 2022-06-28 11:30:27
  * @FilePath: /bkunyun/src/views/Project/ProjectSetting/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
-import { memo, useEffect, useState } from "react";
+import { memo, useCallback, useEffect, useState } from "react";
 import _ from "lodash";
-import { useStores } from "@/store";
-import styles from "./index.module.css";
+import { useNavigate } from "react-router-dom";
 import { Box, Typography } from "@mui/material";
 import OutlinedInput from "@mui/material/OutlinedInput";
 import SearchIcon from "@mui/icons-material/Search";
-import useMyRequest from "@/hooks/useMyRequest";
 import LinearProgress, { linearProgressClasses } from '@mui/material/LinearProgress';
 import { TablePagination } from '@mui/material';
-import ActionsComponent from "../../../../components/Material.Ui/Table/ActionsComponent"
 import TextField from '@mui/material/TextField';
 import MenuItem from '@mui/material/MenuItem';
+
 import SimpleDialog from "./components/simpleDialog"
+import { useStores } from "@/store";
+import useMyRequest from "@/hooks/useMyRequest";
+import ActionsComponent from "../../../../components/Material.Ui/Table/ActionsComponent"
 import runTime from '../../../../assets/project/runTime.svg'
 import jobCost from '../../../../assets/project/jobCost.svg'
 import jobSue from '../../../../assets/project/jobSue.svg'
@@ -35,6 +36,9 @@ import {
     cancelWorkflowJob
 } from "@/api/workbench_api";
 
+import styles from "./index.module.css";
+
+
 const currencies = [
     {
         value: 'ALL',
@@ -78,6 +82,7 @@ const ProjectMembers = () => {
             setCount(result.data.totalElements)
         },
     });
+    const navigate = useNavigate()
 
     // 删除作业
     const { run: delWorkflowJob } = useMyRequest(deleteWorkflowJob, {
@@ -223,6 +228,16 @@ const ProjectMembers = () => {
         }
     }
 
+      /** 点击每一行 */
+  const rowClick = useCallback(
+    (id: string) => {
+      navigate(`/product/cadd/projectJobDetail`, {
+        state: { taskId: id },
+      });
+    },
+    [navigate],
+  );
+
     return (
         <Box className={styles.headerBox}>
 
@@ -247,12 +262,12 @@ const ProjectMembers = () => {
                         size="small"
                         sx={{
                             width: 180, height: 32,
-                            ['& .MuiOutlinedInput-root']: {
+                            '& .MuiOutlinedInput-root': {
                                 height: '32px',
                                 color: "#1E2633",
                                 fontSize: '14px'
                             },
-                            ['& .MuiInputLabel-root']: {
+                            '& .MuiInputLabel-root': {
                                 color: "#8A9099",
                                 fontSize: '14px'
                             },
@@ -282,7 +297,7 @@ const ProjectMembers = () => {
                 {
                     jobList.length > 0 && jobList.map((item: any, key) => {
                         return (
-                            <Box className={styles.tabBox}>
+                            <Box className={styles.tabBox} onClick={()=>rowClick(item.id)}>
                                 <Box className={styles.tabBoxInfo}>
                                     <div className={styles.tabBoxTitle}>{item.name}</div>
                                     <Box className={styles.tabBoxDescInfo}>

src/views/Project/components/Flow/index.tsx

-import { IEdge, ITask } from "../../ProjectSubmitWork/interface";
 import ReactFlow, {
   Controls,
   Background,
@@ -11,6 +10,11 @@ import ReactFlow, {
 } from "react-flow-renderer";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import classNames from "classnames";
+
+import jobFail from "@/assets/project/jobFail.svg";
+import jobRun from "@/assets/project/jobRun.svg";
+import jobSue from "@/assets/project/jobSue.svg";
+import { IEdge, ITask } from "../../ProjectSubmitWork/interface";
 import { IBatchNode, ILine } from "./interface";
 
 import styles from "./index.module.css";
@@ -85,6 +89,7 @@ const FlowNode = (props: any) => {
       <div style={{ display: "flex", alignItems: "center" }}>
         {data?.label || ""}
         {data.isCheck && <span className={styles.successDot}></span>}
+        <img style={{ marginLeft: "6px" }} src={jobRun} alt="" />
       </div>
       {data?.dotStatus?.isOutput ? (
         <Handle