'..'

package.json

@@ -20,6 +20,7 @@
     "dayjs": "^1.11.6",
     "element-plus": "^2.2.17",
     "element-resize-detector": "^1.2.4",
+    "exceljs": "^4.3.0",
     "html2canvas": "^1.4.1",
     "jquery": "^3.6.1",
     "json-bigint": "^1.0.0",

src/api/indexStu.js

@@ -4,8 +4,7 @@ import http from "./config";
  * 1
  */
 //获取受众信息
-export const getAudienceInfoApi = (obj) =>
+// export const getAudienceInfoApi = (obj) => http.post("/admin/orgStruct/getAudienceInfo", obj);
-  http.post("/admin/orgStruct/getAudienceInfo", obj);
 //获取员工信息
 export const getMemberInfoApi = (obj) =>
   http.post("/admin/orgStruct/getMemberInfo", obj);

src/components/drawers/StuAdd.vue

@@ -551,7 +551,7 @@ import { message } from "ant-design-vue";
 // import { toDate } from "../../api/method";
 // import * as api from '../../api/indexStu'
 import {
-  getAudienceInfoApi,
+  // getAudienceInfoApi,
   getMemberInfoApi,
   getOrgInfoApi,
 } from "@/api/indexStu";
@@ -1239,20 +1239,20 @@ export default {
       if (!state.nameaddd) {
         return false;
       }
-      const item1 = await getAudienceInfoApi({
+      // const item1 = await getAudienceInfoApi({
-        pageNo: state.currentPage2,
+      //   pageNo: state.currentPage2,
-        pageSize: state.pageSize2,
+      //   pageSize: state.pageSize2,
-        keyWord: state.nameaddd,
+      //   keyWord: state.nameaddd,
-      }).then((res) => {
+      // }).then((res) => {
-        if (res.data.code === 200) return res.data.data.rows;
+      //   if (res.data.code === 200) return res.data.data.rows;
-      });
+      // });
-      state.tabledata2 = traverseArr(item1, {
+      // state.tabledata2 = traverseArr(item1, {
-        key: "id",
+      //   key: "id",
-        name: "audienceName",
+      //   name: "audienceName",
-        time: "createTime",
+      //   time: "createTime",
-        number: "countNum",
+      //   number: "countNum",
-        type: "typeName",
+      //   type: "typeName",
-      });
+      // });
     };
     getShouzong();
 

src/utils/commonExcel.js

@@ -0,0 +1,40 @@
+import Exceljs from 'exceljs'
+
+export const commonExport =(headers,datas,fileName) =>{
+
+    const workbook = new Exceljs.Workbook()
+    workbook.created = new Date();
+    const sheet = workbook.addWorksheet("Sheet1",{views: [{ySplit:1,state:'frozen'}]})
+    sheet.columns = headers
+    sheet.addRows(datas)
+    sheet.eachRow({ includeEmpty: true },(row,rowNumber)=>{
+        row.eachCell({ includeEmpty: true },(cell,colNumber)=>{
+            cell.alignment = { vertical: 'middle', horizontal: 'center'}
+            cell.border = {
+                top: {style:'thin'},
+                left: {style:'thin'},
+                bottom: {style:'thin'},
+                right: {style:'thin'}
+            }
+        })
+    })
+
+    downExcel(workbook,fileName)
+}
+
+export const downExcel =  (wb,fileName)=>{
+     wb.xlsx.writeBuffer().then(buffer=>{
+        let blob = new Blob([buffer],{
+            type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+        })
+        let ele = document.createElement('a')
+        ele.style.display = 'none'
+        ele.href = URL.createObjectURL(blob)
+        ele.download = fileName
+        document.body.appendChild(ele)
+        ele.click()
+        document.body.removeChild(ele)
+        URL.revokeObjectURL(ele.href)
+        wb = null
+    })
+}

src/views/courselibrary/CoursewareManage.vue

@@ -305,90 +305,34 @@
     <!-- 查看面授课弹框 end -->
     <!-- 确定新建面授课弹窗 -->
     <!-- 表格 -->
-    <div style="padding: 10px 35px">
+    <div style="padding:10px 35px">
       <a-table
-        :header-cell-style="{ 'text-align': 'center' }"
+        :header-cell-style="{'text-align':'center'}"
         style="border: 1px solid #f2f6fe"
         :columns="columns1"
         :data-source="tableData1"
         :loading="tableLoading"
         :pagination="false"
-        :scroll="{ x: 'max-content' }"
+        :scroll="{x:'max-content'}"
       >
         <template #bodyCell="{ record, column }">
           <template v-if="column.key === 'operation'">
             <a-space>
-              <a-button
+              <a-button v-if="(record.status===0 || record.status===-1 || !record.kkty) && checkPer(record.permissions)" @click="() => handleEdit(record, String(record.courseform))" type="link">编辑</a-button>
-                v-if="
+              <a-button v-if="record.status===2 && checkPer(record.permissions)" @click="() => handleStart(record, String(record.courseform))" type="link">开课</a-button>
-                  (record.status === 0 ||
+              <a-button v-if="record.status===2 && checkPer(record.permissions)" @click="() => handleLook(record, String(record.courseform))" type="link">查看</a-button>
-                    record.status === -1 ||
+              <a-button v-if="record.status===2 && checkPer(record.permissions)" @click="() => handleGuan22(record, String(record.courseform))" type="link">管理</a-button>
-                    !record.kkty) &&
-                  checkPer(record.permissions)
-                "
-                @click="() => handleEdit(record, String(record.courseform))"
-                type="link"
-                >编辑</a-button
-              >
-              <a-button
-                v-if="record.status === 2 && checkPer(record.permissions)"
-                @click="() => handleStart(record, String(record.courseform))"
-                type="link"
-                >开课</a-button
-              >
-              <a-button
-                v-if="record.status === 2 && checkPer(record.permissions)"
-                @click="() => handleLook(record, String(record.courseform))"
-                type="link"
-                >查看</a-button
-              >
-              <a-button
-                v-if="record.status === 2 && checkPer(record.permissions)"
-                @click="() => handleGuan22(record, String(record.courseform))"
-                type="link"
-                >管理</a-button
-              >
               <DropDown  v-if="checkPer(record.permissions)" value="授权">
