From 956289c2b729f643a528983b7ceb5103f32aff23 Mon Sep 17 00:00:00 2001
From: lohir <3399054449@qq.com>
Date: 星期三, 16 十月 2024 09:26:29 +0800
Subject: [PATCH] bug
---
src/views/exam/exam/monitor.vue | 4 +-
src/views/class-management/Class.vue | 10 +++--
src/views/log/list.vue | 7 ++-
src/views/education/cheat/list.vue | 4 +-
src/views/education/resource/list.vue | 1
src/views/education/subject/list.vue | 6 ++-
src/views/exam/exam/MarkPaper.vue | 2
src/views/user/student/list.vue | 2
src/views/exam/exam/ExamManage.vue | 1
src/views/class-management/ClassStaff.vue | 36 +++++++++++++-----
src/views/user/student/edit.vue | 2
11 files changed, 48 insertions(+), 27 deletions(-)
diff --git a/src/views/class-management/Class.vue b/src/views/class-management/Class.vue
index a259483..d1508bc 100644
--- a/src/views/class-management/Class.vue
+++ b/src/views/class-management/Class.vue
@@ -120,7 +120,7 @@
</el-table-column>
</el-table>
- <pagination v-show="total>0" :total="total" :page.sync="searchForm.pageIndex"
+ <pagination v-show="total>0" :total="total" :page.sync="searchForm.currentPage"
:limit.sync="searchForm.pageSize"
@pagination="page"/>
<el-dialog
@@ -146,7 +146,8 @@
:title="title"
:visible.sync="open"
width="700px"
- :before-close="handleClose">
+ :before-close="handleClose"
+ :close-on-click-modal="false">
<el-form :model="form" :rules="rules" ref="form" label-width="100px" class="demo-ruleForm">
<el-form-item label="鐝骇鍚嶇О" prop="className">
<el-input v-model="form.className" size="small"></el-input>
@@ -213,7 +214,7 @@
status: '',
subject: null,
pageSize: 10,
- pageNum: 1
+ currentPage: 1
},
form: {
id: null,
@@ -330,9 +331,10 @@
this.form = row
this.open = true
},
- handleClose () {
+ handleClose (done) {
this.open = false
this.resetForm()
+ done()
},
handlerAdd () {
this.open = true
diff --git a/src/views/class-management/ClassStaff.vue b/src/views/class-management/ClassStaff.vue
index 88caf31..8eea91e 100644
--- a/src/views/class-management/ClassStaff.vue
+++ b/src/views/class-management/ClassStaff.vue
@@ -68,7 +68,7 @@
class="block"
style="display: flex; margin-top: 40px;"
>
- <pagination v-show="total>0" :total="total" :page.sync="searchForm.pageNum"
+ <pagination v-show="total>0" :total="total" :page.sync="searchForm.currentPage"
:limit.sync="searchForm.pageSize"
@pagination="page"/>
</div>
@@ -76,8 +76,10 @@
:title="studentTitle"
:visible.sync="addOpen"
width="700px"
- :before-close="handleAddClose">
+ :before-close="handleAddClose"
+ :close-on-click-modal="false">
<el-form :model="studentForm" :rules="studentRules" ref="studentForm" label-width="100px" class="demo-ruleForm">
+ <el-form-item label="瀛﹀彿" prop="id" v-show="false"/>
<el-form-item label="濮撳悕" prop="realName">
<el-input v-model="studentForm.realName"></el-input>
</el-form-item>
@@ -132,7 +134,14 @@
<script>
// 寮曞叆褰堝嚭绐楀彛绲勪欢
import UserApi from '@/api/user'
-import { updateClassesUser, getClassesUsers, deleteClassesUserById, addClassesUser, edit } from '@/api/classesUser'
+import {
+ updateClassesUser,
+ getClassesUsers,
+ deleteClassesUserById,
+ addClassesUser,
+ edit,
+ editClassesUser
+} from '@/api/classesUser'
import Pagination from '@/components/Pagination'
export default {
@@ -140,6 +149,7 @@
data () {
return {
studentForm: {
+ id: null,
realName: '',
sex: 1,
phone: '',
@@ -168,7 +178,7 @@
searchForm: {
studentName: '',
pageSize: 10,
- pageNum: 1,
+ currentPage: 1,
classesId: null
},
classes: {
@@ -204,20 +214,24 @@
},
submitStudentForm () {
this.$refs['studentForm'].validate((valid) => {
+ console.log(this.studentForm)
if (valid) {
this.studentForm.classesId = this.classes.id
if (this.studentForm.id) {
- edit(this.studentForm).then(res => {
+ editClassesUser(this.studentForm).then(res => {
this.addOpen = false
this.$message.success(res.data.message)
this.page()
+ this.resetStudentForm()
+ })
+ }else {
+ addClassesUser(this.studentForm).then(res => {
+ this.addOpen = false
+ this.$message.success(res.data.message)
+ this.page()
+ this.resetStudentForm()
})
}
- addClassesUser(this.studentForm).then(res => {
- this.addOpen = false
- this.$message.success(res.data.message)
- this.page()
- })
}
})
},
@@ -265,6 +279,8 @@
this.searchForm.classesId = this.classes.id
getClassesUsers(this.searchForm).then(res => {
this.tableData = res.data.data
+ this.total = res.data.total
+ this.loading = false
})
},
submitForm () {
diff --git a/src/views/education/cheat/list.vue b/src/views/education/cheat/list.vue
index 147ae49..fbece1e 100644
--- a/src/views/education/cheat/list.vue
+++ b/src/views/education/cheat/list.vue
@@ -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,
diff --git a/src/views/education/resource/list.vue b/src/views/education/resource/list.vue
index 33d6b76..526b324 100644
--- a/src/views/education/resource/list.vue
+++ b/src/views/education/resource/list.vue
@@ -300,6 +300,7 @@
this.$message.success('鍒犻櫎鎴愬姛')
this.ids = []
}
+ this.page()
})
}
},
diff --git a/src/views/education/subject/list.vue b/src/views/education/subject/list.vue
index 08bc47c..e70d189 100644
--- a/src/views/education/subject/list.vue
+++ b/src/views/education/subject/list.vue
@@ -16,7 +16,7 @@
</el-form-item>
</el-form>
- <el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
+ <el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
<el-table-column align="center" prop="name" label="鍚嶇О" show-overflow-tooltip />
<el-table-column align="center" prop="itemOrder" label="鎺掑簭" />
<el-table-column align="center" prop="createTime" label="鍒涘缓鏃堕棿" />
@@ -42,7 +42,7 @@
<pagination v-show="total > 0" :total="total" :page.sync="queryParam.pageIndex" :limit.sync="queryParam.pageSize"
@pagination="search" />
- <el-dialog :visible.sync="visible" width="400px">
+ <el-dialog :visible.sync="visible" :close-on-click-modal="false" width="400px">
<el-form :model="form" ref="form" label-width="100px" v-loading="formLoading" :rules="rules">
<el-form-item label="鍚嶇О锛�" prop="name" required>
<el-input v-model="form.name" maxlength="10" show-word-limit />
@@ -122,6 +122,7 @@
if (re.code === 1) {
this.form = re.data;
this.visible = true;
+ this.resetForm();
} else {
this.$message.error(re.message)
}
@@ -129,6 +130,7 @@
} else {
this.getItemOrder();
this.visible = true;
+ this.resetForm();
}
},
status(row) {
diff --git a/src/views/exam/exam/ExamManage.vue b/src/views/exam/exam/ExamManage.vue
index e4c5765..a2e8232 100644
--- a/src/views/exam/exam/ExamManage.vue
+++ b/src/views/exam/exam/ExamManage.vue
@@ -84,7 +84,6 @@
<el-button v-if="scope.row.status === 'finished'" type="success" size="small" @click="markPaper(scope.row)">
闃呭嵎
</el-button>
- <el-button type="danger" size="small" @click="deleteExam(scope.row)">鍒犻櫎</el-button>
<el-button type="warning" size="small" @click="monitor(scope.row)">鐩戞帶</el-button>
</template>
</el-table-column>
diff --git a/src/views/exam/exam/MarkPaper.vue b/src/views/exam/exam/MarkPaper.vue
index 77dca0d..e47c10e 100644
--- a/src/views/exam/exam/MarkPaper.vue
+++ b/src/views/exam/exam/MarkPaper.vue
@@ -40,7 +40,7 @@
>
<el-table-column
align="center"
- prop="id"
+ prop="userId"
label="瀛﹀彿"
>
</el-table-column>
diff --git a/src/views/exam/exam/monitor.vue b/src/views/exam/exam/monitor.vue
index 90695bb..85e9df4 100644
--- a/src/views/exam/exam/monitor.vue
+++ b/src/views/exam/exam/monitor.vue
@@ -44,7 +44,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">
@@ -79,7 +79,7 @@
listLoading: true,
queryParam: {
examId: '',
- pageIndex: 1,
+ currentPage: 1,
pageSize: 10
},
formLoading: false,
diff --git a/src/views/log/list.vue b/src/views/log/list.vue
index 6755b4a..d813b53 100644
--- a/src/views/log/list.vue
+++ b/src/views/log/list.vue
@@ -4,8 +4,8 @@
<el-form-item label="鐢ㄦ埛Id锛�">
<el-input v-model="queryParam.userId"></el-input>
</el-form-item>
- <el-form-item label="鐢ㄦ埛鍚嶏細">
- <el-input v-model="queryParam.userName"></el-input>
+ <el-form-item label="鐪熷疄濮撳悕锛�">
+ <el-input v-model="queryParam.realName"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm">鏌ヨ</el-button>
@@ -36,7 +36,8 @@
userId: null,
userName: null,
pageIndex: 1,
- pageSize: 10
+ pageSize: 10,
+ realName: null
},
listLoading: true,
tableData: [],
diff --git a/src/views/user/student/edit.vue b/src/views/user/student/edit.vue
index e686016..b31d09e 100644
--- a/src/views/user/student/edit.vue
+++ b/src/views/user/student/edit.vue
@@ -11,7 +11,7 @@
<el-form-item label="鐧诲綍璐﹀彿锛�" prop="userName" required>
<el-input v-model="form.userName" autocomplete="off"></el-input>
</el-form-item>
- <el-form-item label="鐧诲綍瀵嗙爜锛�" prop="password" required>
+ <el-form-item label="鐧诲綍瀵嗙爜锛�" prop="password" v-if="form.id === null" required>
<el-input v-model="form.password" show-password autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="骞撮緞锛�">
diff --git a/src/views/user/student/list.vue b/src/views/user/student/list.vue
index ae48e71..82fee4d 100644
--- a/src/views/user/student/list.vue
+++ b/src/views/user/student/list.vue
@@ -9,7 +9,7 @@
<router-link :to="{path:'/user/student/edit'}" class="link-left">
<el-button type="primary">娣诲姞</el-button>
</router-link>
- <el-button class="link-left" type="success" @click="exportExcel">瀵煎叆妯℃澘</el-button>
+ <el-button class="link-left" type="danger" @click="exportExcel">涓嬭浇妯℃澘</el-button>
<el-upload
class="link-left"
style="display: inline;"
--
Gitblit v1.8.0