Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

src/components/drawers/AddTest.vue

@@ -115,26 +115,20 @@
                       </a-menu>
                     </template>
                   </a-dropdown> -->
-                  <span style="margin-left: 10px">
-                    <a-tag
-                      class="tag-style"
-                      v-if="paperName != ''"
-                      :closable="true"
-                      @close="delTag"
-                      >{{ paperName }}</a-tag
-                    >
-                    <!-- <a-tag
-                      class="tag-style"
-                      v-for="item in choosedTestList"
-                      :closable="true"
-                      @close="closeTag(item.key)"
-                      :key="item.key"
-                      >{{ item.value }}</a-tag
-                    > -->
-                  </span>
+                
+                <a-tag  v-if="paperName != ''" closable color="processing" @close="delTag">
+                  <span style="font-size:14px;line-height: 33px;">删除考试</span>
+                </a-tag>
+             
+          
                 </a-form-item>
               </div>
             </div>
+
+
+
+
+
             <div class="main_item">
               <div class="btnbox">
                 <a-form-item has-feedback label="考试时间" name="choosedTime">
@@ -525,6 +519,7 @@ export default {
         return Promise.reject("请选择时间");
       }
     };
+    
     let checkExaminationDuration = async (_rule, value) => {
       if (!value) {
         return Promise.reject("请输入考试时长");
@@ -674,7 +669,7 @@ export default {
       state.paperName = "";
     };
     const queryTest = () => {
-      state.addLoading = true;
+     // state.addLoading = true;
       queryExaminationDetailById({ examinationId: props.EditTestId })
         .then((res) => {
           formState.examinationName = res.data.data.examinationName;
@@ -729,9 +724,13 @@ export default {
         scoringModel: formState.scoringModel,
         showAnalysis: formState.showAnalysis,
         showAnswers: formState.showAnswers,
-        examinationTestId: state.id,
-        examinationTestName: state.testName,
+        examinationTestId: state.paperId,
+        examinationTestName: state.paperName,
       };
+      if(!(state.paperId >0)){
+        message.destroy();
+        return message.error("请选择考试");
+      }
       if (props.edit) {
         // 编辑任务
         updateExamination(obj)
@@ -740,6 +739,7 @@ export default {
             closeDrawer();
           })
           .catch(() => {
+            message.destroy();
             message.error(`编辑失败`);
           });
       } else {
@@ -750,6 +750,7 @@ export default {
             closeDrawer();
           })
           .catch(() => {
+            message.destroy();
             message.error(`创建失败`);
           });
       }
@@ -860,6 +861,7 @@ export default {
       state.id = value.id;
       state.testName = value.testName;
     };
+
     return {
       formState,
       afterVisibleChange,
@@ -885,6 +887,7 @@ export default {
       chooseTest,
       closeTag,
       getData,
+    
       ...toRefs(state),
     };
   },