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

src/App.vue

@@ -7,7 +7,7 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
-  <!-- <div
+  <div
     style="
       background: #0078fc;
       height: 150px;
@@ -16,7 +16,7 @@
       top: 0;
       z-index: 1;
     "
-  ></div> -->
+  ></div>
   <div id="container">
     <!-- <div id="nav">
       <router-link

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

@@ -2,9 +2,16 @@
 	<div class="pathdetails" style="padding: 30px">
 		<!-- 面包屑导航 -->
 		<div class="crumb">
-			     <div>{{data.name}}</div>
-			     <div style="margin-left: 6px; margin-right: 6px">/</div>
+			<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/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