-                <OwnerTableModelStudent :types="[10, 11, 12]" :id="record.id"
+                <OwnerTableModelStudent :types="[10,11,12]" :id="record.offcourseId">权限名单</OwnerTableModelStudent>
-                  >权限名单</OwnerTableModelStudent
+                <CommonStudent :type="10" :id="record.offcourseId" title="查看权">查看权</CommonStudent>
-                >
+                <CommonStudent :type="11" :id="record.offcourseId" title="管理权">管理权</CommonStudent>
-                <CommonStudent :type="10" :id="record.id" title="查看权"
-                  >查看权</CommonStudent
-                >
-                <CommonStudent :type="11" :id="record.id" title="管理权"
-                  >管理权</CommonStudent
-                >
               </DropDown>
               <DropDown  v-if="checkPer(record.permissions)" value="更多">
-                <a-button
+                <a-button @click="() => handleCopy(record, String(record.courseform))" type="link">复制</a-button>
-                  @click="() => handleCopy(record, String(record.courseform))"
+                <a-button @click="() => handleRejectExit(record, String(record.courseform))" type="link">撤回</a-button>
-                  type="link"
+                <a-button v-if="record.status===2 && record.kkty" @click="() => handleStop(record, String(record.courseform))" type="link">停用</a-button>
-                  >复制</a-button
+                <a-button v-if="record.status===2 && !record.kkty" @click="() => handleOpen(record, String(record.courseform))" type="link">启用</a-button>
-                >
+                <a-button @click="() => handleDelete(record, String(record.courseform))" type="link" danger>删除</a-button>
-                <a-button
-                  @click="
-                    () => handleRejectExit(record, String(record.courseform))
-                  "
-                  type="link"
-                  >撤回</a-button
-                >
-                <a-button
-                  v-if="record.status === 2 && record.kkty"
-                  @click="() => handleStop(record, String(record.courseform))"
-                  type="link"
-                  >停用</a-button
-                >
-                <a-button
-                  v-if="record.status === 2 && !record.kkty"
-                  @click="() => handleOpen(record, String(record.courseform))"
-                  type="link"
-                  >启用</a-button
-                >
-                <a-button
-                  @click="() => handleDelete(record, String(record.courseform))"
-                  type="link"
-                  danger
-                  >删除</a-button
-                >
               </DropDown>
             </a-space>
           </template>
@@ -1162,42 +1106,9 @@
                   :isgetStudent="isgetStudent"
                 >
                   <template #extension="{ data: { record } }">
-                    <a-button
+                    <a-button v-if="record.source === 4 && record.status === 1"  @click="() => {record.status = 0;auditStudent(record);}" type="link">审核通过</a-button>
-                      v-if="record.source === 4 && record.status === 1"
+                    <a-button v-if="record.source === 4 && record.status === 1"  @click="() => {record.status = 2;auditStudent(record);}" type="link">拒绝</a-button>
-                      @click="
+                    <a-button v-if="record.source === 4 && (record.status === 0 || record.status === 2)"  @click="() => {record.status = 1;auditStudent(record);}" type="link">撤回</a-button>
-                        () => {
-                          record.status = 0;
-                          auditStudent(record);
-                        }
-                      "
-                      type="link"
-                      >审核通过</a-button
-                    >
-                    <a-button
-                      v-if="record.source === 4 && record.status === 1"
-                      @click="
-                        () => {
-                          record.status = 2;
-                          auditStudent(record);
-                        }
-                      "
-                      type="link"
-                      >拒绝</a-button
-                    >
-                    <a-button
-                      v-if="
-                        record.source === 4 &&
-                        (record.status === 0 || record.status === 2)
-                      "
-                      @click="
-                        () => {
-                          record.status = 1;
-                          auditStudent(record);
-                        }
-                      "
-                      type="link"
-                      >撤回</a-button
-                    >
                   </template>
                 </TableStudent>
               </div>
@@ -1579,6 +1490,9 @@ import { message } from "ant-design-vue";
 import { useRouter, useRoute } from "vue-router";
 import CommonStudent from "@/components/student/CommonStudent";
 import OwnerTableModelStudent from "@/components/student/OwnerTableModelStudent";
+// import StuAdd from "../../components/drawers/StuAdd";
+// import OwnPower from "../../components/drawers/OwnPower.vue";
+// import Corpowerlist from "../../components/drawers/CorPowerlist.vue";
 import addOnlineCourse from "../../components/Modals/addOnlineCourse.vue";
 
 import ProjOwnerShip from "../../components/drawers/ProjectOwn";
@@ -1630,6 +1544,7 @@ import { useStore } from "vuex";
 import DropDown from "@/components/common/DropDown";
 import { checkPer } from "@/utils/utils";
 import dayjs from "dayjs";
