From dd8c41baf9d01fc4b611062ecde3695e5bfaf78d Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Fri, 10 Mar 2023 19:32:13 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index f41741f..c167dc4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -38,7 +38,7 @@ import {useRoute} from "vue-router/dist/vue-router";
 import {USER_INFO} from "@/api/api";
 import {IsPhone} from "@/api/utils";
 
-console.log("版本1.4.6------------");
+console.log("版本1.4.7------------");
 const store = useStore();
 const { path } = useRoute();
 onMounted(() => {

From 155eb86dc531a8d4c561b50048ca21b86bfb7876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E8=BF=9B1?= <963286636@qq.com>
Date: Fri, 10 Mar 2023 23:14:46 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/faceteach/FaceTeachSignUp.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue
index b17b6d6..9a49da2 100644
--- a/src/views/faceteach/FaceTeachSignUp.vue
+++ b/src/views/faceteach/FaceTeachSignUp.vue
@@ -375,7 +375,8 @@ const handleClick = (tab, event) => {
 const fielPath = ref(import.meta.env.VITE_FILE_PATH);
 const download = (url) => {
   console.log('下载url',fielPath.value+url)
-  window.open(fielPath.value+url);
+  //window.open(fielPath.value+url);
+  window.open(url);
 };
 const downloads = (url) => {
   ElMessage.warning("未在有效时间范围内，请耐心等待！");

From a9b641302a0b8c1e043357da3b1f9698c143f719 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 13 Mar 2023 20:31:44 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix=20--=20=E8=AF=84=E4=BC=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/survey/SurveyDetail.vue | 894 ++++++++++++------------------
 1 file changed, 355 insertions(+), 539 deletions(-)

diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue
index 4c52b4f..2042d7a 100644
--- a/src/views/survey/SurveyDetail.vue
+++ b/src/views/survey/SurveyDetail.vue
@@ -1,15 +1,15 @@
 <template>
-	<div style=" background: #0078fc;height: 150px;width: 100%;position: absolute;top: 0;z-index:-9999;"></div>
-	<div class="surveydetail" style="padding: 30px">
-		<!-- 面包屑导航 -->
-		<div style="display: flex; align-items: center; justify-content: space-between">
-			<div class="crumb">
-				<div>{{ pName }}</div>
-				<div style="margin-left: 6px; margin-right: 6px">/</div>
-				<div>{{ sName }}</div>
-				<div v-if="sName" style="margin-left: 6px; margin-right: 6px">/</div>
-				<div style="font-weight: 700; font-size: 16px">评估详情</div>
-			</div>
+  <div style=" background: #0078fc;height: 150px;width: 100%;position: absolute;top: 0;z-index:-9999;"></div>
+  <div class="surveydetail" style="padding: 30px">
+    <!-- 面包屑导航 -->
+    <div style="display: flex; align-items: center; justify-content: space-between">
+      <div class="crumb">
+        <div>{{ pName }}</div>
+        <div style="margin-left: 6px; margin-right: 6px">/</div>
+        <div>{{ sName }}</div>
+        <div v-if="sName" style="margin-left: 6px; margin-right: 6px">/</div>
+        <div style="font-weight: 700; font-size: 16px">评估详情</div>
+      </div>
       <div class="preNext">
 		   <span @click="prevPage" v-if="hasPrev">
           <button class="btn btn01"></button>
@@ -20,39 +20,33 @@
           <button class="btn btn02" style="margin-left: 6px"></button>
         </span>
       </div>
-			<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>
-				</div>
-			</div>
-		</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
-        }) }} -->
-
-				<div class="question" v-for="(value, index) in  questionList " :key="index" :style="{ 'margin-top': index === 0 ? '57px' : '41px' }">
-					<div v-if="value.questionType == '4'">
-						<div class="question" :style="{ 'margin-top': index === 0 ? '57px' : '41px' }">
-							<div class="text">{{ value.assessmentScTitle }}</div>
-							<div class="answer">
-								<div class="answerL">完全没用</div>
-								<div class="answerC">
-									<!-- v-for="(item, key) in Array.from(
-											{ length: value.assessmentMaxScore },
-											(k, i) => i
-										)"  -->
-									<div class="answerCitem" 
-										v-for="(item, key) in orderArr(value.assessmentMinScore,value.assessmentMaxScore)" 
-										:key="key" 
-										:style="{
+      <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>
+        </div>
+      </div>
+    </div>
+    <!-- 面包屑导航 -->
+    <!-- 标题 -->
+    <div class="title">【评估】{{ data.assessmentName }}</div>
+    <!-- 标题 -->
+    <!-- 基本信息 -->
+    <div class="bascinfo">
+      <div>
+        <div class="question" v-for="(value, index) in  questionList " :key="index"
+             :style="{ 'margin-top': index === 0 ? '57px' : '41px' }">
+          <div v-if="value.questionType == '4'">
+            <div class="question" :style="{ 'margin-top': index === 0 ? '57px' : '41px' }">
+              <div class="text">{{ value.assessmentScTitle }}</div>
+              <div class="answer">
+                <div class="answerL">完全没用</div>
+                <div class="answerC">
+                  <div class="answerCitem"
+                       v-for="(item, key) in orderArr(value.assessmentMinScore,value.assessmentMaxScore)"
+                       :key="key"
+                       :style="{
 											'margin-left': key === 0 ? '15px' : '10px',
 											background:
 												value.selectAnswer === item
