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

This commit is contained in:
yuping
2022-12-03 18:53:48 +08:00
5 changed files with 42 additions and 36 deletions

View File

@@ -113,9 +113,9 @@
:loading="tableDataTotal === -1 ? true : false"
:pagination="false"
/>
<div class="pa">
<div class="pa" style="display:flex;justify-content:center;padding:20px;">
<a-pagination
v-if="total > 10"
v-if="tableDataTotal > 10"
showSizeChanger="true"
showQuickJumper="true"
hideOnSinglePage="true"
@@ -136,7 +136,7 @@
//import { ApiFilled } from "@ant-design/icons-vue";
import {reactive, toRefs, ref, computed} from "vue";
// import { planList } from "../../api/indexTaskadd";
import {detail} from "../../api/indexCourse";
// import {detail} from "../../api/indexCourse";
import {list} from "../../api/indexTaskadd";
import {toDate} from "../../api/method";
@@ -286,7 +286,7 @@ export default {
};
list(objn)
.then((res) => {
console.log(res.data.data.rows);
console.log('面授课列表', res.data.data);
let result = res.data.data;
state.tableDataTotal = result.total;
getClassData(result.rows);