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

src/components/drawers/AddTest.vue

@@ -119,6 +119,7 @@
                       class="tag-style"
                       v-if="paperName != ''"
                       :closable="true"
+                      @close="delTag"
                       >{{ paperName }}</a-tag
                     >
                     <!-- <a-tag
@@ -379,7 +380,7 @@
         </div>
         <div class="main_btns">
           <a-button class="btn1" @click="closeDrawer">取消</a-button>
-          <a-button class="btn2" html-type="submit">确定</a-button>
+          <a-button class="btn2" html-type="submit">确定</a-button> 
         </div>
       </a-form>
 
@@ -478,6 +479,7 @@ export default {
       showAnalysis: 2,
       showAnswers: 2,
       choosedTime: "",
+      paperName:"",
       choosedTest: [
         {
           key: 1,
@@ -499,6 +501,8 @@ export default {
       STvisible: false, //选择试卷抽屉
       paperId: null, //试卷id 子组件传过来给考试抽屉创建考试信息需要
       paperName: "", //试卷名称 子组件传过来给考试抽屉选择试卷后框框用
+      id:"",
+      testName:"",
       choosedTestList: [
         {
           value: "提高核心竞争力",
@@ -640,6 +644,10 @@ export default {
 
     const resetForm = () => {
       formRef.value.resetFields();
+      state.paperName = "";
+      state.paperId = null;
+      state.id = "";
+      state.testName = "";
     };
 
     const handleValidate = (...args) => {
@@ -666,6 +674,10 @@ export default {
       state.STvisible = true;
     };
 
+    const delTag = () => {
+      state.paperId = 0;
+      state.paperName = "";
+    };
     const queryTest = () => {
      // state.addLoading = true;
       queryExaminationDetailById({ examinationId: props.EditTestId })
@@ -682,6 +694,8 @@ export default {
           formState.scoringModel = Number(res.data.data.scoringModel) || 1;
           formState.showAnalysis = Number(res.data.data.showAnalysis) || 1;
           formState.showAnswers = Number(res.data.data.showAnswers) || 1;
+          formState.papaerName = res.data.data.examinationTestName;
+          state.paperName = res.data.data.examinationTestName;
           if (
             res.data.data.examinationEndTime &&
             res.data.data.examinationStartTime
@@ -700,7 +714,7 @@ export default {
         });
     };
     const updateTest = () => {
-      //state.addLoading = true;
+      //state.addLoading = true;updateTask
       let obj = {
         examinationDuration: formState.examinationDuration,
         examinationEndTime: dayjs(formState.choosedTime[1]).format(
@@ -720,6 +734,8 @@ export default {
         scoringModel: formState.scoringModel,
         showAnalysis: formState.showAnalysis,
         showAnswers: formState.showAnswers,
+        examinationTestId:state.id,
+        examinationTestName:state.testName,
       };
       if (props.edit) {
         // 编辑任务
@@ -746,10 +762,8 @@ export default {
 
     const updateTask = (res) => {
       state.EditTestId = res.data.data.examinationId;
-      console.log("state.EditTestId=====0",state.EditTestId,props.faceLevel);
       if(props.faceLevel){
         state.EditTestId = res.data.data.examinationId;
-        console.log("state.EditTestId=====",state.EditTestId);
       }else{
         if (props.isLevel == 1) {
         let editObj1 = {
@@ -790,7 +804,6 @@ export default {
             //message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);
           });
       } else if (props.isLevel == 3) {
-        console.log("");
         addTempTask({
           courseId: res.data.data.examinationId,
           duration: res.data.data.examinationDuration,
@@ -851,6 +864,8 @@ export default {
     const getData = (value) => {
       state.paperId = value.paperId;
       state.paperName = value.testName;
+      state.id =  value.id
+      state.testName = value.testName
     };
     return {
       formState,
@@ -867,6 +882,7 @@ export default {
       resetForm,
       handleValidate,
       formRef,
+      delTag,
       // layout,
       rules,
       updateTest,