@@ -62,8 +56,8 @@
 												value.selectAnswer === item
 													? '#fff'
 													: 'rgba(86, 163, 249, 1)',
-										}" 
-										@click="
+										}"
+                       @click="
 											() => {
 												if (data.isSubmit) {
 													return;
@@ -71,579 +65,401 @@
 												value.selectAnswer = item;
 											}
 										">
-										<div>{{ item + 1 }}</div>
-									</div>
-								</div>
-								<div class="answerR">非常有帮助/启发</div>
-							</div>
-						</div>
-					</div>
+                    <div>{{ item + 1 }}</div>
+                  </div>
+                </div>
+                <div class="answerR">非常有帮助/启发</div>
+              </div>
+            </div>
+          </div>
 
-					<div v-else-if="value.questionType == '1'">
-						<div class="question" style="margin-top: 41px">
-							<div class="text">
-								{{ value?.singleStemName }}
-							</div>
-							<!-- 需要遍历的选项 -->
-							<div style="display:flex;justify-content:flex-start;align-items:center;margin-top: 24px;">
-								<div 
-									v-for="(values, indexs) in value.assessmentSingleChoiceVoList" 
-									:key="indexs"
-									style="display: flex; align-items: center;cursor: pointer;flex-direction: column;" 
-									@click="
+          <div v-else-if="value.questionType == '1'">
+            <div class="question" style="margin-top: 41px">
+              <div class="text">
+                {{ value?.singleStemName }}
+              </div>
+              <!-- 需要遍历的选项 -->
+              <div style="display:flex;justify-content:flex-start;align-items:center;margin-top: 24px;">
+                <div
+                  v-for="(values, indexs) in value.assessmentSingleChoiceVoList"
+                  :key="indexs"
+                  style="display: flex; align-items: center;cursor: pointer;flex-direction: column;"
+                  @click="
 										() => {
 											if (data.isSubmit) {
 												return;
 											}
-											value.assessmentSingleChoiceVoList.forEach((e) => {
-												e.select = false;
-											});
-											values.select = true;}
+											value.assessmentSingleChoiceVoList.forEach((e) => e.select = false);
+											values.select = true;
+                    }
 									">
-									<div style="display:flex">
-										<img style="width: 19px; height: 18px; cursor: pointer" :src="values.select ? checkbox : checkbox2" />
-										<div class="people">{{ values.singleOptionName }}</div>
-									</div>
-									<img v-if="values.singleOptionPictureAddress" style="width: 140px; height: 140px; border-radius: 8px;margin-left: 130px;margin-top: 12px;" :src="values.singleOptionPictureAddress ? fielPath + values.singleOptionPictureAddress : ''" />
-									<div v-else style="width: 140px;height: 140px;"></div>
-								</div>
-							</div>
-						</div>
-					</div>
+                  <div style="display:flex">
+                    <img style="width: 19px; height: 18px; cursor: pointer"
+                         :src="values.select ? checkbox : checkbox2"/>
+                    <div class="people">{{ values.singleOptionName }}</div>
+                  </div>
+                  <img v-if="values.singleOptionPictureAddress"
+                       style="width: 140px; height: 140px; border-radius: 8px;margin-left: 130px;margin-top: 12px;"
+                       :src="values.singleOptionPictureAddress ? fielPath + values.singleOptionPictureAddress : ''"/>
+                  <div v-else style="width: 140px;height: 140px;"></div>
+                </div>
+              </div>
+            </div>
+          </div>
 
