feat:交互优化

src/components/BusinessComponents/FileSelect/index.module.css

 .FSBox {
 	width: 900px;
+	height: 650px;
 	position: relative;
 }
 

src/views/Project/ProjectJobDetail/index.module.css

@@ -68,6 +68,7 @@
 	margin: 6px 0;
 }
 .outputLiLeft {
+	cursor: pointer;
 	display: flex;
 	align-items: center;
 	color: rgba(19, 112, 255, 1);

src/views/Project/ProjectJobDetail/index.tsx

@@ -116,16 +116,22 @@ const ProjectSubmitWork = observer(() => {
 	const getFolderPath = (path: string) => {
 		const lastIndex = path.lastIndexOf("/");
 		if (lastIndex !== -1) {
-			path = path.slice(0, lastIndex + 1);
+			path = path.slice(0, lastIndex);
 		}
 		return path;
 	};
 
 	/** 返回事件 */
 	const onBack = useCallback(() => {
-		navigate("/product/cadd/projectWorkbench", {
-			state: { type: "workbenchList" },
-		});
+		const locationInfo: any = location?.state;
+		if(locationInfo.from==='projectOverview'){
+			navigate("/product/cadd/projectOverview");
+		}else{
+			navigate("/product/cadd/projectWorkbench", {
+				state: { type: "workbenchList" },
+			});
+		}
+		
 	}, [navigate]);
 
 	const outputPathTransform = (path: string) => {
@@ -200,9 +206,8 @@ const ProjectSubmitWork = observer(() => {
 			if (Array.isArray(res.data)) {
 				res.data.forEach((item1) => {
 					if (item1.name === item.path.slice(item.path.lastIndexOf("/") + 1)) {
-						randerOutputs[index].size = `${
-							item1.size ? storageUnitFromB(Number(item1.size)) : "-"
-						}`;
+						randerOutputs[index].size = `${item1.size ? storageUnitFromB(Number(item1.size)) : "-"
+							}`;
 						setRanderOutputs([...randerOutputs]);
 					}
 				});
@@ -304,7 +309,7 @@ const ProjectSubmitWork = observer(() => {
 
 	const handleShowPopper = (e: any, title: string) => {
 		setPopperTitle(title);
-		setAnchorEl(anchorEl ? null : e.currentTarget);
+		setAnchorEl(e.currentTarget);
 	};
 
 	const handleConfirm = () => {
@@ -364,7 +369,7 @@ const ProjectSubmitWork = observer(() => {
 											: "任务被删除后将无法恢复，确认继续吗？"
 									)
 								}
-								// click={onStopJob}
+							// click={onStopJob}
 							></MyButton>
 							{/* </MyPopconfirm> */}
 						</div>
@@ -392,13 +397,14 @@ const ProjectSubmitWork = observer(() => {
 														<div
 															className={styles.outputLiLeft}
 															onClick={(e: any) => {
-																handleShowPopper(
-																	e,
-																	"即将跳转至项目数据内该任务的结果目录，确认继续吗？"
-																);
-																setGoToProjectDataPath(
-																	getFolderPath(item.path)
-																);
+																// handleShowPopper(
+																// 	e,
+																// 	"即将跳转至项目数据内该任务的结果目录，确认继续吗？"
+																// );
+																// setGoToProjectDataPath(
+																// 	getFolderPath(item.path)
+																// );
+																goToProjectData(getFolderPath(item.path))
 															}}
 														>
 															<img
@@ -421,8 +427,8 @@ const ProjectSubmitWork = observer(() => {
 									)}
 								{(!workFlowJobInfo?.outputs ||
 									Object.keys(workFlowJobInfo?.outputs).length === 0) && (
-									<div className={styles.notResults}>暂无结果文件</div>
-								)}
+										<div className={styles.notResults}>暂无结果文件</div>
+									)}
 								<div className={styles.title}>任务信息</div>
 								<div className={styles.taskInfoLi}>
 									<div className={styles.taskInfoParams}>任务名称</div>
@@ -446,8 +452,16 @@ const ProjectSubmitWork = observer(() => {
 											[styles.taskInfoValue]: true,
 											[styles.taskInfoValueClick]: true,
 										})}
-										onClick={() =>
-											goToProjectData(workFlowJobInfo?.outputPath as string)
+										onClick={(e: any) => {
+											handleShowPopper(
+												e,
+												"即将跳转至项目数据内该任务的输出路径，确认继续吗？"
+											);
+											setGoToProjectDataPath(
+												workFlowJobInfo?.outputPath as string
+											);
+											// goToProjectData(workFlowJobInfo?.outputPath as string)
+										}
 										}
 									>
 										{workFlowJobInfo?.outputPath

src/views/Project/ProjectOverview/TaskCard/index.tsx

@@ -50,7 +50,7 @@ const TaskCard = (props: TaskCardProps) => {
     const goToProjectData = (path: string) => {
         const lastIndex = path.lastIndexOf("/");
         if (lastIndex !== -1) {
-            path = path.slice(0, lastIndex + 1);
+            path = path.slice(0, lastIndex);
         }
         path = path.slice(12);
         if (path) {
@@ -66,7 +66,7 @@ const TaskCard = (props: TaskCardProps) => {
     // 跳转详情页
     const gotoDetail = (id: string) => {
         navigate(`/product/cadd/projectJobDetail`, {
-            state: { taskId: id },
+            state: { taskId: id, from: 'projectOverview' },
         });
     }
     // 渲染状态图标

src/views/Project/ProjectOverview/index.tsx

@@ -45,6 +45,8 @@ const ProjectOverview = observer(() => {
     });
 
     useEffect(() => {
+        // 切项目时重置为初始7
+        setDay("7");
         if (currentProjectStore.currentProjectInfo.id) {
             getOverview({
                 id: currentProjectStore.currentProjectInfo.id as string,

src/views/Project/ProjectSetting/index.tsx

@@ -39,12 +39,9 @@ const ProjectSetting = observer(() => {
 
 	if (currentProjectStore.currentProjectInfo.name) {
 		return (
-			<div style={{ padding: 24 }}>
+			<div style={{ padding:'28px 24px 24px' }}>
 				<div style={{ display: "flex", alignItems: "center" }}>
-					<img src={projectImg} alt="项目logo" />
-					<span style={{ marginLeft: 12 }}>
-						{currentProjectStore.currentProjectInfo.name}
-					</span>
+				<span style={{ fontSize: "18px", lineHeight: "26px", fontWeight: "600", color: "#1E2633" }}>项目设置</span>
 				</div>
 				<Box sx={{ width: "100%", typography: "body1" }}>
 					<Tabs tabList={tabList} />

src/views/Project/ProjectWorkbench/workbenchList/index.module.css

@@ -60,9 +60,10 @@
 
 .tabBoxTime {
     font-size: 12px;
+    line-height: 20px;
     font-weight: 400;
     color: #565C66;
-    margin-left: 4px;
+    margin-left: 8px;
 }
 
 .tabBoxMiddle {
@@ -82,9 +83,10 @@
 
 .tabBoxStatusText {
     font-size: 12px;
+    line-height: 20px;
     font-weight: 400;
     color: #1E2633;
-    margin: 0px 16px 0px 6px;
+    margin: 0px 16px 0px 8px;
     white-space: nowrap;
 }
 

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

@@ -281,7 +281,7 @@ const ProjectMembers = observer(() => {
 	const rowClick = useCallback(
 		(id: string) => {
 			navigate(`/product/cadd/projectJobDetail`, {
-				state: { taskId: id },
+				state: { taskId: id, from: 'workbenchList' },
 			});
 		},
 		[navigate]
@@ -427,7 +427,7 @@ const ProjectMembers = observer(() => {
 										/>
 									</Box>
 									<div
-										style={{ color: renderTextColor(item.state) }}
+										style={{ color: renderTextColor(item.state), margin: '0px' }}
 										className={styles.tabBoxStatusText}
 									>
 										{item.completeNum + "/" + item.totalNum}