+import { commonExport } from '@/utils/commonExcel'
 
 //列表表格
 const columns1 = [
@@ -1656,7 +1571,7 @@ const columns1 = [
     width: 130,
     dataIndex: "contentTxt",
     ellipsis: true,
-    key: "1",
+    key: "contentTxt",
     align: "center",   
   },
   {
@@ -2636,7 +2551,7 @@ export default defineComponent({
       assessment: {},
       assessmentId: null,
       workName: null,
-      EditTestId: null,
+      EditTestId: 0,
       testName: null,
       assessmentName: "",
       assessmentVisible: false,
@@ -3055,17 +2970,16 @@ export default defineComponent({
     function findClassFullName(list, classify, name = "") {
       return (
         (list &&
-          list.length &&
+          list.length > 0 &&
-          list
+          list.map((e) =>
-            .map((e) =>
+              classify == e.code
-              classify == e.dictCode
                 ? name
-                  ? name + "-" + e.dictName
+                  ? name + "-" + e.name
-                  : e.dictName
+                  : e.name
                 : findClassFullName(
                     e.children,
                     classify,
-                    name ? name + "-" + e.dictName : e.dictName
+                    name ? name + "-" + e.name : e.name
                   )
             )
             .filter((name) => name)
@@ -3241,7 +3155,7 @@ export default defineComponent({
       console.log(e);
     };
     const logT = (e) => {
-      state.EditTestId = null;
+      state.EditTestId = 0;
       console.log(e);
     };
     const removePG = () => {
@@ -3419,14 +3333,16 @@ export default defineComponent({
       if (state.selectTime) {
         // beginTime = parseInt(new Date(state.selectTime[0].$d).getTime() / 1000);
         // endTime = parseInt(new Date(state.selectTime[1].$d).getTime() / 1000);
-        beginTime = toDate(
+        beginTime = dayjs(state.selectTime[0]).format('YYYY-MM-DD HH:mm:ss')
-          new Date(state.selectTime[0].$d).getTime() / 1000,
+        // toDate(
-          "Y-M-D h:m:s"
+        //   new Date(state.selectTime[0].$d).getTime() / 1000,
-        );
+        //   "Y-M-D h:m:s"
-        endTime = toDate(
+        // );
-          new Date(state.selectTime[1].$d).getTime() / 1000,
+        endTime = dayjs(state.selectTime[1]).format('YYYY-MM-DD HH:mm:ss')
-          "Y-M-D h:m:s"
+        // toDate(
-        );
+        //   new Date(state.selectTime[1].$d).getTime() / 1000,
+        //   "Y-M-D h:m:s"
+        // );
       }
       let obj = {
         pageNo: state.currentPage222,
@@ -3695,7 +3611,7 @@ export default defineComponent({
       state.xjkkinputV4 = null;
       state.checked1 = false;
       state.checked4 = false;
-      state.EditTestId = null;
+      state.EditTestId = 0;
       state.assessmentId = null;
       state.assessmentName = "";
       state.EditWorkId = null;
@@ -3705,18 +3621,24 @@ export default defineComponent({
     //保存开课
 
     const handleSureStu = () => {
+      let startTime,
+        endTime = 0;
+      if (state.xjkkinputV3) {
+        startTime = dayjs(state.xjkkinputV3[0]).format('YYYY-MM-DD HH:mm:ss')    //parseInt(state.xjkkinputV3[0].$d.getTime() / 1000);
+        endTime = dayjs(state.xjkkinputV3[1]).format('YYYY-MM-DD HH:mm:ss') //parseInt(state.xjkkinputV3[1].$d.getTime() / 1000);
+      }
       let t = state.signCom ? "1," : "0,";
       let p = state.comLeave ? "1" : "0";
       let type = t.concat(p);
       const postData = {
         offcourseId: state.offcourseId,
-        offcoursePlanId: state.offcoursePlanId, //开课ID,不传代表新增
+        id: state.offcoursePlanId, //开课ID,不传代表新增
         address: state.xjkkinputV2,
         applyFlag: state.checked1 ? 1 : 0,
         attach: state.attach,
-        beginTime: dayjs(state.xjkkinputV3[0]).format("YYYY-MM-DD HH:mm:ss"),
+        beginTime: startTime,
-        endTime: dayjs(state.xjkkinputV3[1]).format("YYYY-MM-DD HH:mm:ss"),
         completeType: type,
+        endTime: endTime,
         evalFlag: Number(state.assessmentId) > 0 && state.checked4 ? 1 : 0,
         evaluateId: Number(state.assessmentId),
         testId: state.EditTestId,
@@ -3802,7 +3724,7 @@ export default defineComponent({
           item.completeType.split(",")[1] == "1" ? true : false),
         (state.checked4 = item.evalFlag === 1 ? true : false);
       state.assessmentId = String(item.evaluateId);
-      state.EditTestId = String(item.testId);
+      state.EditTestId = Number(item.testId);
       state.EditWorkId = String(item.homeWorkId);
       state.xjkkinputV1 = item.name;
       if (item.signFlag === 1) {
@@ -4002,12 +3924,9 @@ export default defineComponent({
     //确认复制课程 操作
     const handleDeleteExit = async () => {
       state.addLoading = true;
-      console.log(
+
-        "开课的复制删除面授id及开课id",
-        state.offcourseId,
-        state.offcoursePlanId
-      );
       if (state.del_hs) {
+        console.log(11111111);
         if (state.offcourseId && state.offcoursePlanId && state.studentId) {
           console.log(111111);
           handleStudent({
@@ -4049,15 +3968,13 @@ export default defineComponent({
       if (state.copy_hs) {
         console.log(2222222);
         if (state.offcourseId && state.offcoursePlanId) {
-          copyCoursePlan({ offcoursePlanId: state.offcoursePlanId }).then(
+          copyCoursePlan({offcoursePlanId:state.offcoursePlanId}).then(() => {
-            () => {
             message.destroy();
             message.success("复制成功");
             getTableDate3();
             delete_exit1();
             rest();
-            }
+          });
-          );
         } else if (state.offcourseId) {
           console.log(87887);
           // 拿数据
@@ -4136,37 +4053,81 @@ export default defineComponent({
         endTime = parseInt(new Date(state.projectTime[1].$d).getTime() / 1000);
       }
 
-      window.open(
-        `${process.env.VUE_APP_BASE_API}/admin/offcourse/export?pageNo=${
-          state.currentPage1
-        }&pageSize=${state.pageSize1}&auditStatus=${
-          state.auditStatus ? state.auditStatus : ""
-        }&sysTypeId=${state.sysTypeId ? state.sysTypeId : ""}&projectName=${
-          state.projectName ? state.projectName : ""
-        }&name=${state.name ? state.name : ""}&createName=${
-          state.createName ? state.createName : ""
-        }&endTime=${endTime ? endTime : ""}&beginTime=${
-          startTime ? startTime : ""
-        }&type=3`
-      );
 
-      {
+      list({
-        /* exportP({
+        pageNo: 1,
-        pageNo: state.currentPage1,
+        pageSize: 100000,
-        pageSize: state.pageSize1,
         auditStatus: state.auditStatus,
-        categoryId: state.categoryId,
+        // categoryId: state.categoryId,
+        sysTypeId: state.sysTypeId,
         projectName: state.projectName,
         name: state.name,
         createName: state.createName,
         endTime: endTime,
         beginTime: startTime,
-      }).then((res) => {
+      }).then(res=>{
-        if (res.data.code === 200) {
+           let list =  res.data.data.rows.map(s=>{
-          message.success("导出成功");
+            s.contentTxt = findClassFullName(sysTypeOptions.value, s.sysTypeId) || "-";
-        }
+            s.typeName = '面授'
-      }); */
+            s.publishStatusText = s.publishStatus === 0?'未发布':'已发布'
-      }
+            s.statusText = s.status === 0?'否':'是'
+            s.auditStatusText = s.auditStatus === 0?'未提交': s.auditStatus === 1?'待审核':s.auditStatus === 2?'已审核':s.auditStatus === -1?"审核未通过":''
+            return s
+           })
+           console.log(list)
+           let heads = [
+              { header: '名称', key: 'name', width: 18 },
+              { header: '类型', key: 'typeName', width: 10 },
+              { header: '归属路径图', key: 'routerName', width: 13 },
+              { header: '归属项目', key: 'projectName', width: 13 },
+              { header: '内容分类', key: 'contentTxt', width: 20 },
+              // { header: '一级分类', key: 'firstLevelCategory', width: 10 },
+              // { header: '二级分类', key: 'secondLevelCategory', width: 10 },
+              // { header: '三级分类', key: 'thirdLevelCategory', width: 10 },
+              { header: '开课次数', key: 'planCnt', width: 10 },
+              { header: '学习人数', key: 'studentCnt', width: 10 },
+              { header: '评分', key: 'score', width: 10 },
+              { header: '状态', key: 'auditStatusText', width: 20 },
+              { header: '是否发布', key: 'publishStatusText', width: 10 },
+              { header: '创建人', key: 'createName', width: 10 },
+              { header: '创建时间', key: 'createTime', width: 22 },
+              { header: '上线时间', key: 'publishTime', width: 22 },
+              { header: '是否停用', key: 'statusText', width: 10 },              
+           ]
+           commonExport(heads,list,"课程导出")
+      })
+
+      // window.open(
+      //   `${process.env.VUE_APP_BASE_API}/admin/offcourse/export?pageNo=${
+      //     state.currentPage1
+      //   }&pageSize=${state.pageSize1}&auditStatus=${
+      //     state.auditStatus ? state.auditStatus : ""
+      //   }&sysTypeId=${state.sysTypeId ? state.sysTypeId : ""}&projectName=${
+      //     state.projectName ? state.projectName : ""
+      //   }&name=${state.name ? state.name : ""}&createName=${
+      //     state.createName ? state.createName : ""
+      //   }&endTime=${endTime ? endTime : ""}&beginTime=${
+      //     startTime ? startTime : ""
+      //   }&type=3`
+      // );
+
+      // {
+      //   /* exportP({
+      //   pageNo: state.currentPage1,
+      //   pageSize: state.pageSize1,
+      //   auditStatus: state.auditStatus,
+      //   categoryId: state.categoryId,
+      //   projectName: state.projectName,
+      //   name: state.name,
+      //   createName: state.createName,
+      //   endTime: endTime,
+      //   beginTime: startTime,
+      // }).then((res) => {
+      //   if (res.data.code === 200) {
+      //     message.success("导出成功");
+      //   }
+      // }); */
+      // }
     };
     //获取教师
     const getTea = async () => {
@@ -4217,7 +4178,7 @@ export default defineComponent({
       if (type === "1") {
         return;
       }
-      console.log("编辑面授课信息", itm, type);
+      // console.log(itm)
       state.offcourseId = itm.id;
 
       const item = await detail({
@@ -4330,7 +4291,7 @@ export default defineComponent({
       state.copy_hs = true;
     };
     const handleCopyP = async (itm) => {
-      console.log("开课复制", itm);
+      console.log(itm);
       state.offcourseId = itm.offcourseId;
       state.offcoursePlanId = itm.id;
 
@@ -4366,8 +4327,7 @@ export default defineComponent({
       });
     };
     const handleStart = (item, type) => {
-      console.log("点击开课item", item);
+      console.log(item);
-      // console.log(item);
       if (type === "1") {
         return;
       }
@@ -4465,7 +4425,6 @@ export default defineComponent({
 
     // 管理开课
     const handleGuan22 = (item) => {
-      console.log("点击管理信息", item);
       if (String(item.courseform) === "1") {
         return;
       }
@@ -4702,16 +4661,13 @@ export default defineComponent({
 
     //二维码
     const qrcodeVisible = (record, type) => {
-      console.log("点击签到信息", record);
       state.codevisible = true;
       state.codeInfo = {
         title: type == 1 ? "【课程】二维码" : "【签到】二维码",
         name: record.name ? record.name : "",
         url:
           type == 1
-            ? window.location.protocol +
+            ? window.location.protocol + process.env.VUE_APP_COURSE_STUDY + record.offcourseId
-              process.env.VUE_APP_COURSE_STUDY +
-              record.offcourseId
             : process.env.VUE_APP_BASE_API +
               `/admin/student/studentSign?taskId=${
                 record.id

src/views/courselibrary/CoursewareManage_Old.vue

@@ -4803,8 +4803,7 @@ export default defineComponent({
       let type = t.concat(p);
       const postData = {
         offcourseId: state.offcourseId,
-        offcoursePlanId: state.offcoursePlanId, //开课ID,不传代表新增
+        id: state.offcoursePlanId, //开课ID,不传代表新增
-
         address: state.xjkkinputV2,
         applyFlag: state.checked1 ? 1 : 0,
         attach: state.filesList.length ? state.filesList.join(",") : "",

src/views/courselibrary/courseModal.vue

@@ -1,30 +1,15 @@
 <!-- 确定新建面授课弹窗 -->
 <template>
-  <a-modal
+	<a-modal v-model:visible="ft_hs" title="Title" :footer="null" :closable="false"
-    v-model:visible="ft_hs"
+		wrapClassName="modalStyle facteachModal" width="80%" @cancel="visibleClose" @ok="handlePush">
-    title="Title"
-    :footer="null"
-    :closable="false"
-    wrapClassName="modalStyle facteachModal"
-    width="80%"
-    @cancel="visibleClose"
-    @ok="handlePush"
-  >
 		<div class="modalHeader">
 			<div class="headerLeft">
-        <img
+				<img style="width: 17px; height: 18px; margin-right: 8px" src="@/assets/images/basicinfo/add.png" />
-          style="width: 17px; height: 18px; margin-right: 8px"
-          src="@/assets/images/basicinfo/add.png"
-        />
 				<span v-if="ft_eidt" class="headerLeftText">编辑面授课</span>
 				<span v-else class="headerLeftText">新建面授课</span>
 			</div>
 			<div style="margin-right: 57px; cursor: pointer">
-        <img
+				<img @click="noEditClose" style="width: 22px; height: 22px" src="@/assets/images/basicinfo/close22.png" />
-          @click="noEditClose"
-          style="width: 22px; height: 22px"
-          src="@/assets/images/basicinfo/close22.png"
-        />
 			</div>
 		</div>
 		<div class="modalMain">
@@ -41,25 +26,14 @@
 							<div class="mbl_items">
 								<div class="item_nam">
 									<div class="asterisk_icon">
-                    <img
+										<img src="@/assets/images/coursewareManage/asterisk.png" alt="asterisk" />
-                      src="@/assets/images/coursewareManage/asterisk.png"
-                      alt="asterisk"
-                    />
 									</div>
 									<span style="margin-right: 14px">课程名称</span>
 								</div>
 								<div class="item_inp">
 									<div class="i1_input">
-                    <NameInput
+										<NameInput ref="inputRef" placeholder="请输入课程名称" v-model:value="qdms_inputV1"
-                      ref="inputRef"
+											v-model:validate="validate" :maxlength="20" show-count :type="2" :id="offcourseId"></NameInput>
-                      placeholder="请输入课程名称"
-                      v-model:value="qdms_inputV1"
-                      v-model:validate="validate"
-                      :maxlength="20"
-                      show-count
-                      :type="2"
-                      :id="offcourseId"
-                    ></NameInput>
 										<!--                    <a-input-->
 										<!--                        v-model:value="qdms_inputV1"-->
 										<!--                        maxlength="90"-->
@@ -79,30 +53,17 @@
 									<div class="i2_left">
 										<span style="color: #999ba3">课程命名规则</span>
 									</div>
-                  <div
+									<div class="i2_right" @click="hideShow" style="cursor: pointer">
-                    class="i2_right"
+										<div class="b_zk" :style="{ display: hideshow ? 'block' : 'none' }">
-                    @click="hideShow"
-                    style="cursor: pointer"
-                  >
-                    <div
-                      class="b_zk"
-                      :style="{ display: hideshow ? 'block' : 'none' }"
-                    >
 											<span style="color: #4ea6ff">收起</span>
 										</div>
-                    <div
+										<div class="b_sq" :style="{ display: hideshow ? 'none' : 'block' }">
-                      class="b_sq"
-                      :style="{ display: hideshow ? 'none' : 'block' }"
-                    >
 											<span style="color: #4ea6ff">展开</span>
 										</div>
 										<div class="b_icon"></div>
 									</div>
 								</div>
-                <div
+								<div class="i2_detail" :style="{ display: hideshow ? 'block' : 'none' }">
-                  class="i2_detail"
-                  :style="{ display: hideshow ? 'block' : 'none' }"
-                >
 									<span style="color: #999ba3">
 										1、课程名称统一不加书名号。<br />
 										2、项目名称、属地等信息如需体现在课程名称中，请放在课程名称信息
@@ -114,38 +75,17 @@
 								</div>
 							</div>
 							<div class="mbl_items2">
-                <div class="item_nam" style="margin-top: 8px">
+								<div class="item_nam" style="margin-top: 8px;">
 									<div class="asterisk_icon">
-                    <img
+										<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                      src="@/assets/images/coursewareManage/asterisk.png"
-                      alt=""
-                    />
 									</div>
 									<span style="margin-right: 14px">封面图</span>
 								</div>
 								<div class="item_inp">
-                  <div
+									<div style="width:440px;height:70px;display: flex;justify-content: flex-start;align-items: center;">
-                    style="
+										<img v-for="(item, index) in optionsUrl" :key="index" class="choiceoptionurl"
-                      width: 440px;
+											:style="item.value == feng_mian_1 ? 'border:3px solid rgb(78, 166, 255);' : ''" :src="item.value"
-                      height: 70px;
+											:alt="item.name" @click="choicePic(item.value)" />
-                      display: flex;
-                      justify-content: flex-start;
-                      align-items: center;
-                    "
-                  >
-                    <img
-                      v-for="(item, index) in optionsUrl"
-                      :key="index"
-                      class="choiceoptionurl"
-                      :style="
-                        item.value == feng_mian_1
-                          ? 'border:3px solid rgb(78, 166, 255);'
-                          : ''
-                      "
-                      :src="item.value"
-                      :alt="item.name"
-                      @click="choicePic(item.value)"
-                    />
 									</div>
 									<!-- <a-select
                     :getPopupContainer="
@@ -161,13 +101,8 @@
                     allowClear
                     showSearch
                   /> -->
-                  <img
+									<img class="i_upload_img" v-if="feng_mian_1" :src="feng_mian_1"
-                    class="i_upload_img"
+										style="width:220px;height:120px;border-radius: 8px;" alt="avatar" />
-                    v-if="feng_mian_1"
-                    :src="feng_mian_1"
-                    style="width: 220px; height: 120px; border-radius: 8px"
-                    alt="avatar"
-                  />
 									<div class="i_bottom">
 										<span style="color: #999ba3">
 											高宽比为16:9 (如:800*450) png或jpg图片
@@ -178,22 +113,14 @@
 							<div class="mbl_items">
 								<div class="item_nam">
 									<div class="asterisk_icon">
-                    <img
+										<img style="width: 10px; height: 10px" src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-                      style="width: 10px; height: 10px"
-                      src="@/assets/images/coursewareManage/asterisk.png"
-                      alt=""
-                    />
 									</div>
 									<span style="margin-right: 14px">目标人群</span>
 								</div>
 								<div class="item_inp">
 									<div class="i1_input">
-                    <a-input
+										<a-input v-model:value="qdms_inputV2" maxlength="50"
-                      v-model:value="qdms_inputV2"
+											style="width: 440px; height: 40px; border-radius: 8px" placeholder="请输入目标人群" />
-                      maxlength="50"
-                      style="width: 440px; height: 40px; border-radius: 8px"
-                      placeholder="请输入目标人群"
-                    />
 										<div class="inp_num">
 											<span style="color: #c7cbd2">
 												{{ qdms_inputV2.length }}/50
@@ -205,68 +132,49 @@
 							<div class="mbl_items">
 								<div class="item_nam">
 									<div class="asterisk_icon">
-                    <img
+										<img src="@/assets/images/coursewareManage/asterisk.png" alt="asterisk" />
-                      src="@/assets/images/coursewareManage/asterisk.png"
-                      alt="asterisk"
-                    />
 									</div>
 									<span style="margin-right: 14px">内容分类</span>
 								</div>
 								<div class="item_inp">
 									<div class="select i6_input">
-                    <a-tree-select
+										<a-tree-select style="width: 440px" placeholder="请选择内容分类" :treeDefaultExpandAll="true"
-                      style="width: 440px"
+											             :getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
-                      placeholder="请选择内容分类"
-                      :treeDefaultExpandAll="true"
-                      :getPopupContainer="
-                        (triggerNode) => triggerNode.parentNode || document.body
-                      "
                                    v-model:value="fen_lei"
                                    :tree-data="sysTypeOptions"
                                    :fieldNames="{
                                           children: 'children',
                                           label: 'name',
                                           value: 'code',
-                      }"
+                                        }">
-                    >
 										</a-tree-select>
 									</div>
 								</div>
 							</div>
 							<div v-if="fen_lei" class="mbl_items">
 								<div class="item_nam">
-                  <div class="asterisk_icon"></div>
+									<div class="asterisk_icon">
+									</div>
 									<span style="margin-right: 14px"> </span>
 								</div>
 								<div class="item_inp">
 									<div class="select i6_input">
-                    <div
+										<div style="width:440px;height:26px;font-size: 14px;color: rgb(153, 155, 163);">
-                      style="
-                        width: 440px;
-                        height: 26px;
-                        font-size: 14px;
-                        color: rgb(153, 155, 163);
-                      "
-                    >
 											所属层级：{{ fen_lei1 }}
 										</div>
 									</div>
 								</div>
 							</div>
 							<div class="mbl_items">
-                <div class="item_nam" style="margin-bottom: 110px">
+								<div class="item_nam" style="margin-bottom:110px;">
 									<span style="margin-right: 14px">课程价值</span>
 								</div>
 								<div class="item_inp">
 									<div class="i1_input">
-                    <a-textarea
+										<a-textarea v-model:value="qdms_inputV3" maxlength="200"
-                      v-model:value="qdms_inputV3"
+											style="width: 440px; height: 140px; border-radius: 8px" placeholder="请输入课程价值" />
-                      maxlength="200"
+										<div class="inp_num" style="top:110px;">
-                      style="width: 440px; height: 140px; border-radius: 8px"
+											<span style="color: #c7cbd2;">
-                      placeholder="请输入课程价值"
-                    />
-                    <div class="inp_num" style="top: 110px">
-                      <span style="color: #c7cbd2">
 												{{ qdms_inputV3.length }}/200
 											</span>
 										</div>
@@ -280,12 +188,8 @@
 								</div>
 								<div class="item_inp">
 									<div class="i1_input">
-                    <a-input
+										<a-input v-model:value="chang_jin" maxlength="50"
-                      v-model:value="chang_jin"
+											style="width: 440px; height: 40px; border-radius: 8px" placeholder="请输入场景" />
-                      maxlength="50"
-                      style="width: 440px; height: 40px; border-radius: 8px"
-                      placeholder="请输入场景"
-                    />
 										<div class="inp_num">
 											<span style="color: #c7cbd2">
 												{{ chang_jin.length }}/50
@@ -310,19 +214,10 @@
 									<span style="margin-right: 14px">内容标签</span>
 								</div>
 								<div class="item_inp">
-                  <a-input
+									<a-input v-model:value="tags_val_single" style="width: 440px; height: 40px; border-radius: 8px"
-                    v-model:value="tags_val_single"
+										placeholder="请输入内容标签按回车键添加内容标签，可添加多个内容标签。" @pressEnter="handleTagChange" />
-                    style="width: 440px; height: 40px; border-radius: 8px"
-                    placeholder="请输入内容标签按回车键添加内容标签，可添加多个内容标签。"
-                    @pressEnter="handleTagChange"
-                  />
 									<div class="tag-content">
-                    <a-tag
+										<a-tag v-for="(item, index) in tags_val" :key="index" closable @close="handleTagClose(item)">
-                      v-for="(item, index) in tags_val"
-                      :key="index"
-                      closable
-                      @close="handleTagClose(item)"
-                    >
 											{{ item }}
 										</a-tag>
 									</div>
@@ -349,23 +244,16 @@
 -->
 
 							<div class="mbl_items2">
-                <div class="item_nam" style="margin-top: 8px">
+								<div class="item_nam" style="margin-top: 8px;">
 									<div class="asterisk_icon">
-                    <img
+										<img src="@/assets/images/coursewareManage/asterisk.png" alt="asterisk" />
-                      src="@/assets/images/coursewareManage/asterisk.png"
-                      alt="asterisk"
-                    />
 									</div>
 									<span style="margin-right: 14px">课程简介</span>
 								</div>
 								<div class="item_inp">
 									<div class="i10_textarea">
-                    <a-textarea
+										<a-textarea v-model:value="qdms_inputV6" maxlength="150"
-                      v-model:value="qdms_inputV6"
+											style="width: 440px; height: 100px; border-radius: 8px" placeholder="请输入" />
-                      maxlength="150"
-                      style="width: 440px; height: 100px; border-radius: 8px"
-                      placeholder="请输入"
-                    />
 										<div class="inp_num">
 											<span style="color: #c7cbd2">
 												{{ qdms_inputV6.length }}/150
@@ -375,7 +263,7 @@
 								</div>
 							</div>
 							<div class="mbl_items">
-                <div class="item_nam" style="margin-top: 8px">
+								<div class="item_nam" style="margin-top: 8px;">
 									<span style="margin-right: 10px">附件</span>
 								</div>
 								<div class="item_inp">
@@ -390,19 +278,10 @@
 						</div>
 						<div v-if="ft_hs" class="fotarea">
 							<div style="border: 1px solid #ccc">
-                <Toolbar
+								<Toolbar style="border-bottom: 1px solid #ccc" :editor="editorRef" :defaultConfig="toolbarConfig"
-                  style="border-bottom: 1px solid #ccc"
+									:mode="mode" />
-                  :editor="editorRef"
+								<Editor style="height: 250px; overflow-y: hidden" v-model="valueHtml" :defaultConfig="editorConfig"
-                  :defaultConfig="toolbarConfig"
+									:mode="mode" @onCreated="handleCreated" />
-                  :mode="mode"
-                />
-                <Editor
-                  style="height: 250px; overflow-y: hidden"
-                  v-model="valueHtml"
-                  :defaultConfig="editorConfig"
-                  :mode="mode"
-                  @onCreated="handleCreated"
-                />
 							</div>
 						</div>
 					</div>
@@ -494,49 +373,33 @@ export default defineComponent({
     const sysTypeOptions = computed(() => store.state.content_type);
     const optionsUrl = computed(() => store.state.course_pic);
 
-    watch(
+    watch(()=>state.fen_lei,()=>{
-      () => state.fen_lei,
+      state.fen_lei1 = findClassFullName(sysTypeOptions.value)
-      () => {
-        state.fen_lei1 = findClassFullName(sysTypeOptions.value);
-      }
-    );
-
-    function findClassFullName(list, name = "") {
-      return (
-        list &&
-        list.length &&
-        list
-          .map((e) => {
-            return state.fen_lei === e.code
-              ? name
-                ? name + "-" + e.name
-                : e.name
-              : findClassFullName(
-                  e.children,
-                  name ? name + "-" + e.name : e.name
-                );
     })
-          .filter((name) => name)
+
-          .join("")
+    function findClassFullName(list,name=''){
-      );
+		
+     return list && list.length > 0 && list.map(e=>{
+       return  state.fen_lei === e.code ? name?name+'-'+e.name:e.name : findClassFullName(e.children,name?name+'-'+e.name:e.name)
+      }).filter(name=>name).join('')
     }
 
 		// 删除文件返回参数
 		const changevalue = (e) => {
-      let arr = state.attach.split(",");
+			let arr = state.attach.split(',')
-      let newarr = [];
+			let newarr = []
 			for (let i = 0; i < arr.length; i++) {
 				if (i !== e) {
-          newarr.push(arr[i]);
+					newarr.push(arr[i])
 				}
 			}
 			if (newarr.length == 0) {
 				state.attach = "";
 			} else {
-        state.attach = newarr.toString();
+				state.attach = newarr.toString()
+			}
+			console.log('changevalue', e, newarr, state.attach)
 		}
-      console.log("changevalue", e, newarr, state.attach);
-    };
 
 		const visibleOpen = (offcourseId, name) => {
 			state.offcourseId = offcourseId;
@@ -564,7 +427,7 @@ export default defineComponent({
 			state.ft_hs = false;
 			ft_exit();
 			emit("noEdit");
-    };
+		}
 
 		expose({
 			visibleOpen,
@@ -651,7 +514,7 @@ export default defineComponent({
 		// 点击图片选择图片
 		const choicePic = (value) => {
 			state.feng_mian_1 = value;
-    };
+		}
 
 		//获取分类、场景、封面图、-----------字典配置-------------------------------
 		const options2 = ref([]);
@@ -689,14 +552,11 @@ export default defineComponent({
 			}
 			files = files.slice(0, files.length - 1);
 			console.log("filesfiles", files);
+			const offName = await validateName({ name: state.qdms_inputV1, type: 2, id: state.offcourseId }).then(res => {
 					
-      const offName = await validateName({
+					return res.data.data === 1;
-        name: state.qdms_inputV1,
-        type: 2,
-        id: state.offcourseId,
-      }).then((res) => {
-        return res.data.data == 1;
 			});
+			console.log('校验重复',offName)
 			if (offName) {
 				message.destroy();
 				return message.warning("课程名称重复，请重新填写");
@@ -788,9 +648,7 @@ export default defineComponent({
 				});
 				if (res.rows && res.rows.length > 0) {
 					let i = res.rows.length;
-          state.auditDescription = res.rows[i - 1].description
+					state.auditDescription = res.rows[i - 1].description ? res.rows[i - 1].description : "-";
-            ? res.rows[i - 1].description
-            : "-";
 				}
 			}
 
@@ -800,19 +658,17 @@ export default defineComponent({
 			state.qdms_inputV3 = item.meaning;
 			// state.fen_lei = item.categoryId;
 			state.fen_lei = item.sysTypeId;
-      state.chang_jin = String(item.sceneContent ? item.sceneContent : "");
+			state.chang_jin = String(item.sceneContent ? item.sceneContent : '');
 			state.tags_val = item.tips ? item.tips.split(",") : [];
 			state.qdms_inputV6 = item.intro;
 			state.member = { value: item.teacherId, name: item.teacher };
 			valueHtml.value = item.outline;
-      let arrss = item.attach.split(",");
+			let arrss = item.attach.split(',')
-      let str = "";
+			let str = ''
 			for (let i = 0; i < arrss.length; i++) {
-        i == arrss.length - 1
+				i == arrss.length - 1 ? str += arrss[i].slice(arrss[i].lastIndexOf('/') + 1) : str += arrss[i].slice(arrss[i].lastIndexOf('/') + 1) + ','
-          ? (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1))
-          : (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1) + ",");
 			}
-      console.log(str);
+			console.log(str)
 			state.attach = str;
 		};
 
@@ -829,7 +685,11 @@ export default defineComponent({
 
 		//提交审核
 		const reviewClick = () => {
+			if(state.offcourseId){
+				submitReview(state.offcourseId)
+			}else{
 				handlePush("review");
+			}
 		};
 		const submitReview = (id) => {
 			state.addLoading = true;
@@ -1105,12 +965,12 @@ export default defineComponent({
 									}
 								}
 							}
-              .fujian {
+							.fujian{
 								display: none;
 							}
 							.mbl_items12 {
 								width: 440px;
-                margin-right: 56px;
+								margin-right:56px;
 
 								.i12_box1 {
 									display: flex;

src/views/examine/CourseReviewedN.vue

@@ -20,6 +20,7 @@
 									label: 'name',
 									value: 'code',
 								}"
+								allow-clear
 								:getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
 								v-model:value="valueproj" 
 								show-search 
@@ -252,8 +253,8 @@ export default {
 									onClick={() => {
 										showAudit(
 											value.record.createId,
-											value.record.creater,
+											value.record.createName,
-											value.record.offId
+											value.record.id
 										);
 									}}
 								>
@@ -578,9 +579,9 @@ export default {
 			state.currentPage = pagina;
 			getFaceList();
 		};
-		const showAudit = (id, creater, offId) => {
+		const showAudit = (createId, creater, offId) => {
 			state.courAuditModal = true;
-			state.chooseId = id;
+			state.chooseId = createId;
 			state.chooseCreater = creater;
 			state.chooseOffId = offId;
 			getFaceList();