-					<div v-else-if="value.questionType == '2'">
-						<div class="question" style="margin-top: 41px">
-							<div class="text">
-								{{ value?.multipleStemName }}
-							</div>
-							<!-- 需要遍历的选项 -->
-							<div style="display:flex;justify-content:flex-start;align-items:center;margin-top: 24px;">
-								<div 
-									v-for="(values, indexs) in value.multipleChoiceVoList" 
-									:key="indexs"
-									style="display: flex; align-items: center;cursor: pointer;flex-direction: column;" 
-									@click="
+          <div v-else-if="value.questionType == '2'">
+            <div class="question" style="margin-top: 41px">
+              <div class="text">
+                {{ value?.multipleStemName }}
+              </div>
+              <!-- 需要遍历的选项 -->
+              <div style="display:flex;justify-content:flex-start;align-items:center;margin-top: 24px;">
+                <div
+                  v-for="(values, indexs) in value.multipleChoiceVoList"
+                  :key="indexs"
+                  style="display: flex; align-items: center;cursor: pointer;flex-direction: column;"
+                  @click="
 									() => {
 										if (data.isSubmit) {
 											return;
 										}
 										values.select = !values.select;
 									}">
-									<div style="display:flex">
-										<img style="width: 19px; height: 18px; cursor: pointer" :src="values.select ? checkbox : checkbox2" />
-										<div class="people">{{ values.multipleOptionName }}</div>
-									</div>
-									<img v-if="values.multipleOptionPictureAddress" style="width: 140px; height: 140px; border-radius: 8px;margin-left: 130px;margin-top: 12px;" :src="values.multipleOptionPictureAddress ? fielPath + values.multipleOptionPictureAddress : ''" />
-									<div v-else style="width: 140px;height: 140px;"></div>
-								</div>
-							</div>
-						</div>
-					</div>
-
-					<div v-else-if="value.questionType == '3'">
-						<div class="question" style="margin-top: 41px">
-							<div class="text">{{ value.assessmentQaTitle }}</div>
-							<div style="width: 713px; margin-top: 31px; position: relative">
-								<el-input v-model="value.content" :autosize="{ minRows: 5, maxRows: 5 }" resize="none" maxlength="200"
-									type="textarea" :readonly="!!data.isSubmit" />
-								<div class="words">{{ value.content?.length || 0 }}/200</div>
-							</div>
-						</div>
-					</div>
-				</div>
-
-				<!-- <div
-          class="question"
-          v-for="(value, index) in data.assessmentScoringQuestionDtoList"
-          :key="index"
-          :style="{ 'margin-top': index === 0 ? '57px' : '41px' }"
-        >
-          <div class="text">{{ value.assessmentScTitle }}</div>
-          <div class="answer">
-            <div class="answerL">完全没用</div>
-            <div class="answerC">
-              <div
-                class="answerCitem"
-                v-for="(item, key) in Array.from(
-                  { length: value.assessmentMaxScore },
-                  (k, i) => i
-                )"
-                :key="key"
-                :style="{
-                  'margin-left': key === 0 ? '15px' : '10px',
-                  background:
-                    value.selectAnswer === item
-                      ? 'rgba(86, 163, 249, 1)'
-                      : 'rgba(86, 163, 249, 0)',
-                  color:
-                    value.selectAnswer === item
-                      ? '#fff'
-                      : 'rgba(86, 163, 249, 1)',
-                }"
-                @click="
-                  () => {
-                    if (data.isSubmit) {
-                      return;
-                    }
-                    value.selectAnswer = item;
-                  }
-                "
-              >
-                <div>{{ item + 1 }}</div>
+                  <div style="display:flex">
+                    <img style="width: 19px; height: 18px; cursor: pointer"
+                         :src="values.select ? checkbox : checkbox2"/>
+                    <div class="people">{{ values.multipleOptionName }}</div>
+                  </div>
+                  <img v-if="values.multipleOptionPictureAddress"
+                       style="width: 140px; height: 140px; border-radius: 8px;margin-left: 130px;margin-top: 12px;"
+                       :src="values.multipleOptionPictureAddress ? fielPath + values.multipleOptionPictureAddress : ''"/>
+                  <div v-else style="width: 140px;height: 140px;"></div>
+                </div>
               </div>
             </div>
