From a0f387f1f6d624b94522980244d2d184b3b796ca Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 7 Nov 2023 13:53:34 +0800
Subject: [PATCH] fix

---
 src/components/TestPanel.vue | 44 ++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/components/TestPanel.vue b/src/components/TestPanel.vue
index 6b7f47a..b4e446b 100644
--- a/src/components/TestPanel.vue
+++ b/src/components/TestPanel.vue
@@ -106,12 +106,15 @@
             </div>
             <div class="goal">
               <div v-if="pd.experimentTargetType == 0 || !pd.experimentTargetType"
-                   class="ql-editor"
-                   v-html="pd.experimentTarget"></div>
+                   class="ql-snow">
+                <div class="ql-editor"
+                     v-html="pd.experimentTarget"></div>
+              </div>
 
               <mavon-editor v-else
                             class="md"
                             v-model="pd.experimentTarget"
+                            defaultOpen="preview"
                             :ishljs="true"
                             :subfield="false"
                             :editable="false"
@@ -179,13 +182,15 @@
             <el-tab-pane label="项目背景"
                          name="first">
               <div v-if="pd.experimentDescriptionType == 0 || !pd.experimentDescriptionType"
-                   class="ql-editor"
-                   v-html="pd.experimentDescription"></div>
+                   class="ql-snow">
+                <div class="ql-editor"
+                     v-html="pd.experimentDescription"></div>
+              </div>
 
               <mavon-editor v-else
                             class="md"
                             v-model="pd.experimentDescription"
-                            :ishljs="true"
+                            defaultOpen="preview"
                             :subfield="false"
                             :editable="false"
                             :toolbarsFlag="false"
@@ -203,12 +208,15 @@
                          v-html="item.name"></div>
                   </template>
                   <div v-if="item.experimentalRequirementsType == 0 || !item.experimentalRequirementsType"
-                       class="ql-editor"
-                       v-html="item.experimentalRequirements"></div>
+                       class="ql-snow">
+                    <div class="ql-editor"
+                         v-html="item.experimentalRequirements"></div>
+                  </div>
 
                   <mavon-editor v-else
                                 class="md"
                                 v-model="item.experimentalRequirements"
+                                defaultOpen="preview"
                                 :ishljs="true"
                                 :subfield="false"
                                 :editable="false"
@@ -221,12 +229,15 @@
                          name="third"
                          v-if="hintOpen">
               <div v-if="pd.experimentHintType == 0 || !pd.experimentHintType"
-                   class="ql-editor"
-                   v-html="pd.experimentHint"></div>
+                   class="ql-snow">
+                <div class="ql-editor"
+                     v-html="pd.experimentHint"></div>
+              </div>
 
               <mavon-editor v-else
                             class="md"
                             v-model="pd.experimentHint"
+                            defaultOpen="preview"
                             :ishljs="true"
                             :subfield="false"
                             :editable="false"
@@ -777,8 +788,15 @@ export default {
       const { taskList } = this
       const pointList = this.$parent.workbench
       let msg = '此操作将视为结束考试，是否继续？'
-      if (!isVscode && pointList.find(e => !e.codeId && e.code)) msg = '有代码没有运行，该代码将不得分，确定提交？'
-      if (isVscode && !taskList.find(e => e.code || e.codeResult)) msg = '实验报告未填写，实验成绩为零，是否确认提交？'
+      if (!isVscode) {
+        // 先判断是否有输了代码没有跑的情况，如果有，弹出该提示；
+        if (pointList.find(e => !e.codeId && e.code)) msg = '有代码没有运行，该代码将不得分，确定提交？'
+        // 再判断每个任务下是否有没有输代码的情况，如果有，弹出该提示
+        if (pointList.find(e => !e.codeId && !e.code)) msg = '任务未完成，是否直接提交？'
+      } else {
+        if (!taskList.find(e => e.code || e.codeResult)) msg = '实验报告未填写，实验成绩为零，是否确认提交？'
+      }
+
       this.$confirm(msg, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -1060,7 +1078,6 @@ export default {
   padding: 0;
   font-size: 16px;
   margin: 0px 20px 10px 10px;
-  white-space: pre-wrap;
   overflow: hidden;
 }
 .panel-header {
@@ -1112,6 +1129,9 @@ export default {
     max-width: 100%;
   }
 }
+/deep/.ql-editor {
+  font-size: 13px;
+}
 /deep/.el-collapse-item__wrap {
   border-bottom: none;
 }