From 6ded0b99ac64de3d89ce389c1ef8f6ca8343d7a9 Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Fri, 23 Dec 2022 20:52:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E8=AF=BE=E4=BC=A0=E9=80=92=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/faceteach/FaceTeach.vue | 140 ++++++++++++------------------
 src/views/survey/SurveyDetail.vue |  36 ++++----
 2 files changed, 75 insertions(+), 101 deletions(-)

diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue
index fd6fe76..9fc1790 100644
--- a/src/views/faceteach/FaceTeach.vue
+++ b/src/views/faceteach/FaceTeach.vue
@@ -5,11 +5,12 @@
 			<div>课程列表</div>
 			<div style="margin-left: 6px; margin-right: 6px">/</div>
 			<div style="font-weight: 700">课程详情</div>
-		
+
 
 			<div v-if="pName != ''" class="return">
 				<div style="display: flex" @click="returnclick">
-          <el-button style="color:#0073FB">	<img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button>
+					<el-button style="color:#0073FB"> <img class="img2" style="margin-right:11px;cursor: pointer;"
+							src="../../assets/image/return.png" />返回</el-button>
 				</div>
 			</div>
 		</div>
@@ -50,94 +51,62 @@
 		</div>
 		<!-- 基本信息 -->
 
-    <!-- 详细信息 -->
-    <div class="detailinfo">
-      <div class="detail">
-        <div class="detailT">
-          <div class="" style="margin-left: 48px; margin-right: 48px">
-            <div class="title">
-              <img
-                style="width: 20px; height: 20px"
-                src="../../assets/image/course.png"
-              />
-              <div class="text">课程详情</div>
-              <div class="box"></div>
-            </div>
-            <div style="display: flex; align-items: center">
-              <div class="content" v-html="data.offcourseDto?.intro"></div>
-            </div>
-          </div>
-        </div>
-        <div class="detailB">
-          <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane label="课程附件" name="first">
-              <div
-                v-if="data.planDto?.attach === '[]'"
-                style="
+		<!-- 详细信息 -->
+		<div class="detailinfo">
+			<div class="detail">
+				<div class="detailT">
+					<div class="" style="margin-left: 48px; margin-right: 48px">
+						<div class="title">
+							<img style="width: 20px; height: 20px" src="../../assets/image/course.png" />
+							<div class="text">课程详情</div>
+							<div class="box"></div>
+						</div>
+						<div style="display: flex; align-items: center">
+							<div class="content" v-html="data.offcourseDto?.intro"></div>
+						</div>
+					</div>
+				</div>
+				<div class="detailB">
+					<el-tabs v-model="activeName" @tab-click="handleClick">
+						<el-tab-pane label="课程附件" name="first">
+							<div v-if="data.planDto?.attach === '[]'" style="
                   font-size: 14px;
                   font-weight: 400;
                   line-height: 24px;
                   cursor: pointer;
                   margin-left: 40px;
                   margin-top: 20px;
-                "
-              >
-                此课程无附件
-              </div>
-              <div  v-else>
-              <div 
-                v-for="(el, index) in JSON.parse(data.planDto?.attach)"
-                :key="index"
-               
-                class="enclosure"
-                :style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }"
-              >
-                <div class="enclosureL">
-                  <FileTypeImg
-                    v-model="el.name"
-                    :style="{
-                      width: '22px',
-                      height: '26px',
-                      marginLeft: '10px',
-                    }"
-                  ></FileTypeImg>
-                  <div style="margin-left: 20px">{{ el.name }}</div>
-                </div>
-                <div 
-                  v-if="new Date(data.planDto.beginTime).getTime() > new Date().getTime()"
-                  class="download">
-                  <img
-                    style="width: 16px; height: 15px"
-                    src="../../assets/image/download.png"
-                  />
-                  <div
-                    style="margin-left: 5px;color:#999;"
-                    @click="downloads(el.response.data)"
-                  >
-                    下载
-                  </div>
-                </div>
-                <div 
-                  v-else
-                  class="download">
-                  <img
-                    style="width: 16px; height: 15px"
-                    src="../../assets/image/download.png"
-                  />
-                  <div
-                    style="margin-left: 5px"
-                    @click="download(el.response.data)"
-                  >
-                    下载
-                  </div>
-                </div>
-              </div>
-              </div>
-            </el-tab-pane>
-            <el-tab-pane label="课程作业" name="second">
-              <div
-                v-if="data.planDto?.attach === '[]'"
-                style="
+                ">
+								此课程无附件
+							</div>
+							<div v-else>
+								<div v-for="(el, index) in JSON.parse(data.planDto?.attach)" :key="index" class="enclosure"
+									:style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }">
+									<div class="enclosureL">
+										<FileTypeImg v-model="el.name" :style="{
+											width: '22px',
+											height: '26px',
+											marginLeft: '10px',
+										}"></FileTypeImg>
+										<div style="margin-left: 20px">{{ el.name }}</div>
+									</div>
+									<div v-if="new Date(data.planDto.beginTime).getTime() > new Date().getTime()" class="download">
+										<img style="width: 16px; height: 15px" src="../../assets/image/download.png" />
+										<div style="margin-left: 5px;color:#999;" @click="downloads(el.response.data)">
+											下载
+										</div>
+									</div>
+									<div v-else class="download">
+										<img style="width: 16px; height: 15px" src="../../assets/image/download.png" />
+										<div style="margin-left: 5px" @click="download(el.response.data)">
+											下载
+										</div>
+									</div>
+								</div>
+							</div>
+						</el-tab-pane>
+						<el-tab-pane label="课程作业" name="second">
+							<div v-if="data.planDto?.attach === '[]'" style="
                   font-size: 14px;
                   font-weight: 400;
                   line-height: 24px;
