Merge remote-tracking branch 'origin/develop' into develop

src/views/project/ProjectDetails.vue

@@ -18,9 +18,22 @@
 					<div v-if="i.stageId == '0' && i.taskProcessList.length == 0"></div>
 					<div v-else class="title">
 						<div class="titleL">{{ i.stageName }}</div>
-						<div class="titleR" :style="{ display: 'flex' }">
+						<!-- 当前任务已结束的时候显示下面 -->
+						<div v-if="data.status==3" class="titleR" :style="{ display: 'flex' }">
+							<div style="width:8px;height:8px;border-radius:8px;border:2px solid #999;"></div>
+							<div class="titleRT" style="color:#999;">已结束</div>
+						</div>
+						<!-- 未开始 -->
+						<div v-else-if="data.status==2" class="titleR" :style="{ display: 'flex' }">
+							<div style="width:8px;height:8px;border-radius:8px;border:2px solid #999;"></div>
+							<div class="titleRT" style="color:#999;">未开始</div>
+						</div>
+						<!-- 默认进行中状态 -->
+						<div v-else class="titleR" :style="{ display: 'flex' }">
 							<img src="../../assets/image/pathdetails/circle.png" />
-							<div class="titleRT">进行中</div>
+							<div class="titleRT">
+								{{ queryAllStatus(i.taskProcessList) ? '已完成' : '进行中' }}
+							</div>
 						</div>
 						<div class="titleR" :style="{ display: i.status === 2 ? 'flex' : 'none' }">
 							<img src="../../assets/image/pathdetails/circle2.png" />
@@ -525,6 +538,17 @@ function toFinish(d, sName, chapterOrStageId) {
 function whiteTypes(type) {
 	return import.meta.env.VITE_TASK_WHITE_TYPE.includes("-" + type + "-");
 }
+// 查询当前阶段所有任务是否都完成
+const queryAllStatus = (data) => {
+	// status === 1 已完成
+	console.log(data)
+	for(let i=0;i<data.length;i++) {
+		if(data[i].status!==1){
+			return false
+		}
+	}
+	return true;
+}
 </script>
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss">

src/views/project/ProjectManage.vue

@@ -344,6 +344,7 @@ const goProjectDetails = (value) => {
 				font-weight: 400;
 				color: #ffffff;
 				line-height: 22px;
+				margin-right: 120px;
 				cursor: pointer;
 			}
 		}