From e98d3cd5ea06bf5b4448bb3b5201e0e0a55c9d2f Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Thu, 15 Dec 2022 20:05:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=92=A4=E5=9B=9E=E7=9A=84=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=20=E8=BF=98=E5=9C=A8=E6=B7=BB=E5=8A=A0=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=87=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddOnline.vue      |  2 +-
 src/components/drawers/AddTest.vue        |  2 +-
 src/components/drawers/AssessmentAll.vue  |  6 +++++-
 src/components/drawers/AssessmentList.vue | 16 +++++++++++++---
 src/components/drawers/EvList.vue         |  5 ++++-
 src/components/drawers/SelectTest.vue     |  2 +-
 src/views/projectcenter/TaskPage.vue      |  6 +++++-
 src/views/projectcenter/temTask.vue       |  8 ++++----
 8 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index ced345f9..25549958 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -108,7 +108,7 @@
                 :loading="tableDataTotal === -1 ? true : false"
                 :pagination="false"
               />
-              <div class="tableBox">
+              <div class="tableBox" style="margin-top:85px;">
               <div class="pa">
                 <a-pagination
                   v-if="tableDataTotal > 10"
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index ca1a2075..21af626c 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -244,7 +244,7 @@
           <div class="main_item">
             <div class="main_item">
               <div class="signbox">
-                <span style="margin-right: 3px">作业要求：</span>
+                <span style="margin-right: 3px">试题排序：</span>
               </div>
               <div class="btnbox">
                 <a-radio-group
diff --git a/src/components/drawers/AssessmentAll.vue b/src/components/drawers/AssessmentAll.vue
index ae06897b..bbc03a1f 100644
--- a/src/components/drawers/AssessmentAll.vue
+++ b/src/components/drawers/AssessmentAll.vue
@@ -93,7 +93,7 @@
       }"
       filterMultiple:false
     />
-    <div class="tableBox">
+    <div class="tableBox" style="margin-top:85px;">
       <div class="pa">
         <a-pagination
           :showSizeChanger="false"
