fix:课程预览教师信息展示

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>;
           },
 
         },

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
     };
   },
 };

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;