From dde9385adbd22ca0bd7b766870a6e9fbe5828335 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 30 Nov 2022 15:25:01 +0800
Subject: [PATCH 1/5] =?UTF-8?q?--=20=E9=9D=A2=E6=8E=88=E8=AF=BE=E6=95=99?=
 =?UTF-8?q?=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddFaceteach.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index 9b0295c8..6ba63ad6 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -92,7 +92,7 @@
             </div>
             <div class="btnbox">
               <a-auto-complete
-                v-model:value="memberValue"
+                v-model:value="memberValue.label"
                 show-search
                 :not-found-content="fetching ? undefined : null"
                 placeholder="Select a teacher"
@@ -458,7 +458,7 @@ export default {
     });
     const clear = () => {
       state.courseName = "";
-      state.memberValue = null;
+      state.memberValue = {};
       state.duration = null;
       state.address = null;
       state.before=null;
@@ -569,7 +569,7 @@ export default {
       if (
         state.courseName == "" ||
         state.chooseCourse == null ||
-        state.memberValue == "" ||
+        state.memberValue == {} ||
         state.chooseTime == [] ||
         state.duration == "" ||
         state.address == ""
@@ -718,9 +718,9 @@ export default {
     };
     // 获取员工
     const queryMember = () => {
-      if (!state.memberValue) return;
+      if (!state.memberValue || !state.memberValue.label) return;
       let obj = {
-        keyWord: state.memberValue,
+        keyWord: state.memberValue.label,
         id: 0,
         org: 0,
         pageNo: state.currentPage,
@@ -747,7 +747,7 @@ export default {
       options.value = [];
       state.fetching = true;
       state.currentPage = 1;
-      state.memberValue = memberValue;
+      state.memberValue.label = memberValue;
       queryMember();
       state.fetching = false;
     }, 300);

From 29ba6dd15d8ee09eba5d4d7085591936664a024a Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Wed, 30 Nov 2022 15:41:00 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=90=9C=E7=B4=A2=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ProjectAudit.vue | 121 ++++++++++-------------
 src/views/examine/CourseReviewed.vue    | 125 ++++++++++--------------
 2 files changed, 104 insertions(+), 142 deletions(-)

diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue
index 9e94dfe9..c4ea5f67 100644
--- a/src/components/drawers/ProjectAudit.vue
+++ b/src/components/drawers/ProjectAudit.vue
@@ -1,19 +1,11 @@
 <template>
-  <a-drawer
-      :visible="ProjAuditvisible"
-      class="drawerStyle ProjectAudit"
-      placement="right"
-      width="60%"
-      @after-visible-change="afterVisibleChange"
-  >
+  <a-drawer :visible="ProjAuditvisible" class="drawerStyle ProjectAudit" placement="right" width="60%"
+    @after-visible-change="afterVisibleChange">
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">审核项目</div>
-        <img
-            style="width: 29px; height: 29px; cursor: pointer"
-            src="../../assets/images/basicinfo/close.png"
-            @click="closeDrawer"
-        />
+        <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer" />
       </div>
       <div class="main" style="padding-right: 10px">
         <a-tabs v-model:activeKey="activeSetKey">
@@ -29,19 +21,13 @@
                 <div class="set_content">
                   <div class="setc_name"><span>封面图：</span></div>
                   <div class="setc_main">
-                    <img
-                        style="width: 151px; height: 84px"
-                        :src="picUrl"
-                        alt=""
-                    />
+                    <img style="width: 151px; height: 84px" :src="picUrl" alt="" />
                   </div>
                 </div>
                 <div class="set_content">
                   <div class="setc_name"><span>项目时间：</span></div>
                   <div class="setc_main">
-                    <span style="color: #999999"
-                    >{{ startTime }} ～ {{ endTime }}</span
-                    >
+                    <span style="color: #999999">{{ startTime }} ～ {{ endTime }}</span>
                   </div>
                 </div>
                 <div class="set_content">
@@ -65,11 +51,8 @@
                 <div class="set_content">
                   <div class="setc_name"><span>同步学习记录：</span></div>
                   <div class="setc_main">
-                    <a-radio v-model:checked="checkedSty"
-                    ><span style="color: #333333"
-                    >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-                    ></a-radio
-                    >
+                    <a-radio v-model:checked="checkedSty"><span
+                        style="color: #333333">同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span></a-radio>
                   </div>
                 </div>
                 <div class="set_content">
@@ -87,9 +70,7 @@
                 <div class="set_content">
                   <div class="setc_name"><span>是否BOEU实施：</span></div>
                   <div class="setc_main">
-                    <a-radio v-model:checked="checkedBOEU"
-                    ><span style="color: #333333">BOEU实施</span></a-radio
-                    >
+                    <a-radio v-model:checked="checkedBOEU"><span style="color: #333333">BOEU实施</span></a-radio>
                   </div>
                 </div>
               </div>
@@ -101,7 +82,7 @@
               </button>
             </div>
           </a-tab-pane>
-          <a-tab-pane key="2" tab="修改记录"></a-tab-pane>
+          <!-- <a-tab-pane key="2" tab="修改记录"></a-tab-pane> -->
         </a-tabs>
         <div class="audit">
           <div class="set_content">
@@ -116,7 +97,7 @@
           <div class="set_content">
             <div class="setc_name"><span>审核意见：</span></div>
             <div class="setc_main">
-              <a-textarea v-model:value="valueSuggest" :rows="4"/>
+              <a-textarea v-model:value="valueSuggest" :rows="4" />
             </div>
           </div>
         </div>
@@ -130,11 +111,11 @@
 </template>
 
 <script>
-import {toRefs, reactive} from "vue";
-import {getTask} from "../../api/indexTaskadd";
-import {toDate} from "../../api/method";
-import {auditView} from "../../api/indexAudit";
-import {message} from "ant-design-vue";
+import { toRefs, reactive } from "vue";
+import { getTask } from "../../api/indexTaskadd";
+import { toDate } from "../../api/method";
+import { auditView } from "../../api/indexAudit";
+import { message } from "ant-design-vue";
 
 export default {
   name: "ProjectAudit",
@@ -225,26 +206,26 @@ export default {
         state.manager = info.manager;
         state.remark = info.remark;
         state.level =
-            info.level == 1
-                ? "集团级"
-                : info.level == 2
-                    ? "组织级"
-                    : info.level == 3
-                        ? "现地级"
-                        : info.level == 4
-                            ? "部门级"
-                            : "-";
+          info.level == 1
+            ? "集团级"
+            : info.level == 2
+              ? "组织级"
+              : info.level == 3
+                ? "现地级"
+                : info.level == 4
+                  ? "部门级"
+                  : "-";
         state.tlevel = info.level;
         state.systemId =
-            info.systemId == 1
-                ? "集团级"
-                : info.systemId == 2
-                    ? "组织级"
-                    : info.systemId == 3
-                        ? "现地级"
-                        : info.systemId == 4
-                            ? "部门级"
-                            : "-";
+          info.systemId == 1
+            ? "集团级"
+            : info.systemId == 2
+              ? "组织级"
+              : info.systemId == 3
+                ? "现地级"
+                : info.systemId == 4
+                  ? "部门级"
+                  : "-";
         state.tsystemId = info.systemId;
         state.checkedSty = info.courseSyncFlag == 1 ? true : false;
         state.courseSyncFlag = info.courseSyncFlag;
@@ -260,13 +241,13 @@ export default {
         // state.attach = info.attach;
         // state.templateId = info.templateId;
         state.sourceBelong =
-            info.sourceBelongId == 1
-                ? "项目一"
-                : info.sourceBelongId == 2
-                    ? "项目二"
-                    : info.sourceBelongId == 3
-                        ? "项目三"
-                        : "-";
+          info.sourceBelongId == 1
+            ? "项目一"
+            : info.sourceBelongId == 2
+              ? "项目二"
+              : info.sourceBelongId == 3
+                ? "项目三"
+                : "-";
       });
     };
 
@@ -284,16 +265,16 @@ export default {
         pass: state.valuePass == "1" ? 1 : -1,
         projectId: props.chooseProject,
       })
-          .then((res) => {
-            console.log("提交成功", res);
-            message.destroy();
-            message.success("提交成功");
-            closeDrawer();
-          })
-          .catch((err) => {
-            console.log(err);
-            message.warning("提交失败");
-          });
+        .then((res) => {
+          console.log("提交成功", res);
+          message.destroy();
+          message.success("提交成功");
+          closeDrawer();
+        })
+        .catch((err) => {
+          console.log(err);
+          message.warning("提交失败");
+        });
     };
 
     return {
diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index 09eaebd3..e625ecd7 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -14,35 +14,24 @@
         <div class="tmplh_inp">
           <div class="inpbox">
             <div class="inpbox1">
-              <a-select
-                  v-model:value="valueproj"
-                  value-key="value"
-                  :options="[{label:'请选择内容分类',value:''},...calssifyList]"
-              />
+              <a-select v-model:value="valueproj" value-key="value"
+                :options="[{ label: '请选择内容分类', value: '' }, ...calssifyList]" />
             </div>
             <div class="inpbox1">
-              <a-input
-                  v-model:value="valuecreater"
-                  style="
+              <a-input v-model:value="valuecreater" style="
                   width: 270px;
                   height: 40px;
                   border-radius: 8px;
                   margin-right: 14px;
-                "
-                  placeholder="请输入创建人"
-              />
+                " placeholder="请输入创建人" />
             </div>
             <div class="inpbox1">
-              <a-input
-                  v-model:value="valuename"
-                  style="
+              <a-input v-model:value="valuename" style="
                   width: 270px;
                   height: 40px;
                   border-radius: 8px;
                   margin-right: 14px;
-                "
-                  placeholder="请输入名称"
-              />
+                " placeholder="请输入名称" />
             </div>
           </div>
         </div>
@@ -59,28 +48,13 @@
       </div>
       <div class="tmpl_body">
         <div class="tmpl_tabbox">
-          <a-table
-              :columns="columns1"
-              :data-source="tableData1"
-              :loading="tableDataTotal === -1 ? true : false"
-              expandRowByClick="true"
-              @expand="expandTable"
-              :scroll="{ x: 1300 }"
-              :pagination="false"
-          />
+          <a-table :columns="columns1" :data-source="tableData1" :loading="tableDataTotal === -1 ? true : false"
+            expandRowByClick="true" @expand="expandTable" :scroll="{ x: 1300 }" :pagination="false" />
         </div>
         <div class="tableBox">
           <div class="pa">
-            <a-pagination
-                v-if="total > 10"
-                showSizeChanger="true"
-                show-quick-jumper
-                :pageSize="pageSize"
-                v-model:current="currentPage"
-                :total="total"
-                class="pagination"
-                @change="changePagination"
-            />
+            <a-pagination v-if="total > 10" showSizeChanger="true" show-quick-jumper :pageSize="pageSize"
+              v-model:current="currentPage" :total="total" class="pagination" @change="changePagination" />
           </div>
         </div>
       </div>
@@ -88,9 +62,10 @@
   </div>
 </template>
 <script>
-import {reactive, toRefs, onMounted} from "vue";
-import {courseListView} from "../../api/indexAudit";
+import { reactive, toRefs, onMounted } from "vue";
+import { courseListView } from "../../api/indexAudit";
 import * as api1 from "@/api/index1";
+import { toDate } from "../../api/method";
 
 export default {
   name: "CoursereViewed",
@@ -128,7 +103,7 @@ export default {
           dataIndex: "content",
           key: "content",
           align: "center",
-          customRender: ({text}) => state.calssifyList.find(e => e.value == text)?.label,
+          customRender: ({ text }) => state.calssifyList.find(e => e.value == text)?.label,
         },
         {
           title: "审核状态",
@@ -147,6 +122,11 @@ export default {
           dataIndex: "time",
           key: "time",
           align: "center",
+          customRender: (time) => {
+            console.log(time)
+            return <div style="color:#387DF7">{toDate(time, "Y-M-D h:m")}</div>;
+          },
+
         },
         {
           title: "审核说明",
@@ -154,15 +134,15 @@ export default {
           key: "msg",
           align: "center",
         },
-        {
-          title: "操作",
-          dataIndex: "opt",
-          key: "opt",
-          align: "center",
-          customRender: () => {
-            return <div style="color:#387DF7">审核日志</div>;
-          },
-        },
+        // {
+        //   title: "操作",
+        //   dataIndex: "opt",
+        //   key: "opt",
+        //   align: "center",
+        //   customRender: () => {
+        //     return <div style="color:#387DF7">审核日志</div>;
+        //   },
+        // },
       ],
       tableData1: [
         // {
@@ -180,24 +160,25 @@ export default {
     const getList = () => {
       let objn = {
         auditStatus: 0,
-        categoryId: state.valueproj,
+        categoryId: Number(state.valueproj),
         createName: state.valuecreater,
         name: state.valuename,
         pageNo: state.currentPage,
         pageSize: 10,
       };
+      console.log(objn)
       courseListView(objn)
-          .then((res) => {
-            console.log("获取已审核课程成功", res.data.data);
-            state.total = res.data.data.total;
-            setTableData(res.data.data.rows);
-          })
-          .catch((err) => {
-            console.log("获取已审核课程失败", err);
-          });
+        .then((res) => {
+          console.log("获取已审核课程成功", res.data.data);
+          state.total = res.data.data.total;
+          setTableData(res.data.data.rows);
+        })
+        .catch((err) => {
+          console.log("获取已审核课程失败", err);
+        });
     };
     const setTableData = (table) => {
-      if(!table || !table.length){
+      if (!table || !table.length) {
         state.tableData1 = []
         return
       }
@@ -210,17 +191,17 @@ export default {
           type: item.type == 1 ? "线上" : "线下",
           content: item.categoryId,
           status:
-              item.auditStatus == 0
-                  ? "未提交"
-                  : item.auditStatus == 1
-                      ? "提交待审核"
-                      : item.auditStatus == 2
-                          ? "通过"
-                          : item.auditStatus == -1
-                              ? "拒绝"
-                              : "-",
+            item.auditStatus == 0
+              ? "未提交"
+              : item.auditStatus == 1
+                ? "提交待审核"
+                : item.auditStatus == 2
+                  ? "通过"
+                  : item.auditStatus == -1
+                    ? "拒绝"
+                    : "-",
           creater: item.createName,
-          time: "-",
+          time: item.createTime,
           msg: item.description || "-",
         };
         array.push(obj);
@@ -229,9 +210,9 @@ export default {
     };
     const reset = () => {
       (state.valueproj = ''),
-          (state.valuecreater = null),
-          (state.valuename = null),
-          getList();
+        (state.valuecreater = null),
+        (state.valuename = null),
+        getList();
     };
     const changePagination = (pagina) => {
       state.currentPage = pagina;
@@ -246,7 +227,7 @@ export default {
     onMounted(async () => {
       getList();
       //获取分类列表
-      state.calssifyList = (await getDictList("faceclassClass")).map(e => ({label: e.dictName, value: e.dictCode}))
+      state.calssifyList = (await getDictList("faceclassClass")).map(e => ({ label: e.dictName, value: e.dictCode }))
     });
     return {
       ...toRefs(state),

From f4a8c500f8fc0a6b2dc8e2abdc90c6fd15d73e1c Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Wed, 30 Nov 2022 15:48:56 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=97=A0=E9=98=B6?=
 =?UTF-8?q?=E6=AE=B5=E6=97=B6=E8=BF=94=E5=9B=9E=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddDiscuss.vue | 14 ++++++-------
 src/components/drawers/AddEval.vue    | 12 +++++------
 src/views/projectcenter/TaskAdd.vue   | 30 +++++++++++++++++++--------
 3 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index 46accdb5..090da93c 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -154,7 +154,7 @@ export default {
       ctx.emit("update:edit", false);
       state.inputV1 = "";
       state.textV1 = "";
-      message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+      //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
     };
@@ -198,10 +198,10 @@ export default {
         })
           .then(() => {
            
-            message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+            //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
           })
           .catch(() => {
-            message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
+            //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
           });
       } else if (props.isLevel == 2) {
         apiTask
@@ -215,10 +215,10 @@ export default {
           })
           .then(() => {
            
-            message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+            //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
           })
           .catch(() => {
-            message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
+            //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
           });
       } else if (props.isLevel == 3) {
         console.log("");
@@ -232,10 +232,10 @@ export default {
         })
           .then(() => {
            
-            message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+            //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
           })
           .catch(() => {
-            message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
+            //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
           });
       }
     };
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 756a9338..af7c910f 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -212,12 +212,10 @@ export default {
           type: 10,
         })
           .then(() => {
-            message.success(
-              `${props.EditTestId ? "编辑" : "新增"}关卡任务成功`
-            );
+            //message.success(`${props.EditTestId ? "编辑" : "新增"}关卡任务成功`);
           })
           .catch(() => {
-            message.error(`${props.EditTestId ? "编辑" : "新增"}关卡任务失败`);
+            //message.error(`${props.EditTestId ? "编辑" : "新增"}关卡任务失败`);
           });
       } else if (props.isLevel == 2) {
         apitaskadd
@@ -237,7 +235,7 @@ export default {
           })
           .catch(() => {
             message.destroy()
-            message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
+            //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
           });
       } else if (props.isLevel == 3) {
         addTempTask({
@@ -249,10 +247,10 @@ export default {
           type: 10,
         })
           .then(() => {
-            message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
+            //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
           })
           .catch(() => {
-            message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
+            //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
           });
       }
     };
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index cb126a5f..d3ea0f32 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -1202,7 +1202,8 @@ export default {
       let data = tableData;
       let array = [];
       data.map((value) => {
-        let obj = {
+        if(value.stageId!=0){
+          let obj = {
           id: value.stageId,
           tit: value.name,
           name: value.remark,
@@ -1211,6 +1212,8 @@ export default {
           label: value.name,
         };
         array.push(obj);
+        }
+        
       });
       state.level = array;
     };
@@ -1363,7 +1366,7 @@ export default {
               let stage = localStorage.getItem("stageId")
                 ? localStorage.getItem("stageId")
                 : null;
-              console.log("zhaodaole", stage);
+      
               // console.log("stage",Object.prototype.toString.call(stage))
               getStageData(res.data.data.stageList);
               if (stage !== "null") {
@@ -1371,13 +1374,23 @@ export default {
                 let stageList = res.data.data.stageList; //阶段数组
                 let result = stageList.find((item) => item.stageId == stage);
                 console.log("又找到了", result);
-                getTableData(result.taskList);
+                if(result!=null){
+                  getTableData(result.taskList);
+                }
+                
               } else {
-                let arr = res.data.data.stageList[0].taskList;
-                console.log("任务列表", arr);
-                getTableData(arr);
-                // state.isActive = true;
-                changebgc(res.data.data.stageList[0].stageId);
+                //没有选中的阶段时，获取全部的任务
+                console.log(stage);
+                let stageList = res.data.data.stageList; //阶段数组
+               if(stageList!=null){
+                let taskListAll =null;
+                stageList.forEach((item) => {
+                  taskListAll =[taskListAll,...item.taskList];
+                });
+                console.log("taskListAll",taskListAll);
+                getTableData(taskListAll);
+               }
+                
               }
 
               // 每次都获取了第一条taskList
@@ -1451,7 +1464,6 @@ export default {
     //移动任务到阶段
     const moveTask = () => {
       if (state.chooseStageId == state.removeStageId) {
-        console.log("buneng");
         message.destroy();
         message.warning("选择的任务已在当前阶段");
       } else if (state.removeStageId == null) {

From 7a977b520506b7954624fd3f86f05e64601ec34f Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Wed, 30 Nov 2022 18:24:54 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix:=E8=AF=BE=E7=A8=8B=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E6=95=99=E5=B8=88=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/examine/CourseReviewed.vue   |   3 +-
 src/views/examine/CourseReviewedN.vue  |  30 +++-
 src/views/examine/ProjectReviewedN.vue | 219 ++++++++++++-------------
 3 files changed, 130 insertions(+), 122 deletions(-)

diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index e625ecd7..70a8d3b6 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -123,8 +123,7 @@ export default {
           key: "time",
           align: "center",
           customRender: (time) => {
-            console.log(time)
-            return <div style="color:#387DF7">{toDate(time, "Y-M-D h:m")}</div>;
+            return <div style="color:#387DF7">{toDate(time.record.time, "Y-M-D h:m")}</div>;
           },
 
         },
diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue
index 18221638..649a0eaf 100644
--- a/src/views/examine/CourseReviewedN.vue
+++ b/src/views/examine/CourseReviewedN.vue
@@ -165,7 +165,7 @@
                     <div class="i1_input">{{ faceDetailObj !== null ? faceDetailObj.meaning : "" }}</div>
                   </div>
                 </div>
-                <div class="mbl_items">
+                <!-- <div class="mbl_items">
                   <div class="item_nam">
                     <div class="asterisk_icon">
                       <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
@@ -175,7 +175,7 @@
                   <div class="item_inp">
                     <div class="select i6_input">{{ faceDetailObj !== null ? faceDetailObj.projectId : "" }}</div>
                   </div>
-                </div>
+                </div> -->
                 <div class="mbl_items">
                   <div class="item_nam">
                     <div class="asterisk_icon">
@@ -184,7 +184,10 @@
                     <span style="margin-right: 14px">内容分类：</span>
                   </div>
                   <div class="item_inp">
-                    <div class="select i6_input">{{ faceDetailObj !== null ? faceDetailObj.categoryId : "" }}</div>
+                    <!-- <div class="select i6_input">{{ faceDetailObj !== null ? faceDetailObj.categoryId : "" }}</div> -->
+                    <div class="select i6_input">{{ faceDetailObj !== null ? contentList11.find(e => e.dictCode ==
+                        faceDetailObj.categoryId)?.dictValue : ""
+                    }}</div>
                   </div>
                 </div>
                 <div class="mbl_items">
@@ -192,7 +195,11 @@
                     <span style="margin-right: 14px">场景：</span>
                   </div>
                   <div class="item_inp">
-                    <div class="select i7_input">{{ faceDetailObj !== null ? faceDetailObj.sceneId : "" }}</div>
+                    <!-- <div class="select i7_input">{{ faceDetailObj !== null ? faceDetailObj.sceneId : "" }}</div> -->
+                    <div class="select i7_input">{{ faceDetailObj !== null ? sceneist11.find(e => e.dictCode ==
+                        faceDetailObj.sceneId)?.dictValue
+                        : ""
+                    }}</div>
                   </div>
                 </div>
                 <div class="mbl_items">
@@ -211,7 +218,7 @@
                     <span style="margin-right: 14px">授课教师：</span>
                   </div>
                   <div class="item_inp">
-                    <div class="i1_input">{{ faceDetailObj !== null ? faceDetailObj.teacherId : "" }}</div>
+                    <div class="i1_input">{{ faceDetailObj !== null ? faceDetailObj.teacher : "" }}</div>
                   </div>
                 </div>
                 <div class="mbl_items2">
@@ -465,6 +472,8 @@ export default {
       };
 
       console.log(objn);
+      // 测试数据先放下
+      // setFaceData([{ name: "面授课审核", category_id: "8", scene_id: "8" }]);
 
       list(objn)
         .then((res) => {
@@ -478,6 +487,7 @@ export default {
           }
         })
         .catch((err) => {
+          setFaceData([{}]);
           console.log("获取面授列表失败", err);
         });
     };
@@ -486,6 +496,7 @@ export default {
     const heroImg = ref(null);
     const valueHtml = ref(null);
     const attachMap = ref([]);
+
     const getFaceDetail = (id) => {
       console.log(id);
       courseDetail(id)
@@ -504,6 +515,11 @@ export default {
 
     }
 
+    //  内容分类 场景 -- 目前直接写死的 
+    const sceneist11 = [{ dictCode: "6", dictValue: "场景一" }, { dictCode: "7", dictValue: "场景二" }]
+    const contentList11 = [{ dictCode: "8", dictValue: "分类一" }, { dictCode: "5", dictValue: "分类二" }]
+
+    // contentList11.find(e => e.dictCode == text)?.dictValue
 
     const searchList = () => {
       let objn = {
@@ -650,7 +666,9 @@ export default {
       getFaceDetail,
       heroImg,
       valueHtml,
-      attachMap
+      attachMap,
+      contentList11,
+      sceneist11
     };
   },
 };
diff --git a/src/views/examine/ProjectReviewedN.vue b/src/views/examine/ProjectReviewedN.vue
index 7a37e038..7885ac9b 100644
--- a/src/views/examine/ProjectReviewedN.vue
+++ b/src/views/examine/ProjectReviewedN.vue
@@ -14,48 +14,32 @@
         <div class="tmplh_inp">
           <div class="inpbox">
             <div class="inpbox1">
-              <a-input
-                v-model:value="valueproj"
-                style="
+              <a-input v-model:value="valueproj" style="
                   width: 270px;
                   height: 40px;
                   border-radius: 8px;
                   margin-right: 14px;
-                "
-                placeholder="请输入项目名称/所属项目"
-              />
+                " placeholder="请输入项目名称/所属项目" />
             </div>
             <div class="inpbox1">
-              <a-input
-                v-model:value="valuename"
-                style="
+              <a-input v-model:value="valuename" style="
                   width: 270px;
                   height: 40px;
                   border-radius: 8px;
                   margin-right: 14px;
-                "
-                placeholder="请输入项目经理"
-              />
+                " placeholder="请输入项目经理" />
             </div>
             <div class="inpbox1">
-              <a-input
-                v-model:value="valuecreater"
-                style="
+              <a-input v-model:value="valuecreater" style="
                   width: 270px;
                   height: 40px;
                   border-radius: 8px;
                   margin-right: 14px;
-                "
-                placeholder="请输入创建人"
-              />
+                " placeholder="请输入创建人" />
             </div>
             <div class="inpbox1">
-              <a-range-picker
-                v-model:value="valueDate"
-                style="border-radius: 8px; height: 40px; margin-left: 5px"
-                :placeholder="['      开始时间', '        结束时间']"
-                @change="rankTimeChange"
-              />
+              <a-range-picker v-model:value="valueDate" style="border-radius: 8px; height: 40px; margin-left: 5px"
+                :placeholder="['      开始时间', '        结束时间']" @change="rankTimeChange" />
             </div>
           </div>
         </div>
@@ -72,40 +56,20 @@
       </div>
       <div class="tmpl_body">
         <div class="tmpl_tabbox">
-          <a-table
-            :columns="columns1"
-            :data-source="tableData1"
-            :loading="tableDataTotal === -1 ? true : false"
-            expandRowByClick="true"
-            @expand="expandTable"
-            :pagination="false"
-            :scroll="{ x: 1300 }"
-          />
+          <a-table :columns="columns1" :data-source="tableData1" :loading="tableDataTotal === -1 ? true : false"
+            expandRowByClick="true" @expand="expandTable" :pagination="false" :scroll="{ x: 1300 }" />
         </div>
         <div class="tableBox">
           <div class="pa">
-            <a-pagination
-              v-if="total > 10"
-              showSizeChanger="true"
-              show-quick-jumper
-              :pageSize="pageSize"
-              v-model:current="currentPage"
-              :total="total"
-              class="pagination"
-              @change="changePagination"
-            />
+            <a-pagination v-if="total > 10" showSizeChanger="true" show-quick-jumper :pageSize="pageSize"
+              v-model:current="currentPage" :total="total" class="pagination" @change="changePagination" />
           </div>
         </div>
       </div>
     </div>
     <!-- 审核项目页面 -->
-    <project-audit
-      v-model:ProjAuditvisible="ProjAuditvisible"
-      v-model:chooseProject="chooseProject"
-      v-model:chooseCreateId="chooseCreateId"
-      v-model:chooseCreater="chooseCreater"
-      v-model:finishdFun="getProjList"
-    />
+    <project-audit v-model:ProjAuditvisible="ProjAuditvisible" v-model:chooseProject="chooseProject"
+      v-model:chooseCreateId="chooseCreateId" v-model:chooseCreater="chooseCreater" v-model:finishdFun="getProjList" />
   </div>
 </template>
 <script>
@@ -221,7 +185,7 @@ export default {
     };
     const getProjList = () => {
       let objn = {
-        beginTime: state.valueDate == undefined ? "" : Date.parse(state.valueDate[0]) ,
+        beginTime: state.valueDate == undefined ? "" : Date.parse(state.valueDate[0]),
         createName: state.valuecreater,
         endTime: state.valueDate == undefined ? "" : Date.parse(state.valueDate[1]),
         manager: state.valuename,
@@ -235,7 +199,7 @@ export default {
           console.log("获取待审核项目成功", res);
           let result = res.data.data;
           state.total = result.total;
-            setProjList(result.rows);
+          setProjList(result.rows);
         })
         .catch((err) => {
           console.log("获取待审核项目失败", err);
@@ -244,65 +208,65 @@ export default {
     const setProjList = (tableData) => {
       let data = tableData;
       let array = [];
-      data.map((item,index) => {
-        if(item.type == 3){
-        let obj = {
-          key:index+1,
-          number: item.projectId,
-          name: item.name,
-          belong: item.parentId,
-          sourceBelongName: item.sourceBelongName,
-          manager: item.manager || "-",
-          status:
-            item.status == 0
-              ? "草稿"
-              : item.status == 1
-              ? "待审核"
-              : item.status == 2
-              ? "通过"
-              : item.status == 3
-              ? "发布"
-              : item.status == -1
-              ? "已结束"
-              : item.status == -2
-              ? "拒绝"
-              : "-",
-          creater: item.createName,
-          time: toDate(item.createTime, "Y-M-D h-m"),
-          projectId: item.projectId,
-          createId: item.createId,
-        };
-        array.push(obj);
-      } else {
-        let obj = {
-          key:index+1,
-          number: item.projectId,
-          name: item.name,
-          belong: item.parentId,
-          sourceBelongName: item.sourceBelongName,
-          manager: item.manager || "-",
-          status:
-            item.status == 0
-              ? "草稿"
-              : item.status == 1
-              ? "待审核"
-              : item.status == 2
-              ? "通过"
-              : item.status == 3
-              ? "发布"
-              : item.status == -1
-              ? "已结束"
-              : item.status == -2
-              ? "拒绝"
-              : "-",
-          creater: item.createName,
-          time: toDate(item.createTime, "Y-M-D h-m"),
-          projectId: item.projectId,
-          createId: item.createId,
-          children: item.subList ? setProjList(item.subList) : [] ,
-        };
-        array.push(obj);
-      }
+      data.map((item, index) => {
+        if (item.type == 3) {
+          let obj = {
+            key: index + 1,
+            number: item.projectId,
+            name: item.name,
+            belong: item.parentId,
+            sourceBelongName: item.sourceBelongName,
+            manager: item.manager || "-",
+            status:
+              item.status == 0
+                ? "草稿"
+                : item.status == 1
+                  ? "待审核"
+                  : item.status == 2
+                    ? "通过"
+                    : item.status == 3
+                      ? "发布"
+                      : item.status == -1
+                        ? "已结束"
+                        : item.status == -2
+                          ? "拒绝"
+                          : "-",
+            creater: item.createName,
+            time: toDate(item.createTime, "Y-M-D h-m"),
+            projectId: item.projectId,
+            createId: item.createId,
+          };
+          array.push(obj);
+        } else {
+          let obj = {
+            key: index + 1,
+            number: item.projectId,
+            name: item.name,
+            belong: item.parentId,
+            sourceBelongName: item.sourceBelongName,
+            manager: item.manager || "-",
+            status:
+              item.status == 0
+                ? "草稿"
+                : item.status == 1
+                  ? "待审核"
+                  : item.status == 2
+                    ? "通过"
+                    : item.status == 3
+                      ? "发布"
+                      : item.status == -1
+                        ? "已结束"
+                        : item.status == -2
+                          ? "拒绝"
+                          : "-",
+            creater: item.createName,
+            time: toDate(item.createTime, "Y-M-D h-m"),
+            projectId: item.projectId,
+            createId: item.createId,
+            children: item.subList ? setProjList(item.subList) : [],
+          };
+          array.push(obj);
+        }
       });
       state.tableData1 = array
       return array
@@ -313,9 +277,9 @@ export default {
     };
     const reset = () => {
       state.valueproj = "",
-      state.valuecreater = "",
-      state.valuename = "",
-      state.valueDate = undefined;
+        state.valuecreater = "",
+        state.valuename = "",
+        state.valueDate = undefined;
       getProjList();
     };
     onMounted(() => {
@@ -335,8 +299,10 @@ export default {
 <style lang="scss">
 .projectviewedn {
   width: 100%;
+
   .tmpl {
     width: 100%;
+
     .tmpl_header {
       display: flex;
       flex-wrap: wrap;
@@ -345,33 +311,39 @@ export default {
 
       margin-left: 32px;
       margin-right: 32px;
+
       .tmplh_inp {
         .inpbox {
           display: flex;
           flex-wrap: wrap;
           margin-top: 42px;
+
           .inpbox1 {
             display: flex;
             justify-content: center;
             align-items: center;
             margin-right: 24px;
             margin-top: 10px;
+
             .ant-select-selector {
               border-radius: 8px;
               width: 270px;
               height: 40px;
               padding-top: 5px;
             }
+
             span {
               white-space: nowrap;
             }
           }
         }
       }
+
       .tmplh_btn {
         display: flex;
         // margin-left: 38px;
         margin-top: 32px;
+
         .btn {
           padding: 0px 26px 0px 26px;
           height: 38px;
@@ -382,72 +354,90 @@ export default {
           margin-right: 14px;
           cursor: pointer;
           flex-shrink: 0;
+
           .search {
             background-size: 100%;
           }
+
           .btnText {
             font-size: 14px;
             font-weight: 400;
             line-height: 36px;
             margin-left: 5px;
           }
+
           .btnText1 {
             color: rgb(255, 255, 255);
           }
+
           .btnText2 {
             color: rgba(64, 158, 255, 1);
           }
         }
+
         .btn1 {
           background: #409eff;
+
           .search {
             width: 15px;
             height: 17px;
             background-image: url("../../assets/images/courseManage/search0.png");
           }
         }
+
         .btn2 {
           background: #ffffff;
           border: 1px solid #388be1;
+
           .search {
             width: 16px;
             height: 18px;
             background-image: url("../../assets/images/courseManage/reset1.png");
           }
         }
+
         .btn1:hover {
           background: rgb(255, 255, 255);
           border: 1px solid #388be1;
+
           .search {
             background-image: url("../../assets/images/courseManage/search1.png");
           }
+
           .btnText {
             color: rgba(64, 158, 255, 1);
           }
         }
+
         .btn2:hover {
           background: rgba(64, 158, 255, 1);
+
           .search {
             background-image: url("../../assets/images/courseManage/reset0.png");
           }
+
           .btnText {
             color: #ffffff;
           }
         }
       }
     }
+
     .tmpl_body {
       padding: 0px 30px;
+
       .tmpl_tabbox {
         .operation {
           display: flex;
           justify-content: center;
           align-items: center;
           color: #4ea6ff;
+
           .nselect {
             justify-content: center;
             align-items: center;
             display: flex;
+
             .jc {
               margin-left: 20px;
               white-space: nowrap;
@@ -456,6 +446,7 @@ export default {
           }
         }
       }
+
       .pa {
         width: 100%;
         margin-top: 20px;

From 2df70b61346f4b7d18b06a3d9f9632b155f6d687 Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Wed, 30 Nov 2022 18:43:27 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=BF=85=E5=A1=AB=E5=AD=97=E6=AE=B5=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ProjectAudit.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue
index c4ea5f67..9e587e98 100644
--- a/src/components/drawers/ProjectAudit.vue
+++ b/src/components/drawers/ProjectAudit.vue
@@ -95,6 +95,9 @@
             </div>
           </div>
           <div class="set_content">
+            <div class="sign" style="position:relative;left:70px;top:-3px;">
+              <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+            </div>
             <div class="setc_name"><span>审核意见：</span></div>
             <div class="setc_main">
               <a-textarea v-model:value="valueSuggest" :rows="4" />
@@ -258,6 +261,12 @@ export default {
       state.showDetail = !state.showDetail;
     };
     const subMit = () => {
+
+      if (state.valueSuggest == null || state.valueSuggest == undefined || state.valueSuggest == "") {
+        message.destroy();
+        message.error("请输入审核意见");
+        return
+      }
       auditView({
         createId: props.chooseCreateId,
         createName: props.chooseCreater,