feat:合并

src/views/courselibrary/CoursewareManage.vue

@@ -2970,6 +2970,7 @@
       v-model:addAuthList="addAuthList"
       :authClassify="authClassify"
       classify="course"
+      :type="shipType"
     />
   </div>
 
@@ -3160,7 +3161,7 @@ const columns1 = [
     key: "9",
     align: "center",
     customRender: ({ text }) => {
-      return text ? getdateToTime(text * 1000) : "-";
+      return text ? text : "-";
     },
   },
   {
@@ -3501,6 +3502,7 @@ export default defineComponent({
   },
   setup() {
     const state = reactive({
+      shipType: 1,
       addLoading: false,
       currentPlanItem: {},
       teacherId: null,
@@ -3752,6 +3754,7 @@ export default defineComponent({
 
     const showStuAdd = () => {
       state.viewpowervisible = true;
+      state.shipType = 2;
       state.authClassify = 3;
     };
 
@@ -3913,6 +3916,7 @@ export default defineComponent({
         beginTime: startTime,
       });
       const { rows, total } = res.data.data;
+      console.log(res.data.data);
       state.tableDataTotal1 = total;
       const datas = traverseArr(
         rows,
@@ -5326,6 +5330,7 @@ export default defineComponent({
       // console.log("record", record);
       state.viewpowervisible = true;
       state.selectCourseId = record.offcourseId;
+      state.shipType = 1;
       state.authClassify = 2;
     };
     //添加权限
@@ -5369,7 +5374,7 @@ export default defineComponent({
     watch(
       () => state.addAuthList,
       (res) => {
-        console.log("res 添加学员", res, state.addStudentList);
+        console.log("res", res, state.addStudentList);
         if (state.authClassify === 3) {
           let obj = {
             deptList: res[1],