-            <div class="answerR">非常有帮助/启发</div>
           </div>
-        </div>
-        
-        <div
-          class="question"
-          style="margin-top: 41px"
-          v-if="
-            data.assessmentSingleChoiceDtoList &&
-            data.assessmentSingleChoiceDtoList.length
-          "
-        >
-          <div class="text">
-            {{ data.assessmentSingleChoiceDtoList[0]?.singleStemName }}
-          </div>
-          <div
-            v-for="(value, index) in data.assessmentSingleChoiceDtoList"
-            :key="index"
-            style="display: flex; align-items: center"
-            :style="{
-              'margin-top': index === 0 ? '29px' : '22px',
-              cursor: 'pointer',
-            }"
-            @click="
-              () => {
-                if (data.isSubmit) {
-                  return;
-                }
-                data.assessmentSingleChoiceDtoList.forEach((e) => {
-                  e.select = false;
-                });
-                value.select = true;
-              }
-            "
-          >
-            <img
-              style="width: 19px; height: 18px; cursor: pointer"
-              :src="value.select ? checkbox : checkbox2"
-            />
-            <div class="people">{{ value.singleOptionName }}</div>
-          </div>
-        </div>
 
-        <div
-          class="question"
-          style="margin-top: 41px"
-          v-if="
-            data.assessmentMultipleChoiceDtoList &&
-            data.assessmentMultipleChoiceDtoList.length
-          "
-        >
-          <div class="text">
-            {{ data.assessmentMultipleChoiceDtoList[0]?.multipleStemName }}
-          </div>
-          <div
-            v-for="(value, index) in data.assessmentMultipleChoiceDtoList"
-            :key="index"
-            style="display: flex; align-items: center"
-            :style="{
-              'margin-top': index === 0 ? '29px' : '22px',
-              cursor: 'pointer',
-            }"
-            @click="
-              () => {
-                if (data.isSubmit) {
-                  return;
-                }
-                value.select = !value.select;
-              }
-            "
-          >
-            <img
-              style="width: 19px; height: 18px; cursor: pointer"
-              :src="value.select ? checkbox : checkbox2"
-            />
-            <div class="people">{{ value.multipleOptionName }}</div>
+          <div v-else-if="value.questionType == '3'">
+            <div class="question" style="margin-top: 41px">
+              <div class="text">{{ value.assessmentQaTitle }}</div>
+              <div style="width: 713px; margin-top: 31px; position: relative">
+                <el-input v-model="value.content" :autosize="{ minRows: 5, maxRows: 5 }" resize="none" maxlength="200"
+                          type="textarea" :readonly="!!data.isSubmit"/>
+                <div class="words">{{ value.content?.length || 0 }}/200</div>
+              </div>
+            </div>
           </div>
         </div>
-        
-        <div
-          class="question"
-          style="margin-top: 41px"
-          v-for="(item, i) in data.assessmentEssayQuestionDtoList"
-          :key="i"
-        >
-          <div class="text">{{ item.assessmentQaTitle }}</div>
-          <div style="width: 713px; margin-top: 31px; position: relative">
-            <el-input
-              v-model="item.content"
-              :autosize="{ minRows: 5, maxRows: 5 }"
-              resize="none"
-              maxlength="200"
-              type="textarea"
-              :readonly="!!data.isSubmit"
-            />
-            <div class="words">{{ item.content?.length || 0 }}/200</div>
+        <div style="display: flex; justify-content: center" v-if="
+          data.essayQuestionVoList?.length ||
+          data.multipleStemVoList?.length ||
+          data.scoringQuestionVoList?.length ||
+          data.singleStemVoList?.length
+">
+          <div v-if="projectStatus && projectEndTime">
+            <div v-if="projectStatus !=='3' && new Date(projectEndTime).getTime() > new Date().getTime()" class="submit"
+                 @click="submit" :style="{ background: data.isSubmit ? '#999' : '#2478ff' }">
+              提交
+            </div>
           </div>
