From a8c7308cc2ecdedb664a374eb4446b0ce9033687 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Tue, 13 Dec 2022 09:11:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=97=A5=E5=BF=97=E5=8F=AA?=
 =?UTF-8?q?=E6=9C=89=E4=B8=80=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexAudit.js                   |  2 +-
 src/components/drawers/AddEval.vue      |  4 ++--
 src/components/drawers/AddFaceteach.vue |  4 ++--
 src/components/drawers/AddLive.vue      |  2 ++
 src/components/drawers/SelFacet.vue     |  4 +++-
 src/components/vote/AddVote.vue         | 28 +++++++++++++++++++---
 src/views/examine/CourseReviewed.vue    | 10 ++++----
 src/views/examine/CourseReviewedN.vue   | 32 ++++++++++++++++++++-----
 src/views/examine/ProjectReviewed.vue   | 10 ++++----
 src/views/examine/ProjectReviewedN.vue  |  2 +-
 10 files changed, 72 insertions(+), 26 deletions(-)

diff --git a/src/api/indexAudit.js b/src/api/indexAudit.js
index e86bc277..d5a18baf 100644
--- a/src/api/indexAudit.js
+++ b/src/api/indexAudit.js
@@ -7,7 +7,7 @@ export const list = (obj) => http.post('/admin/offcourse/listToBeReviewed', obj)
 //获取待审核项目列表
 export const projlist = (obj) => http.post('/admin/project/list', obj)
 
-//获取待审核项目列表
+//获取项目审核日志
 export const auditlist = (obj) => http.post('/admin/project/auditlist', obj)
 
 //获取已审核项目列表
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 0c798ecc..28c69f5a 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -253,8 +253,8 @@ export default {
           state.description = res.data.data.evaluationExplain;
         })
         .catch((err) => {
-          message.destroy()
-          message.error("获取测量平信息失败");
+          //message.destroy()
+        //  message.error("获取测量平信息失败");
           console.log(err, "erererrerererererer");
         });
     }
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index a6faf339..5b642080 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -100,8 +100,8 @@
               </div>
               <span style="margin-right: 3px">面授时间：</span>
             </div>
-            <div class="select">
-              <a-range-picker
+            <div class="select" >
+              <a-range-picker style="width: 400px;"
                 show-time
                 format="YYYY/MM/DD HH:mm"
                 v-model:value="chooseTime"
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index b670c77d..ea937b01 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -504,6 +504,8 @@ export default {
       state.switchC2 = false;
       state.assessmentId = null;
       state.liveNotice =null;
+      state.liveTeacherId=null;
+      state.memberValue={};
       ctx.emit("changeData", false);
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
diff --git a/src/components/drawers/SelFacet.vue b/src/components/drawers/SelFacet.vue
index a7685648..15dccaec 100644
--- a/src/components/drawers/SelFacet.vue
+++ b/src/components/drawers/SelFacet.vue
@@ -58,6 +58,7 @@
             </div>
           </div>
         </div>
+        <!--
         <div class="main_notice">
           <div class="mntc_left">
             <div class="notice_icon"></div>
@@ -101,7 +102,8 @@
             </div>
 
           </div>
-        </div>
+        </div>-->
+
         <div class="main_table">
 
           <a-table
diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index 420ae755..37dd191e 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -32,7 +32,7 @@
             <div class="btnbox">
               <a-input
                 v-model:value="inputV1"
-                style="width: 424px; height: 32px"
+                style="width: 424px; height: 40px; border-radius: 8px;"
                 placeholder="请输入投票任务名称"
                 maxlength="20"
               />
@@ -102,7 +102,7 @@
               </div>
               <span style="margin-right: 3px">起止时间：</span>
             </div>
-            <div class="btnbox">
+            <div class="select" >
               <a-range-picker
                 show-time
                 format="YYYY-MM-DD HH:mm:ss"
@@ -665,7 +665,29 @@ export default {
             }
           }
         }
