'..'

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) &&
+              <DropDown  v-if="checkPer(record.permissions)" value="授权">
-                  checkPer(record.permissions)
+                <OwnerTableModelStudent :types="[10,11,12]" :id="record.offcourseId">权限名单</OwnerTableModelStudent>
-                "
+                <CommonStudent :type="10" :id="record.offcourseId" title="查看权">查看权</CommonStudent>
-                @click="() => handleEdit(record, String(record.courseform))"
+                <CommonStudent :type="11" :id="record.offcourseId" title="管理权">管理权</CommonStudent>
-                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
-                >
-                <CommonStudent :type="10" :id="record.id" title="查看权"
-                  >查看权</CommonStudent
-                >
-                <CommonStudent :type="11" :id="record.id" title="管理权"
-                  >管理权</CommonStudent
-                >
               </DropDown>
-              <DropDown v-if="checkPer(record.permissions)" value="更多">
+              <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";
@@ -1599,7 +1513,7 @@ import {
   addStudent,
   studentExport,
   handleStudent,
-  getMemberInfoApi,
+  getMemberInfoApi, 
   copyCoursePlan,
 } from "@/api/indexCourse";
 import {
@@ -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,8 +1571,8 @@ const columns1 = [
     width: 130,
     dataIndex: "contentTxt",
     ellipsis: true,
-    key: "1",
+    key: "contentTxt",
-    align: "center",
+    align: "center",   
   },
   {
     title: "课程形式",
@@ -2211,10 +2126,10 @@ export default defineComponent({
   setup() {
     const CourseModalRef = ref(null);
     const store = useStore();
-
+  
     const state = reactive({
       tableLoading: false,
-      //新加
+      //新加  
       stuColumns: [
         {
           title: "岗位",
@@ -2636,7 +2551,7 @@ export default defineComponent({
       assessment: {},
       assessmentId: null,
       workName: null,
-      EditTestId: null,
+      EditTestId: 0,
       testName: null,
       assessmentName: "",
       assessmentVisible: false,
@@ -3018,7 +2933,7 @@ export default defineComponent({
       console.log(res.data.data);
       state.tableDataTotal1 = total;
       for (let i = 0; i < rows.length; i++) {
-        rows[i].num = i + 1 + (state.currentPage1 - 1) * 10;
+        rows[i].num = i + 1 + (state.currentPage1 - 1) * 10;        
       }
       const datas = traverseArr(
         rows,
@@ -3044,7 +2959,7 @@ export default defineComponent({
 
       datas.forEach((itm) => {
         itm.pageNo = pageNo;
-        itm.contentTxt =
+        itm.contentTxt = 
           findClassFullName(sysTypeOptions.value, itm.sysTypeId) || "-";
       });
       state.tableData1 = datas;
@@ -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,
@@ -3743,9 +3665,9 @@ export default defineComponent({
       }
       state.addLoading = true;
       editPlan(postData).then(() => {
-        getTableDate3();
+          getTableDate3();
-        handleCancelStu();
+          handleCancelStu();
-        rest();
+          rest();
         state.addLoading = false;
       });
     };
@@ -3753,7 +3675,7 @@ export default defineComponent({
     //编辑开课
     const handelEditStu = async (item) => {
       state.offcourseId = item.offcourseId;
-      state.offcoursePlanId = item.id;
+      state.offcoursePlanId = item.id;    
 
       if (item.evaluateId) {
         api
@@ -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) {
@@ -3810,14 +3732,14 @@ export default defineComponent({
         state.xjkkradioV1 = 0;
       }
       /*
-			if (item.signWordFlag === 1) {
+            if (item.signWordFlag === 1) {
-				//签到是否需要口令:1是0否
+                //签到是否需要口令:1是0否
-				state.xjkkradioV1 = 1;
+                state.xjkkradioV1 = 1;
-			}
+            }
-			if (item.signFlag === 0 && item.signWordFlag === 0) {
+            if (item.signFlag === 0 && item.signWordFlag === 0) {
-				state.xjkkradioV1 = "";
+                state.xjkkradioV1 = "";
-			}
+            }
-			*/
+            */
       state.member = { value: item.teacherId, name: item.teacher };
 
       state.cstm_hs = true;
@@ -3910,7 +3832,7 @@ export default defineComponent({
       handle({
         offcourseId: state.offcourseId,
         type: 0,
-      }).then((res) => {
+      }).then((res) => {  
         if (res.data.code === 200) {
           getTableDate();
         }
@@ -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.destroy();
+            message.success("复制成功");
-              message.success("复制成功");
+            getTableDate3();
-              getTableDate3();
+            delete_exit1();
-              delete_exit1();
+            rest();
-              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;
       }
@@ -4544,15 +4503,15 @@ export default defineComponent({
       console.log("ft_eidt", state.ft_eidt);
       // handlePush("review");
       /*
-			if (state.ft_eidt) {
+            if (state.ft_eidt) {
-				//编辑面授课
+                //编辑面授课
-				submitReview();
+                submitReview();
-			}
+            }
-			if (!state.ft_eidt) {
+            if (!state.ft_eidt) {
-				//shouke
+                //shouke
-				handlePush("review");
+                handlePush("review");
-			}
+            }
-			*/
+            */
     };
     const submitReview = (id) => {
       state.addLoading = true;
@@ -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/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();