-        </div> -->
-				<div style="display: flex; justify-content: center" v-if="
-	data.essayQuestionVoList?.length ||
-	data.multipleStemVoList?.length ||
-	data.scoringQuestionVoList?.length ||
-	data.singleStemVoList?.length
-">					<div v-if="projectStatus && projectEndTime">
-						<div v-if="projectStatus !=='3' && new Date(projectEndTime).getTime() > new Date().getTime()" class="submit" @click="submit" :style="{ background: data.isSubmit ? '#999' : '#2478ff' }">
-							提交
-						</div>
-					</div>
-					<div v-else>
-						<div class="submit" @click="submit" :style="{ background: data.isSubmit ? '#999' : '#2478ff' }">
-							提交
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		<!-- 基本信息 -->
-		<!--    todo 测评页面 没有接口-->
-	</div>
-	<el-dialog v-model="centerDialogVisible" title="" width="20%" center :show-close="false" :align-center="true">
-		<div style="text-align: center;font-size:16px;"> <span style="color:black">
+          <div v-else>
+            <div class="submit" @click="submit" :style="{ background: data.isSubmit ? '#999' : '#2478ff' }">
+              提交
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 基本信息 -->
+  </div>
+  <el-dialog v-model="centerDialogVisible" title="" width="20%" center :show-close="false" :align-center="true">
+    <div style="text-align: center;font-size:16px;"> <span style="color:black">
 				提交成功
 			</span></div>
-		<template #footer>
+    <template #footer>
 			<span class="dialog-footer">
 				<el-button class="cancel"
-					style="color: #387DF7; border: 1px solid #387DF7;padding: 8px 32px; border-radius: 4px;"
-					@click="centerDialogVisible = false">取消</el-button>
+                   style="color: #387DF7; border: 1px solid #387DF7;padding: 8px 32px; border-radius: 4px;"
+                   @click="centerDialogVisible = false">取消</el-button>
 				<el-button class="back"
-					style="background: #387DF7;box-shadow: 1px 2px 15px 1px rgba(56,125,247,0.34);border: 0px;padding: 8px 32px;"
-					type="primary" @click="returnclick">
+                   style="background: #387DF7;box-shadow: 1px 2px 15px 1px rgba(56,125,247,0.34);border: 0px;padding: 8px 32px;"
+                   type="primary" @click="returnclick">
 					返回
 				</el-button>
 			</span>
-		</template>
-	</el-dialog>
+    </template>
+  </el-dialog>
 </template>
 <script setup>
 import checkbox from "@/assets/image/checkbox.png";
 import checkbox2 from "@/assets/image/checkbox2.png";
-import { useRoute, useRouter } from "vue-router/dist/vue-router";
-import { request, usePage, useRequest } from "@/api/request";
-import { ASSESSMENT_QUERY, ASSESSMENT_SUBMIT } from "@/api/api";
-import { ElMessage } from "element-plus";
-import { ref } from "vue";
+import {useRoute, useRouter} from "vue-router/dist/vue-router";
+import {request, usePage, useRequest} from "@/api/request";
+import {ASSESSMENT_QUERY, ASSESSMENT_SUBMIT} from "@/api/api";
+import {ElMessage} from "element-plus";
+import {ref, watch} from "vue";
 import dayjs from "dayjs";
 import {useTaskPage} from "@/api/useCommon";
 
 const {
-	query: { courseId, id: taskId, infoId, type, pName, sName, chapterOrStageId, projectStatus, projectEndTime },
+  query: { courseId, id: taskId, infoId, type, pName, sName, chapterOrStageId, projectStatus, projectEndTime },
 } = useRoute();
 const router = useRouter();
 const returnclick = () => {
-	clearInterval(timers)
-	router.back();
+  router.back();
 };
-const {nextPage,prevPage,hasPrev, hasNext} =  type==3 ||  type==4 ? '' : useTaskPage()
+const { nextPage, prevPage, hasPrev, hasNext } = type == 3 || type == 4 ? "" : useTaskPage();
 const fielPath = ref(import.meta.env.VITE_FILE_PATH);
-const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 });
-console.log(data)
-console.log('我是查询评估的参数', { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 })
-console.log('我是需要排序得题目', data)
+const { data } = useRequest(ASSESSMENT_QUERY(courseId), {
+  id: courseId,
+  type,
+  chapterOrStageId,
+  targetId: infoId ? infoId : 0
+});
 
 // 答题时间
