From f0a4fdadba996566f507f40e0cd81587e2b1bc66 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Wed, 22 Mar 2023 21:39:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E4=BA=8C=E6=AC=A1=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/survey/SurveyDetail.vue | 49 ++++++++++++++++++++++++-------
 1 file changed, 38 insertions(+), 11 deletions(-)

diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue
index 2042d7a..f2ec8e3 100644
--- a/src/views/survey/SurveyDetail.vue
+++ b/src/views/survey/SurveyDetail.vue
@@ -158,12 +158,12 @@
 ">
           <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' }">
+                 @click="emptyValuePromp" :style="{ background: data.isSubmit ? '#999' : '#2478ff' }">
               提交
             </div>
           </div>
           <div v-else>
-            <div class="submit" @click="submit" :style="{ background: data.isSubmit ? '#999' : '#2478ff' }">
+            <div class="submit" @click="emptyValuePromp" :style="{ background: data.isSubmit ? '#999' : '#2478ff' }">
               提交
             </div>
           </div>
@@ -189,6 +189,24 @@
 			</span>
     </template>
   </el-dialog>
+  <!-- 提示用户有未填选项 -->
+  <el-dialog v-model="isEmptyValue" 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>
+			<span class="dialog-footer">
+				<el-button class="cancel"
+                   style="color: #387DF7; border: 1px solid #387DF7;padding: 8px 32px; border-radius: 4px;"
+                   @click="isEmptyValue = 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="submit">
+					确定
+				</el-button>
+			</span>
+    </template>
+  </el-dialog>
 </template>
 <script setup>
 import checkbox from "@/assets/image/checkbox.png";
@@ -260,24 +278,32 @@ const open = () => {
   centerDialogVisible.value = true;
 };
 
-function submit() {
-  console.log("录入首次进入页面时间", answerTime);
-  if (data.value.isSubmit) {
-    return;
-  }
+
+const isEmptyValue = ref(false);
+function emptyValuePromp() {
   if (data.value.singleStemVoList?.some(t=>t?.assessmentSingleChoiceVoList?.every(s => !s?.select))) {
-    return ElMessage.warning("您有未填写的单选评估题干");
+    isEmptyValue.value = true;
+    // return ElMessage.warning("您有未填写的单选评估题干");
   }
   if (data.value.multipleStemVoList?.some(t=>t?.multipleChoiceVoList?.every(s => !s?.select))) {
-    return ElMessage.warning("您有未填写的多选评估题干");
+    isEmptyValue.value = true;
+    // return ElMessage.warning("您有未填写的多选评估题干");
   }
   if (data.value.scoringQuestionVoList?.some(s => !s?.selectAnswer)) {
-    return ElMessage.warning("您有未填写的评分评估题干");
+    isEmptyValue.value = true;
+    // return ElMessage.warning("您有未填写的评分评估题干");
   }
   if (data.value.essayQuestionVoList?.some(s => !s?.content)) {
-    return ElMessage.warning("您有未填写的简答评估题干");
+    isEmptyValue.value = true;
+    // return ElMessage.warning("您有未填写的简答评估题干");
   }
+  if(!isEmptyValue.value){
+    submit()
+  }
+}
 
+function submit() {
+  console.log("录入首次进入页面时间", answerTime);
   data.value.isSubmit = !data.value.isSubmit;
   request(ASSESSMENT_SUBMIT, {
     targetId: infoId ? infoId : 0, // 项目、路径图或开课的Id
@@ -288,6 +314,7 @@ function submit() {
     result: JSON.stringify(data.value),
     beginTime: answerTime
   }).then(() => {
+    isEmptyValue.value = false;
     open();
   });