合并

src/views/homework/HomeworkPage.vue

@@ -271,6 +271,7 @@ const showFileList = computed(() => {
 	return fileList.value.length
 })
 
+
 const handleClick = () => {
 	console.log(fileList.value, uploadRef.value)
 	if (!sbValue.value.content) {

src/views/project/ProjectDetails.vue

@@ -5,6 +5,13 @@
 			<div>{{data.name}}</div>
 			<div style="margin-left: 6px; margin-right: 6px">/</div>
 			<div style="font-weight: 700">项目详情</div>
+
+			<div class="return">
+				<div style="display: flex" @click="returnclick">
+					<img class="img2" style="margin-right: 22px;cursor: pointer;" src="../../assets/image/return.png" />
+					<div style="cursor: pointer;" class="text">返回</div>
+				</div>
+			</div>
 		</div>
 		<!-- 面包屑导航 -->
 		<div class="pdname">
@@ -75,7 +82,7 @@
 								</div>
 							</div>
 						</div>
-						<div class="goclass" @click="toFinish(value, i.name, i.stageId)">
+						<div class="goclass" @click="toFinish(value, i.stageName, i.stageId)">
 							{{
 									value.status === 1
 										? "已完成"
@@ -373,7 +380,7 @@ function introductionPro() {
 }
 
 function toFinish(d, sName, chapterId) {
-	console.log("dddddd", d);
+	console.log("dddddd", d, sName);
 	// 作业过期判断
 	if (d.type == 4) {
 		let date1 = new Date(d.endTime).getTime();
@@ -490,6 +497,17 @@ function whiteTypes(type) {
 		display: flex;
 		font-size: 14px;
 		line-height: 24px;
+		.return {
+			position: absolute;
+			right: 10%;
+
+			.text {
+					text-align: center;
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+				}
+		}
 	}
 
 	.pdname {

src/views/project/ProjectManage.vue

@@ -31,37 +31,22 @@
 					<el-input v-model="projectname" placeholder="请输入项目名称" />
 				</div>
 				<div style="width: 420px">
-          <el-date-picker
+					<el-date-picker v-model="searchTime" type="datetimerange" start-placeholder="开始时间" end-placeholder="结束时间"
-            v-model="searchTime"
+						@change="selectTime" />
-            type="datetimerange"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            @change="selectTime"
-          />
 				</div>
 
-        <button
+				<button class="searchBtn" @click="searchClick" style="margin-left: 20px">
-          class="searchBtn"
-          @click="searchClick"
-          style="margin-left: 20px"
-        >
 					搜索
 				</button>
 				<button class="searchBtn" @click="resetClick">重置</button>
 			</div>
-      <div class="projectList" v-if="projectList.length==0" style="display:flex;color:#909399;">
+			<div class="projectList" v-if="!projectList.length" style="display:flex;color:#909399;">
-        <img
+				<img class="img2" style="margin-left: 675px;margin-top: 165px;width:148px;height:220px;"
-            class="img2"
+					src="../../assets/image/notask.png" />
-            style="margin-left: 675px;margin-top: 165px;width:148px;height:220px;"
-            src="../../assets/image/notask.png"
-          />
 			</div>
 			<div v-else class="projectList" v-for="(i, k) in projectList" :key="k">
 				<div style="display: flex">
-          <img
+					<img style="width: 253px; height: 144px; border-radius: 4px" :src="i.picUrl" />
-            style="width: 253px; height: 144px; border-radius: 4px"
-            :src="i.picUrl"
-          />
 					<div style="margin-left: 29px">
 						<div class="projectName" :title="i.name">
 							{{ i.name }}
@@ -69,29 +54,19 @@
 						<div class="progress">
 							<div class="progressNow">当前进度：</div>
 							<div style="width: 115px">
-                <el-progress
+								<el-progress :percentage="parseInt(i.finishTaskNum / i.totalTaskNum * 100)" :show-text="false"
-                  :percentage="parseInt(i.finishTaskNum / i.totalTaskNum) * 100"
+									:stroke-width="8" color="rgba(255, 160, 80, 1)" />
-                  :show-text="false"
-                  :stroke-width="8"
-                  color="rgba(255, 160, 80, 1)"
-                />
 							</div>
 							<div class="progressNum">
 								{{
-                  i.finishTaskNum && i.totalTaskNum
+										(i.finishTaskNum && i.totalTaskNum) ? parseInt(i.finishTaskNum / i.totalTaskNum * 100) : 0
-                    ? parseInt(i.finishTaskNum / i.totalTaskNum) * 100
-                    : 0
 								}}%
 							</div>
 						</div>
-            <div class="studyNew">最新一次学习时间：{{ i.lastStudyTime }}</div>
+						<div class="studyNew" v-if="i.lastStudyTime">最新一次学习时间：{{ i.lastStudyTime }}</div>
 					</div>
 				</div>
-        <div
+				<div class="tobestarted" v-if="i.status == 2" @click="goProjectDetails(i)">
-          class="tobestarted"
-          v-if="i.status == 2"
-          @click="goProjectDetails(i)"
-        >
 					待开始
 				</div>
 				<div class="gostudy" v-if="i.status == 0" @click="goProjectDetails(i)">
@@ -100,11 +75,7 @@
 				<div class="finish" v-if="i.status == 1" @click="goProjectDetails(i)">
 					已完成
 				</div>
-        <div
+				<div class="tobestarted" v-if="i.status == 3" @click="goProjectDetails(i)">
-          class="tobestarted"
-          v-if="i.status == 3"
-          @click="goProjectDetails(i)"
-        >
 					已结束
 				</div>
 			</div>
@@ -215,7 +186,7 @@ const goProjectDetails = (value) => {
 		})
 		: window.open(
 			`${import.meta.env.VITE_BOE_PATH_DETAIL_URL}/projectdetails&params=${encodeURIComponent(
-              `projectId=${routerId}`
+				`projectId=${value.projectId}`
 			)}`
 		);
 };
@@ -227,22 +198,26 @@ const goProjectDetails = (value) => {
 	//border-radius: 8px;
 	background-color: rgba(255, 255, 255, 1);
 	display: flex;
+
 	// background-color: #ccc;
 	.content {
 		width: 100%;
 		// flex: 1;
 		margin-top: 50px;
 		margin-left: 81px;
+
 		.title {
 			font-size: 18px;
 			font-weight: 600;
 			color: #333333;
 			line-height: 25px;
 		}
+
 		.search {
 			margin-top: 31px;
 			display: flex;
 			align-items: center;
+
 			.searchBtn {
 				width: 100px;
 				height: 35px;
@@ -257,12 +232,14 @@ const goProjectDetails = (value) => {
 				margin-left: 10px;
 			}
 		}
+
 		.projectList {
 			margin-top: 40px;
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
 			overflow-x: auto;
+
 			.projectName {
 				width: 270px;
 				margin-top: 12px;
@@ -275,12 +252,15 @@ const goProjectDetails = (value) => {
 				text-overflow: ellipsis;
 				white-space: nowrap;
 			}
+
 			.progress {
 				display: flex;
 				align-items: center;
+
 				.el-progress-bar__outer {
 					background-color: rgba(255, 160, 80, 0.19);
 				}
+
 				.progressNow {
 					font-size: 14px;
 					font-weight: 400;
@@ -288,6 +268,7 @@ const goProjectDetails = (value) => {
 					line-height: 20px;
 					margin-right: 20px;
 				}
+
 				.progressNum {
 					font-size: 12px;
 					font-weight: 400;
@@ -296,6 +277,7 @@ const goProjectDetails = (value) => {
 					margin-left: 26px;
 				}
 			}
+
 			.studyNew {
 				margin-top: 16px;
 				font-size: 14px;
@@ -303,6 +285,7 @@ const goProjectDetails = (value) => {
 				color: #999999;
 				line-height: 20px;
 			}
+
 			.tobestarted {
 				width: 140px;
 				height: 40px;
@@ -318,6 +301,7 @@ const goProjectDetails = (value) => {
 				cursor: pointer;
 				margin-right: 120px;
 			}
+
 			.gostudy {
 				width: 140px;
 				height: 40px;
@@ -334,6 +318,7 @@ const goProjectDetails = (value) => {
 				margin-right: 120px;
 				cursor: pointer;
 			}
+
 			.finish {
 				width: 140px;
 				height: 40px;

src/views/roadmap/PathDetails.vue

@@ -5,6 +5,13 @@
       <div>{{ routerName }}</div>
       <div style="margin-left: 6px; margin-right: 6px">/</div>
       <div style="font-weight: 700">路径图详情</div>
+
+      <div class="return">
+				<div style="display: flex" @click="returnclick">
+					<img class="img2" style="margin-right: 22px;cursor: pointer;" src="../../assets/image/return.png" />
+					<div style="cursor: pointer;" class="text">返回</div>
+				</div>
+			</div>
     </div>
     <!-- 面包屑导航 -->
     <div class="pdname">
@@ -448,7 +455,7 @@ function toFinish(d) {
         type: 1,
         courseId: d.courseId,
         pName: data.value.name,
-        sName:data.currentStageName,
+        sName:data.value.currentStageName,
       },
     });
   } else if (typeof types.value.path[d.type] === "function") {

src/views/survey/SurveyDetail.vue

@@ -413,6 +413,10 @@ function formateArr(arr1) {
 const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId });
 console.log('我是需要排序得题目', data )
 
+function goHome() {
+
+}
+
 const centerDialogVisible =ref(false);
 const open=()=>{
   centerDialogVisible.value = true