-const answerTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
-
-console.log('录入首次进入页面时间', answerTime)
+const answerTime = dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss");
 
+console.log("录入首次进入页面时间", answerTime);
 
 // 数组去空对象
 function formateArr(datas) {
-	let allArr = []
-	for(let i=0;i<datas.length;i++){
-		for(let j=0;j<datas[i].length;j++){
-			allArr.push(datas[i][j])
-		}
-	}
-	let newarr = allArr.sort((a, b) => { return a.orderNumber - b.orderNumber})
-	console.log('我是排序后的题目', newarr)
-	return newarr
+  let allArr = [];
+  for (let i = 0; i < datas.length; i++) {
+    for (let j = 0; j < datas[i].length; j++) {
+      allArr.push(datas[i][j]);
+    }
+  }
+  let newarr = allArr.sort((a, b) => {
+    return a.orderNumber - b.orderNumber;
+  });
+  return newarr;
 }
 
-const questionList = ref([])
+const questionList = ref([]);
 
-const timers = setInterval(() => {
-	console.log(data)
-	console.log(data.value.id)
-	if(data.value.id){
-		clearInterval(timers)
-		console.log([data.value.essayQuestionVoList, data.value.multipleStemVoList, data.value.scoringQuestionVoList, data.value.singleStemVoList])
-		questionList.value = formateArr([data.value.essayQuestionVoList, data.value.multipleStemVoList, data.value.scoringQuestionVoList, data.value.singleStemVoList])
-	}
-}, 1000);
-
-setTimeout(() => {
-	clearInterval(timers);
-}, 30000);
+watch(data, ()=> {
+  if (data.value.id) {
+    questionList.value = formateArr([data.value.essayQuestionVoList, data.value.multipleStemVoList, data.value.scoringQuestionVoList, data.value.singleStemVoList]);
+  }
+});
 
 // 生成数组
