From f2647bf11f1b81b3dfa06469397ebf4317fdc198 Mon Sep 17 00:00:00 2001
From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com>
Date: Tue, 29 Nov 2022 23:12:48 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E3=80=81=E6=B7=BB=E5=8A=A0=E8=80=83=E8=AF=95=E3=80=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A1=88=E4=BE=8B=E3=80=81=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=84=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexExam.js                  |  4 +-
 src/components/drawers/AddCase.vue    | 24 +----------
 src/components/drawers/AddOnline.vue  | 18 +--------
 src/components/drawers/AddTest.vue    | 31 ++++++++++++--
 src/components/drawers/EvList.vue     | 27 ++-----------
 src/components/drawers/SelectTest.vue | 58 +++++++++++++++------------
 6 files changed, 68 insertions(+), 94 deletions(-)

diff --git a/src/api/indexExam.js b/src/api/indexExam.js
index b38ba155..9f3bdbeb 100644
--- a/src/api/indexExam.js
+++ b/src/api/indexExam.js
@@ -20,4 +20,6 @@ export const queryExaminationList = (obj) => http.post('/examination/queryExamin
 // 获取考试任务列表的接口-三方
 export const queryExaminationAloneExtendList = (obj) => http.post('/examination/queryExaminationAloneExtendList', obj);
 // 对接三方考试任务保存接口-三方
-export const examinationTaskSave = (obj) => http.post('/examination/examinationTaskSave', obj);
\ No newline at end of file
+export const examinationTaskSave = (obj) => http.post('/examination/examinationTaskSave', obj);
+//编辑考试信息
+export const updateExamination = (obj) => http.post('/examination/updateExamination', obj);
\ No newline at end of file
diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index 603ffe64..8b863d64 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -160,7 +160,6 @@ export default {
       currentPage: 1,
       tableDataTotal: 0,
       pageSize: 10,
-      searching:false,
       selectedRowKeys: [],
       apiTaskList: [],
       inputV1: "",
@@ -222,23 +221,6 @@ export default {
     const getTableDate = (tableData) => {
       let data = tableData;
       let array = [];
-      if(state.searching){
-        data.map((value, index) => {
-        let obj = {
-          key: index,
-          authorId: value.authorId,
-          authorName: value.authorName,
-          companyId: value.companyId,
-          coverUrl: value.coverUrl,
-          id: value.id,
-          casesId: value.casesId,
-          title: value.title,
-        };
-        if(obj.title == state.inputV1){
-          array.push(obj);
-        }
-      });
-      } else {
         data.map((value, index) => {
         let obj = {
           key: index,
@@ -252,7 +234,6 @@ export default {
         };
         array.push(obj);
       });
-      }
       state.tableData = array;
     };
     //获取全部案例信息接口
@@ -264,7 +245,7 @@ export default {
           orderField: "",
           pageIndex: state.currentPage,
           pageSize: state.pageSize,
-          top: true,
+          isTop: "",
         })
         .then((res) => {
           if (res.status === 200) {
@@ -349,17 +330,14 @@ export default {
     //搜索案例列表
     const searchList = ()=> {
       if(state.inputV1 !== ''){
-        state.searching = true
         getAllCaseText()
       }else {
-        state.searching = false
         resetCase()
       }
     }
     //重置案例信息
     const resetCase = () => {
       state.inputV1 = ""
-      state.searching = false
       state.selectedRowKeys=[]
       state.currentPage = 1
       getAllCaseText();
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index 0c372be7..a7ee93a1 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -198,7 +198,6 @@ export default {
       time: undefined,
       onlineClassesId: null,
       onlineName: "",
-      searching:false,
       selectV: "",
       selectedRowKeys: [],
       tableData: [],
@@ -286,20 +285,7 @@ export default {
       let data = tableData;
       let array = [];
       data.map((value,index) => {
-        if(state.searching){
-          let obj = {
-            key: index + 1,
-            num:"", 
-            name:value.name,
-            contenttype:value.contentType == 10 ? "微课" : "录播课",
-            teacher:value.teacher,
-            sysCreateBy:value.sysCreateBy,
-            overtime:"",
-          };
-          if(obj.name == state.inputV1 || obj.contenttype == state.selectV){
-            array.push(obj);
-          }
-        } else {
+        {
           let obj = {
             key: index + 1,
             num:"", 
@@ -415,7 +401,6 @@ export default {
     //搜索在线列表
     const searchList = ()=> {
       if(state.inputV1 !== '' || state.selectV !== ''){
-        state.searching = true
         getAllOnlineText()
       }else {
         resetOnline()
@@ -425,7 +410,6 @@ export default {
     const resetOnline = () => {
       state.inputV1 = "";
       state.selectV = "";
-      state.searching = false;
       state.selectedRowKeys = [];
       state.addOnlineList = [];
       state.currentPage = 1;
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index f4276b2f..268fed91 100644
--- a/src/components/drawers/AddTest.vue
+++ b/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: "提高核心竞争力",
@@ -643,12 +647,17 @@ export default {
       updateTest();
     };
 
-    const handleFinishFailed = () => {
+    const handleFinishFailed = (err) => {
+      console.log(err,'a');
       message.error("handleFinishFailed");
     };
 
     const resetForm = () => {
       formRef.value.resetFields();
+      state.paperName = "";
+      state.paperId = null;
+      state.id = "";
+      state.testName = "";
     };
 
     const handleValidate = (...args) => {
@@ -675,10 +684,15 @@ export default {
       state.STvisible = true;
     };
 
+    const delTag = () => {
+      state.paperId = 0;
+      state.paperName = "";
+    };
     const queryTest = () => {
      // state.addLoading = true;
       queryExaminationDetailById({ examinationId: props.EditTestId })
         .then((res) => {
+          console.log('----------------------',res);
           formState.examinationName = res.data.data.examinationName;
           formState.workRequirement = res.data.data.workRequirement;
           formState.examinationDuration = res.data.data.examinationDuration;
@@ -691,6 +705,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
@@ -703,13 +719,15 @@ export default {
           } else {
             formState.choosedTime = [];
           }
+          console.log('formState.testName',formState.testName);
+          console.log('state.testName',state.testName);
         })
         .catch(() => {
           message.error(`查询失败`);
         });
     };
     const updateTest = () => {
-      //state.addLoading = true;
+      //state.addLoading = true;updateTask
       let obj = {
         examinationDuration: formState.examinationDuration,
         examinationEndTime: dayjs(formState.choosedTime[1]).format(
@@ -729,7 +747,11 @@ export default {
         scoringModel: formState.scoringModel,
         showAnalysis: formState.showAnalysis,
         showAnswers: formState.showAnswers,
+        examinationTestId:state.id,
+        examinationTestName:state.testName,
       };
+      console.log('obj___________________________',obj);
+      console.log('props.edit',props.edit);
       if (props.edit) {
         // 编辑任务
         updateExamination(obj)
@@ -864,6 +886,8 @@ export default {
     const getData = (value) => {
       state.paperId = value.paperId;
       state.paperName = value.testName;
+      state.id =  value.id
+      state.testName = value.testName
     };
     return {
       formState,
@@ -880,6 +904,7 @@ export default {
       resetForm,
       handleValidate,
       formRef,
+      delTag,
       // layout,
       rules,
       updateTest,
diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue
index 8685cc1d..e93ff052 100644
--- a/src/components/drawers/EvList.vue
+++ b/src/components/drawers/EvList.vue
@@ -97,7 +97,6 @@ import { reactive, toRefs } from "vue";
         tableDataTotal: 0,
         pageSize: 10,
         inputV1:"",
-        searching:false,
         evaluationTypeId:null,
         evaluationTypeName:"",
         tableData: [],
@@ -160,11 +159,10 @@ import { reactive, toRefs } from "vue";
       state.evListData = selectedRows[0] ? selectedRows[0] : {}
     }
     const closeDrawer = () => {
-      ctx.emit("update:EvalListVisible", false);
       state.selectedRowKeys = []
       state.evListData = {}
       state.inputV1 = ""
-      state.searching = false
+      ctx.emit("update:EvalListVisible", false);
     };
     const afterVisibleChange = (bol) => {
       if ( bol == true ) {
@@ -177,6 +175,7 @@ import { reactive, toRefs } from "vue";
     }
     const changePagination = (page) => {
       state.currentPage = page;
+      getAllEvalText();
     };
     //如果编辑情况会通过父亲传回来evaluationTypeId遍历出相同的那个选项 再将那个选项的key值赋给state.selectRowKeys
     const getTableDataList = (tableData) => {
@@ -202,24 +201,6 @@ import { reactive, toRefs } from "vue";
       });
       state.tableData = array;
       state.selectedRowKeys = arrayKey;
-      }else if (state.searching){
-        data.map((value,index) => {
-        let obj = {
-          key:index+1,
-          status:value.status,
-          quiz_code:value.quiz_code,
-          quiz_kid:value.quiz_kid,
-          title:value.title,
-          theme_desc:value.theme_desc,
-          quiz_price:value.quiz_price,
-          quiz_range:value.quiz_range,
-        };
-        if(state.inputV1 == obj.title)
-        {
-          array.push(obj);
-        }
-      });
-      state.tableData = array;
       }
       else{
         data.map((value,index) => {
@@ -242,7 +223,7 @@ import { reactive, toRefs } from "vue";
     //获取测评列表
     const getAllEvalText = ()=> {
       let objael = {
-        "keyword": "",
+        "keyword": state.inputV1,
         "user_id": "965341999643234304",
       }
       api
@@ -256,10 +237,8 @@ import { reactive, toRefs } from "vue";
     //搜索测评列表
     const searchList = ()=> {
       if(state.inputV1 !== ''){
-        state.searching = true
         getAllEvalText()
       }else {
-        state.searching = false
         resetData()
       }
     }
diff --git a/src/components/drawers/SelectTest.vue b/src/components/drawers/SelectTest.vue
index f45a6c8c..44a871be 100644
--- a/src/components/drawers/SelectTest.vue
+++ b/src/components/drawers/SelectTest.vue
@@ -23,17 +23,18 @@
               <a-input
                 v-model:value="inputPname"
                 style="width: 270px; height: 40px; border-radius: 8px"
-                placeholder="请输入试卷名称或序号"
+                placeholder="请输入试卷名称"
               />
             </div>
-            <div class="namecon" style="margin-right: 30px">
+            <!-- 因为接口不支持创建人搜索，所以暂时注调 -->
+            <!-- <div class="namecon" style="margin-right: 30px">
               <div class="name">创建人：</div>
               <a-input
                 v-model:value="inputCname"
                 style="width: 240px; height: 40px; border-radius: 8px"
                 placeholder="请输入创建人"
               />
-            </div>
+            </div> -->
           </div>
           <div class="btns">
             <div
@@ -72,6 +73,7 @@
           <div class="tableBox">
             <div class="pa">
               <a-pagination
+                v-if="tableDataTotal>10"
                 showSizeChanger="true"
                 showQuickJumper="true"
                 hideOnSinglePage="true"
@@ -147,6 +149,7 @@ export default {
       closeDrawer();
     };
     const closeDrawer = () => {
+      state.selectedRowKeys = []
       ctx.emit("update:STvisible", false);
     };
 
@@ -224,49 +227,53 @@ export default {
       console.log("创建考试没设计图");
       state.addExamVisible = true;
     };
-    const getTableDate = (tableData) => {
-      let data = tableData;
-      let array = [];
-      data.map((value, index) => {
-        let obj = {
-          key: index + 1,
-          sysCreateBy: value.sysCreateBy,
-          paperId: value.paperId,
-          testName: value.testName,
-          paperMode: value.paperMode,
-          sysUpdateTime: value.sysUpdateTime,
-        };
-        array.push(obj);
-      });
-      state.tableData = array;
-    };
+    // const getTableDate = (tableData) => {
+    //   let data = tableData;
+    //   let array = [];
+    //   data.map((value, index) => {
+    //     let obj = {
+    //       key: index + 1,
+    //       sysCreateBy: value.sysCreateBy,
+    //       paperId: value.paperId,
+    //       testName: value.testName,
+    //       paperMode: value.paperMode == 1 ? "固定试卷" : "随机",
+    //       sysUpdateTime: value.sysUpdateTime,
+    //     };
+    //     array.push(obj);
+    //   });
+    //   state.tableData = array;
+    //   state.tableDataTotal = array.length
+    // };
     //获取选择考试列表
     const getManageList = () => {
       let obj = {
         keyWord: state.inputPname,
-        pageIndex: state.pageSize,
+        pageIndex: state.currentPage,
         pageSize: state.pageSize,
         published: true,
       };
       api
         .queryExaminationList(obj)
         .then((data) => {
-
+          console.log('datadatadatadata',data);
           // getTableDate(res.data.data);
           //**   表格repaint   */
           let array = []
-          data.map((value, index) => {
+          data.data.data.map((value, index) => {
           let obj = {
           key: index + 1,
           sysCreateBy: value.sysCreateBy,
-          paperId: value.paperId,
+          paperId: index + 1,
           testName: value.testName,
-          paperMode: value.paperMode,
+          paperMode: value.randomMode ? "是" : "否",
           sysUpdateTime: value.sysUpdateTime,
+          id:value.id,
         };
         array.push(obj);
       });
-      //**         */
+      state.tableData = array
+      state.tableDataTotal = array.length
+          message.destroy()
           message.success("获取选择考试列表成功");
         })
         .catch(() => {
@@ -289,7 +296,6 @@ export default {
       ...toRefs(state),
       closeDrawer,
       afterVisibleChange,
-      getTableDate,
       onSelectChange,
       CreatSTText,
       newTest,