From b57f2a267747845f2846002e7042c38727f12c45 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 16 十月 2024 10:43:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/education/cheat/list.vue | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/views/education/cheat/list.vue b/src/views/education/cheat/list.vue
index e4c7bbb..fbece1e 100644
--- a/src/views/education/cheat/list.vue
+++ b/src/views/education/cheat/list.vue
@@ -10,8 +10,8 @@
</el-form>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
- <el-table-column align="center" prop="cheatUserName" label="浣滃紛浜哄悕绉�" show-overflow-tooltip />
- <el-table-column align="center" prop="examName" label="鑰冭瘯鍚嶇О" />
+ <el-table-column align="center" prop="cheatUserName" label="濮撳悕" show-overflow-tooltip />
+ <el-table-column align="center" prop="examName" label="鑰冭瘯" />
<el-table-column align="center" prop="createTime" label="浣滃紛鏃堕棿" />
<!-- <el-table-column label="鎿嶄綔" align="center">
<template slot-scope="{row}">
@@ -19,7 +19,7 @@
</template>
</el-table-column> -->
</el-table>
- <pagination v-show="total > 0" :total="total" :page.sync="queryParam.pageIndex" :limit.sync="queryParam.pageSize"
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParam.currentPage" :limit.sync="queryParam.pageSize"
@pagination="search" />
<el-dialog :visible.sync="visible" width="400px">
@@ -53,7 +53,7 @@
listLoading: true,
queryParam: {
name: '',
- pageIndex: 1,
+ currentPage: 1,
pageSize: 10
},
formLoading: false,
@@ -97,7 +97,6 @@
})
},
edit(row) {
- if (row) {
cheatApi.select(row.id).then(re => {
if (re.code === 1) {
this.form = re.data;
@@ -106,10 +105,6 @@
this.$message.error(re.message)
}
})
- } else {
- this.getItemOrder();
- this.visible = true;
- }
},
status(row) {
let question = {
--
Gitblit v1.8.0