@@ -208,6 +208,7 @@ export default {
           key: "num",
           width: "20%",
           align: "center",
+          ellipsis: true,
         },
         {
           title: "创建人",
@@ -215,6 +216,7 @@ export default {
           key: "creator",
           width: "20%",
           align: "center",
+          ellipsis: true,
         },
         {
           title: "创建时间",
@@ -222,6 +224,7 @@ export default {
           key: "time",
           width: "20%",
           align: "center",
+          ellipsis: true,
         },
       ];
       return columns;
@@ -274,6 +277,7 @@ export default {
           assessmentName: state.inputV1,
           pageNo: state.currentPage,
           pageSize: state.pageSize,
+          releaseStatus:2,
         })
         .then((res) => {
           let arr = res.data.data.rows;
diff --git a/src/components/drawers/AssessmentList.vue b/src/components/drawers/AssessmentList.vue
index bc5d5edc..cb68071f 100644
--- a/src/components/drawers/AssessmentList.vue
+++ b/src/components/drawers/AssessmentList.vue
@@ -51,7 +51,7 @@
               :row-selection="rowSelection"
               filterMultiple:false
             />
-            <div class="tableBox">
+            <div class="tableBox" style="margin-top:85px;">
             <div class="pa">
               <a-pagination
                 :showSizeChanger="false"
@@ -136,6 +136,7 @@ export default {
           key: "num",
           width: "20%",
           align: "center",
+          ellipsis: true,
         },
         {
           title: "创建人",
@@ -143,6 +144,7 @@ export default {
           key: "creator",
           width: "20%",
           align: "center",
+          ellipsis: true,
         },
         {
           title: "创建时间",
@@ -150,6 +152,7 @@ export default {
           key: "time",
           width: "20%",
           align: "center",
+          ellipsis: true,
         },
       ];
       return columns;
@@ -182,8 +185,15 @@ export default {
         let obj = {
           key: index,
           assessmentId: value.assessmentId,
-          num: Number(value.essayQuestionVoList.length)+Number(value.multipleStemVoList.length)+Number(value.scoringQuestionVoList
-.length)+Number(value.singleStemVoList.length),
+          num:value.essayQuestionVoList
+                ? Number(value.essayQuestionVoList.length)
+                : 0 + value.multipleStemVoList
+                ? Number(value.multipleStemVoList.length)
+                : 0 + value.scoringQuestionVoList
+                ? Number(value.scoringQuestionVoList.length)
+                : 0 + value.singleStemVoList
+                ? Number(value.singleStemVoList.length)
+                : 0,
           name: value.assessmentName ? value.assessmentName : "-",
           creator: value.createUser ? value.createUser : "-",
           time: dayjs(value.createTime).format("YYYY-MM-DD"),
diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue
index bb0b1dc7..f62a8e6c 100644
--- a/src/components/drawers/EvList.vue
+++ b/src/components/drawers/EvList.vue
@@ -54,7 +54,7 @@
               onChange: onSelectChange,
             }"
           />
-          <div class="tableBox">
+          <div class="tableBox" style="margin-top:85px;">
           <div class="pa">
             <a-pagination
               v-if="tableDataTotal > 10"
@@ -113,6 +113,7 @@ export default {
           width: "20%",
           dataIndex: "quiz_code",
           key: "code",
+          ellipsis: true,
         },
         {
           title: "测评名称",
@@ -120,6 +121,7 @@ export default {
           dataIndex: "title",
           key: "title",
           align: "center",
+          ellipsis: true,
         },
         {
           title: "备注",
@@ -149,6 +151,7 @@ export default {
           dataIndex: "quiz_range",
           key: "time",
           align: "center",
+          ellipsis: true,
         },
       ],
     });
diff --git a/src/components/drawers/SelectTest.vue b/src/components/drawers/SelectTest.vue
index ca8a5db4..3acf79fc 100644
--- a/src/components/drawers/SelectTest.vue
+++ b/src/components/drawers/SelectTest.vue
@@ -70,7 +70,7 @@
             :scroll="{ x: 900 }"
             :pagination="false"
           />
-          <div class="tableBox">
+          <div class="tableBox" style="margin-top:85px;">
             <div class="pa">
               <a-pagination
                 v-if="tableDataTotal>10"
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index dc01134e..8e17fe23 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -3583,9 +3583,12 @@ export default {
         console.log("get task", res.data.data);
         if (res.data.code === 200) {
           // 判断当前审核是否通过
-          if (res.data.data.projectAuditLogDtoList !== null) {
+          if (res.data.data.status == -5 && res.data.data.projectAuditLogDtoList !== null) {
             console.log("审核信息是什么", res.data.data.projectAuditLogDtoList);
             let dataset = res.data.data.projectAuditLogDtoList;
+            state.passInfo = dataset[dataset.length-1];
+
+           /** 
             for (let i = 0; i < dataset.length; i++) {
               if (dataset[i].status == -5) {
                 state.isPass = true;
@@ -3593,6 +3596,7 @@ export default {
               }
               // isPass passInfo
             }
+            */
           }
 
           let info = res.data.data.projectInfo;
diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue
index b3fe6c2c..a97eaad5 100644
--- a/src/views/projectcenter/temTask.vue
+++ b/src/views/projectcenter/temTask.vue
@@ -1580,7 +1580,7 @@ export default {
               console.log("zhaodaole", stage);
               // console.log("stage",Object.prototype.toString.call(stage))
               getStageData(res.data.data.stageList);
-              if (stage !== "null") {
+              if (stage !== null) {
                 console.log(stage);
                 let stageList = res.data.data.stageList; //阶段数组
                 let result = stageList.find(
@@ -1773,18 +1773,18 @@ export default {
       api
         .editStage(obj)
         .then((res) => {
-          console.log("修改阶段成功", res);
+          console.log("操作成功", res);
           state.valuesname = "";
           state.valuesnotice = "";
           closeModal();
           state.updateStageID = null;
           message.destroy();
-          message.success("修改阶段成功");
+          message.success("操作成功");
           getTask();
           state.addLoading = false;
         })
         .catch((err) => {
-          console.log("添加阶段失败", err);
+          console.log("操作失败", err);
         });
     };