-function orderArr(a,b) {
- let arrs = []
- for(let i=0;i<10;i++){
-	if((i+1)>=a && (i+1)<=b){
-		arrs.push(i)
-	}
- }
- return arrs;
+function orderArr(a, b) {
+  let arrs = [];
+  for (let i = 0; i < 10; i++) {
+    if ((i + 1) >= a && (i + 1) <= b) {
+      arrs.push(i);
+    }
+  }
+  return arrs;
 }
 
 const centerDialogVisible = ref(false);
 const open = () => {
-	centerDialogVisible.value = true
+  centerDialogVisible.value = true;
 };
+
 function submit() {
-	console.log('录入首次进入页面时间', answerTime)
-	if (1 > 0) {
-		console.log(data)
-		console.log('我是提交的数据', {
-			targetId: infoId ? infoId : 0, // 项目、路径图或开课的Id
-			chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, //  关卡或者阶段Id  关卡Id不允许为空
-			assessmentId: courseId,
-			taskId: taskId ? taskId : 0,
-			type,
-			result: JSON.stringify(data.value),
-		})
-	}
-	if (data.value.isSubmit) {
-		return;
-	}
-	console.log("data.value", data.value);
-	let list1 = data.value.assessmentEssayQuestionDtoList;
-	if (list1 && list1.length > 0) {
-		list1.forEach((item) => {
-			if (item && !item.content) {
+  console.log("录入首次进入页面时间", answerTime);
+  if (data.value.isSubmit) {
+    return;
+  }
+  if (data.value.singleStemVoList?.some(t=>t?.assessmentSingleChoiceVoList?.every(s => !s?.select))) {
+    return ElMessage.warning("您有未填写的单选评估题干");
+  }
+  if (data.value.multipleStemVoList?.some(t=>t?.multipleChoiceVoList?.every(s => !s?.select))) {
+    return ElMessage.warning("您有未填写的多选评估题干");
+  }
+  if (data.value.scoringQuestionVoList?.some(s => !s?.selectAnswer)) {
+    return ElMessage.warning("您有未填写的评分评估题干");
+  }
+  if (data.value.essayQuestionVoList?.some(s => !s?.content)) {
+    return ElMessage.warning("您有未填写的简答评估题干");
+  }
 
-				return ElMessage.warning("您有未填写的评估题干");
-			}
-		})
-	}
-	let list2 = data.value.assessmentScoringQuestionDtoList;
-	if (list2 && list2.length > 0) {
-		list2.forEach((item) => {
-			if (item && !item.selectAnswer) {
-
-				return ElMessage.warning("您有未填写的评估题干");
-			}
-		})
-	}
-	let list3 = data.value.assessmentSingleChoiceDtoList;
-	if (list3 && list3.length > 0) {
-		let flag = 0;
-		list3.forEach((item) => {
-			flag = flag + item.select ? 1 : 0;
-		})
-		if (flag == 0) {
-
-			return ElMessage.warning("您有未填写的评估题干");
-		}
-	}
-	let list4 = data.value.assessmentMultipleChoiceDtoList;
-	if (list4 && list4.length > 0) {
-		let flag = 0;
-		list4.forEach((item) => {
-			flag = flag + item.select ? 1 : 0;
-		})
-		if (flag == 0) {
-
-			return ElMessage.warning("您有未填写的评估题干");
-		}
-	}
-
-	data.value.isSubmit = !data.value.isSubmit;
-	request(ASSESSMENT_SUBMIT, {
-		targetId: infoId ? infoId : 0, // 项目、路径图或开课的Id
-		chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, //  关卡或者阶段Id  关卡Id不允许为空
-		assessmentId: courseId,
-		taskId: taskId ? taskId : 0,
-		type,
-		result: JSON.stringify(data.value),
-		beginTime: answerTime
-	}).then(() => {
-		open();
-	});
+  data.value.isSubmit = !data.value.isSubmit;
+  request(ASSESSMENT_SUBMIT, {
+    targetId: infoId ? infoId : 0, // 项目、路径图或开课的Id
+    chapterOrStageId: chapterOrStageId ? chapterOrStageId : 0, //  关卡或者阶段Id  关卡Id不允许为空
+    assessmentId: courseId,
+    taskId: taskId ? taskId : 0,
+    type,
+    result: JSON.stringify(data.value),
+    beginTime: answerTime
+  }).then(() => {
+    open();
+  });
 
 }
 </script>
 <style lang="scss">
 .preNext {
+  position: absolute;
+  right: 0px;
+
+  .content {
+    font-size: 14px;
+    color: #fff;
+    width: 43px;
+    height: 14px;
+    display: inline-block;
+    position: relative;
+    top: -6px;
+    cursor: pointer;
+  }
+
+  .btn {
+    width: 23px;
+    height: 23px;
+    border-radius: 50%;
+    border: 0;
+    cursor: pointer;
+  }
+
+  .btn01 {
+    background-image: url("../../assets/image/prev.png");
+  }
+
+  .btn02 {
+    background-image: url("../../assets/image/next.png");
+  }
+}
+
+.surveydetail {
+  .crumb {
+    color: #fff;
+    display: flex;
+    font-size: 14px;
+    line-height: 24px;
+  }
+
+  .return {
     position: absolute;
-    right: 0px;
+    right: 10%;
 
-    .content {
-      font-size: 14px;
-      color: #fff;
-      width: 43px;
-      height: 14px;
-      display: inline-block;
-      position: relative;
-      top: -6px;
-      cursor: pointer;
-    }
-
-    .btn {
-      width: 23px;
-      height: 23px;
-      border-radius: 50%;
-      border: 0;
-      cursor: pointer;
-    }
-
-    .btn01 {
-      background-image: url("../../assets/image/prev.png");
-    }
-
-    .btn02 {
-      background-image: url("../../assets/image/next.png");
+    .text {
+      text-align: center;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
     }
   }
-.surveydetail {
-	.crumb {
-		color: #fff;
-		display: flex;
-		font-size: 14px;
-		line-height: 24px;
-	}
 
-	.return {
-		position: absolute;
-		right: 10%;
+  .prevnext {
+    display: flex;
+    align-items: center;
+    font-size: 14px;
+    font-weight: 500;
+    color: #ffffff;
 
-		.text {
-			text-align: center;
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-		}
-	}
+    .prev {
+      display: flex;
+      align-items: center;
+      cursor: pointer;
+    }
+  }
 
-	.prevnext {
-		display: flex;
-		align-items: center;
-		font-size: 14px;
-		font-weight: 500;
-		color: #ffffff;
+  .title {
+    font-size: 20px;
+    font-weight: 800;
+    color: #ffffff;
+    line-height: 24px;
+    margin-top: 17px;
+    margin-left: -11px;
+  }
 
-		.prev {
-			display: flex;
-			align-items: center;
-			cursor: pointer;
-		}
-	}
+  .bascinfo {
+    width: 100%;
+    min-height: 1032px;
+    margin-top: 24px;
+    background: #ffffff;
+    border-radius: 8px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
 
-	.title {
-		font-size: 20px;
-		font-weight: 800;
-		color: #ffffff;
-		line-height: 24px;
-		margin-top: 17px;
-		margin-left: -11px;
-	}
+    .question .text {
+      font-size: 16px;
+      font-weight: 500;
+      color: #333330;
+    }
 
-	.bascinfo {
-		width: 100%;
-		min-height: 1032px;
-		margin-top: 24px;
-		background: #ffffff;
-		border-radius: 8px;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
+    .question .answer {
+      margin-top: 30px;
+      display: flex;
+      align-items: center;
+      font-size: 14px;
+      font-weight: 500;
+      color: #56a3f9;
+    }
 
-		.question .text {
-			font-size: 16px;
-			font-weight: 500;
-			color: #333330;
-		}
+    .question .answer .answerC {
+      width: 540px;
+      height: 73px;
+      border: 1px solid #d7e5fd;
+      border-radius: 8px;
+      display: flex;
+      align-items: center;
+      margin-left: 11px;
+      margin-right: 11px;
 
-		.question .answer {
-			margin-top: 30px;
-			display: flex;
-			align-items: center;
-			font-size: 14px;
-			font-weight: 500;
-			color: #56a3f9;
-		}
+      // justify-content: center;
+      .answerCitem {
+        width: 40px;
+        height: 40px;
+        border: 1px solid #56a3f9;
+        border-radius: 8px;
+        font-size: 14px;
+        font-weight: 400;
+        color: #ffffff;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-left: 10px;
+        cursor: pointer;
+      }
+    }
 
-		.question .answer .answerC {
-			width: 540px;
-			height: 73px;
-			border: 1px solid #d7e5fd;
-			border-radius: 8px;
-			display: flex;
-			align-items: center;
-			margin-left: 11px;
-			margin-right: 11px;
+    .question .people {
+      font-size: 14px;
+      font-weight: 500;
+      color: #333330;
+      margin-left: 15px;
+    }
 
-			// justify-content: center;
-			.answerCitem {
-				width: 40px;
-				height: 40px;
-				border: 1px solid #56a3f9;
-				border-radius: 8px;
-				font-size: 14px;
-				font-weight: 400;
-				color: #ffffff;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				margin-left: 10px;
-				cursor: pointer;
-			}
-		}
+    .question .words {
+      position: absolute;
+      right: 15px;
+      bottom: 5px;
+      font-size: 14px;
+      font-weight: 500;
+      color: #333330;
+    }
 
-		.question .people {
-			font-size: 14px;
-			font-weight: 500;
-			color: #333330;
-			margin-left: 15px;
-		}
+    .question .el-textarea__inner {
+      border-radius: 8px;
+      background-color: rgba(245, 246, 247, 1);
+    }
 
-		.question .words {
-			position: absolute;
-			right: 15px;
-			bottom: 5px;
-			font-size: 14px;
-			font-weight: 500;
-			color: #333330;
-		}
-
-		.question .el-textarea__inner {
-			border-radius: 8px;
-			background-color: rgba(245, 246, 247, 1);
-		}
-
-		.submit {
-			width: 126px;
-			height: 46px;
-			background: #2478ff;
-			box-shadow: 0px 1px 8px 0px rgba(56, 125, 247, 0.7);
-			border-radius: 4px;
-			font-size: 16px;
-			font-weight: 800;
-			color: #ffffff;
-			line-height: 24px;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			cursor: pointer;
-			margin-top: 39px;
-			margin-bottom: 30px;
-		}
-	}
+    .submit {
+      width: 126px;
+      height: 46px;
+      background: #2478ff;
+      box-shadow: 0px 1px 8px 0px rgba(56, 125, 247, 0.7);
+      border-radius: 4px;
+      font-size: 16px;
+      font-weight: 800;
+      color: #ffffff;
+      line-height: 24px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      cursor: pointer;
+      margin-top: 39px;
+      margin-bottom: 30px;
+    }
+  }
 }
 </style>