+        .in {
 
+            element.style {
+                border-radius: 8px;
+            }
+
+            .ant-input-affix-wrapper {
+                position: relative;
+                display: inline-block;
+                width: 132%;
+                /* min-width: 19px; */
+                padding: 4px 11px;
+                color: rgba(0, 0, 0, 0.85);
+                font-size: 14px;
+                line-height: 1.5715;
+                background-color: #fff;
+                background-image: none;
+                border: 1px solid #d9d9d9;
+                border-radius: 2px;
+                transition: all 0.3s;
+                display: inline-flex;
+            }
+        }
         .main_item2 {
           display: flex;
           align-items: flex-start;
@@ -674,7 +696,7 @@ export default {
             width: 423px;
 
             .ant-input {
-              width: 100%;
+              width:355px;
             }
 
             .ant-input-textarea-show-count {
diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index d32d40d2..b5d214fc 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -106,12 +106,12 @@
           </div>
           <div class="body">
             <a-table
-              style="width: 90%"
+              style="width:100%"
               :columns="columnsAudit"
               :data-source="tableDataAudit"
               :loading="tableDataTotalAudit === -1 ? true : false"
               expandRowByClick="true"
-              :scroll="{ y: 150 }"
+              :scroll="{ y: 250 }"
               @expand="expandTable"
               :pagination="false"
             />
@@ -162,7 +162,7 @@ export default {
           dataIndex: "status",
           key: "status",
           align: "center",
-          width:"10%",
+          width:"20%",
           customRender: ({ record: { status } }) => (
             <div>{{ 2: "审核通过", "-2": "审核拒绝" }[status + ""]}</div>
           ),
@@ -263,7 +263,7 @@ export default {
                 style="color:#387DF7;cursor:pointer;"
                 onClick={() => {
                   console.log(value);
-                  showProjAuditModal(value.record.auditLogDtoList.length!==0?value.record.auditLogDtoList.slice(0,1):[]);
+                  showProjAuditModal(value.record.auditLogDtoList.length!==0?value.record.auditLogDtoList:[]);
                 }}
               >
                 审核日志
@@ -711,7 +711,7 @@ export default {
         .delete {
           z-index: 999;
           width: 816px;
-          min-height: 420px;
+          min-height: 485px;
           background: #ffffff;
           box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
           border-radius: 4px;
diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue
index a6fff1e6..460796df 100644
--- a/src/views/examine/CourseReviewedN.vue
+++ b/src/views/examine/CourseReviewedN.vue
@@ -14,13 +14,33 @@
         <div class="tmplh_inp">
           <div class="inpbox">
             <div class="inpbox1">
+            <!--
               <a-select
-                v-model:value="valueproj"
+                v-model:value="categoryId"
                 :options="[
                   { label: '请选择内容分类', value: '' },
                   ...calssifyList,
                 ]"
-              />
+              />-->
+              <a-tree-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="categoryId"
+              show-search
+              :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+              placeholder="请选择内容分类"
+              allow-clear
+              tree-default-expand-all
+              :tree-data="options2222"
+            >
+              <template #title="{ value: val, title }">
+                <b v-if="val === '11111'" style="color: #08c">sss</b>
+                <template v-else>{{ title }}</template>
+              </template>
+            </a-tree-select>
             </div>
             <div class="inpbox1">
               <a-input
@@ -193,7 +213,7 @@ export default {
         },
       ],
       calssifyList: [], //分类字典
-      valueproj: "",
+      categoryId: "",
       valuecreater: "",
       valuename: "",
       // currentFacePage: 1,
@@ -468,7 +488,7 @@ export default {
       state.loading=true
       let objn = {
         auditStatus: 1,
-        categoryId: state.valueproj,
+        categoryId: state.categoryId,
         createName: state.valuecreater,
         name: state.valuename,
         pageNo: state.currentPage,
@@ -537,7 +557,7 @@ export default {
     const searchList = () => {
       let objn = {
         auditStatus: 1,
-        categoryId: state.valueproj,
+        categoryId: state.categoryId,
         createName: state.valuecreater,
         name: state.valuename,
         pageNo: state.currentPage,
@@ -602,7 +622,7 @@ export default {
       state.tableData1 = array;
     };
     const reset = () => {
-      state.valueproj = "";
+      state.categoryId = "";
       state.valuecreater = null;
       state.valuename = null;
       getFaceList();
diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue
index 9ee8ad03..64d1d71d 100644
--- a/src/views/examine/ProjectReviewed.vue
+++ b/src/views/examine/ProjectReviewed.vue
@@ -122,12 +122,12 @@
           </div>
           <div class="body">
             <a-table
-              style="width: 90%"
+              style="width: 100%"
               :columns="columnsAudit"
               :data-source="tableDataAudit"
               :loading="tableDataTotalAudit === -1 ? true : false"
               expandRowByClick="true"
-              :scroll="{ y: 150 }"
+              :scroll="{ y: 250 }"
               @expand="expandTable"
               :pagination="false"
             />
@@ -277,7 +277,7 @@ export default {
               <div>
                 <span
                   onClick={() => {
-                    showProjAuditModal(value.record.auditList.length!==0?value.record.auditList.slice(value.record.auditList.length-1):[]);
+                    showProjAuditModal(value.record.auditList.length!==0?value.record.auditList:[]);
                   }}
                   style="cursor:pointer;color:#387DF7"
                 >
@@ -429,7 +429,7 @@ export default {
         .delete {
           z-index: 999;
           width: 816px;
-          min-height: 420px;
+          min-height: 510px;
           background: #ffffff;
           box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
           border-radius: 4px;
@@ -479,7 +479,7 @@ export default {
 
             .body {
               width: 100%;
-              margin: 34px auto 56px auto;
+              margin: 34px auto 41px auto;
               display: flex;
               justify-content: center;
               align-items: center;
diff --git a/src/views/examine/ProjectReviewedN.vue b/src/views/examine/ProjectReviewedN.vue
index b8da0b62..f0741880 100644
--- a/src/views/examine/ProjectReviewedN.vue
+++ b/src/views/examine/ProjectReviewedN.vue
@@ -185,7 +185,7 @@ export default {
           width:"10%",
         },
         {
-          title: "创建时间",
+          title: "提交时间",
           dataIndex: "processTime",
           key: "processTime",
           align: "center",