Merge remote-tracking branch 'origin/develop' into develop

src/views/courselibrary/CoursewareManage.vue

@@ -3398,7 +3398,12 @@ const columns6 = [
     key: "num",
     width: "6%",
     align: "center",
-    ellipsis: true
+    ellipsis: true,
+    customRender: ({ index, record }) => {
+      const pageNum =
+        Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
+      return index + 1 + pageNum;
+    },
   },
   {
     title: "创建人",
@@ -3484,6 +3489,11 @@ const columns7 = [
     dataIndex: "num",
     key: "num",
     align: "center",
+    customRender: ({ index, record }) => {
+      const pageNum =
+        Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
+      return index + 1 + pageNum;
+    },
   },
   {
     title: "姓名",
@@ -4107,7 +4117,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,
@@ -4416,13 +4426,12 @@ export default defineComponent({
       // console.log("获取学员信息", obj);
       let res = await studentList(obj);
       // console.log("获取学员列表", res);
-      const { rows, total } = res.data.data;
+      const { rows, total, pageNo } = res.data.data;
       state.tableDataTotal3 = total;
 
       for (let i = 0; i < rows.length; i++) {
-        rows[i].num = i+1+ (state.currentPage3-1)*10
+        rows[i].num = i + 1 + (state.currentPage3 - 1) * 10;
       }
-      
       rows.forEach((item, index) => {
         rows[index] = {
           ...item,
@@ -4447,6 +4456,9 @@ export default defineComponent({
         },
         true
       );
+      data2.forEach((itm) => {
+        itm.pageNo = pageNo;
+      });
       state.tableData7 = data2;
     };
     getTableDate2();
@@ -4523,13 +4535,12 @@ export default defineComponent({
       console.log("获取开课", obj);
       let res = await planList(obj);
       console.log("开课res", res);
-      const { rows, total } = res.data.data;
+      const { rows, total, pageNo } = res.data.data;
       state.tableDataTotal222 = total;
 
       for (let i = 0; i < rows.length; i++) {
-        rows[i].num = i+1+ (state.currentPage222-1)*10
+        rows[i].num = i + 1 + (state.currentPage222 - 1) * 10;
       }
-
       const datas = traverseArr(
         rows,
         {
@@ -4542,6 +4553,9 @@ export default defineComponent({
         },
         true
       );
+      datas.forEach((itm) => {
+        itm.pageNo = pageNo;
+      });
       state.tableData6 = datas;
     };