@@ -367,6 +336,9 @@ function toSurvery() {
 		query: {
 			courseId: data.value.planDto.evaluateId,
 			pName: "面授课",
+			taskId: taskId,
+			taskIds: taskId,
+			chapterOrStageId: 0,
 			sName: data.value.planDto.name,
 			type: 3
 		},
diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue
index bdd06ba..8b91a81 100644
--- a/src/views/survey/SurveyDetail.vue
+++ b/src/views/survey/SurveyDetail.vue
@@ -25,20 +25,21 @@
               src="../../assets/image/next.png"
           />
         </div>-->
-        <div class="return">
+			<div class="return">
 				<div style="display: flex" @click="returnclick">
-          <el-button style="color:#0073FB">	<img class="img2" style="margin-right:11px;cursor: pointer;" src="../../assets/image/return.png" />返回</el-button>
+					<el-button style="color:#0073FB"> <img class="img2" style="margin-right:11px;cursor: pointer;"
+							src="../../assets/image/return.png" />返回</el-button>
 				</div>
 			</div>
-    </div>
-    <!-- 面包屑导航 -->
-    <!-- 标题 -->
-    <div class="title">【评估】{{data.assessmentName}}</div>
-    <!-- 标题 -->
-    <!-- 基本信息 -->
-    <div class="bascinfo">
-      <div>
-        <!-- {{ [data.assessmentEssayQuestionDtoList,data.assessmentMultipleChoiceDtoList,data.assessmentScoringQuestionDtoList,data.assessmentSingleChoiceDtoList].sort((a,b)=>{
+		</div>
+		<!-- 面包屑导航 -->
+		<!-- 标题 -->
+		<div class="title">【评估】{{ data.assessmentName }}</div>
+		<!-- 标题 -->
+		<!-- 基本信息 -->
+		<div class="bascinfo">
+			<div>
+				<!-- {{ [data.assessmentEssayQuestionDtoList,data.assessmentMultipleChoiceDtoList,data.assessmentScoringQuestionDtoList,data.assessmentSingleChoiceDtoList].sort((a,b)=>{
           return a[0].orderNumber - b[0].orderNumber
         }) }} -->
 
@@ -367,10 +368,10 @@ function submit() {
 	if (1 > 0) {
 		console.log(data)
 		console.log('我是提交的数据', {
-			targetId: taskId, // 项目、路径图或开课的Id
-			chapterOrStageId: chapterOrStageId, //  关卡或者阶段Id  关卡Id不允许为空
+			targetId: taskId ? taskId : taskIds ? taskIds : 0, // 项目、路径图或开课的Id
+			chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, //  关卡或者阶段Id  关卡Id不允许为空
 			assessmentId: courseId,
-			taskId,
+			taskId: taskId ? taskId : taskIds ? taskIds : 0,
 			type,
 			result: JSON.stringify(data.value),
 		})
@@ -419,12 +420,13 @@ function submit() {
 			return ElMessage.warning("您有未填写的评估题干");
 		}
 	}
+
 	data.value.isSubmit = !data.value.isSubmit;
 	request(ASSESSMENT_SUBMIT, {
-		targetId: taskId, // 项目、路径图或开课的Id
-		chapterOrStageId: chapterOrStageId, //  关卡或者阶段Id  关卡Id不允许为空
+		targetId: taskId ? taskId : taskIds ? taskIds : 0, // 项目、路径图或开课的Id
+		chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, //  关卡或者阶段Id  关卡Id不允许为空
 		assessmentId: courseId,
-		taskId,
+		taskId: taskId ? taskId : taskIds ? taskIds : 0,
 		type,
 		result: JSON.stringify(data.value),
 	}).then(() => {