From 6c472dfd39e90d1d479c2c0ced8ce317fc4a2bfe Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 26 六月 2024 15:23:47 +0800
Subject: [PATCH] 页面优化
---
src/views/class-management/Class.vue | 32 ++++++++++++++++++++++++++++----
src/api/classes.js | 8 ++++++++
src/views/user/student/list.vue | 1 -
src/views/exam/exam/ExamManage.vue | 14 +++++++++++---
src/views/class-management/ClassStaff.vue | 4 ++--
5 files changed, 49 insertions(+), 10 deletions(-)
diff --git a/src/api/classes.js b/src/api/classes.js
index c3e8bee..95940ee 100644
--- a/src/api/classes.js
+++ b/src/api/classes.js
@@ -75,3 +75,11 @@
data: params
})
}
+
+// 鐝骇鎭㈠姝ｅ父
+export const recover = (id) => {
+ return axios({
+ url: "/api/admin/classes/recover/" + id,
+ method: "PUT"
+ })
+}
diff --git a/src/views/class-management/Class.vue b/src/views/class-management/Class.vue
index 91a17f6..4f2f3f9 100644
--- a/src/views/class-management/Class.vue
+++ b/src/views/class-management/Class.vue
@@ -98,9 +98,24 @@
<el-button v-if="scope.row.status !== '瑙ｆ暎'" @click="studentManager(scope.row.id)" size="small"
type="success">鎴愬憳绠＄悊
</el-button>
- <el-button v-if="scope.row.status !== '瑙ｆ暎'" @click="dissolution(scope.row.id)" type="danger"
- size="small">瑙ｆ暎
- </el-button>
+ <el-popconfirm
+ class="confirm"
+ title="纭畾瑕佽В鏁ｈ鐝骇锛�"
+ @confirm="dissolution(scope.row.id)"
+ >
+ <el-button slot="reference" v-if="scope.row.status !== '瑙ｆ暎'" type="danger"
+ size="small">瑙ｆ暎
+ </el-button>
+ </el-popconfirm>
+ <el-popconfirm
+ class="confirm"
+ title="纭畾瑕佹仮澶嶈鐝骇鍚楋紵"
+ @confirm="recover(scope.row.id)"
+ >
+ <el-button slot="reference" v-if="scope.row.status === '瑙ｆ暎'" type="success"
+ size="small">鎭㈠姝ｅ父
+ </el-button>
+ </el-popconfirm>
</template>
</el-table-column>
</el-table>
@@ -174,7 +189,7 @@
</template>
<script>
-import { addClasses, editClasses, getClassess, dissolution } from '@/api/classes'
+import { addClasses, editClasses, getClassess, dissolution, recover } from '@/api/classes'
import { addClassesNotify } from '@/api/classesNotify'
import Pagination from '@/components/Pagination'
@@ -305,6 +320,12 @@
this.page()
})
},
+ recover(id) {
+ recover(id).then(res => {
+ this.$message.success(res.data.message)
+ this.page()
+ })
+ },
handlerEdit (row) {
this.form = row
this.open = true
@@ -333,6 +354,9 @@
</script>
<style scoped lang="scss">
+.confirm {
+ margin-left: 5px;
+}
.flex {
display: flex;
}
diff --git a/src/views/class-management/ClassStaff.vue b/src/views/class-management/ClassStaff.vue
index 047e4fa..88caf31 100644
--- a/src/views/class-management/ClassStaff.vue
+++ b/src/views/class-management/ClassStaff.vue
@@ -59,8 +59,8 @@
width="300px"
>
<template slot-scope="scope">
- <el-button @click="handlerEditStudent(scope.row)" type="warning">缂栬緫</el-button>
- <el-button @click="remove(scope.row.id)" type="danger">鍒犻櫎</el-button>
+ <el-button @click="handlerEditStudent(scope.row)" type="warning" size="small">缂栬緫</el-button>
+ <el-button @click="remove(scope.row.id)" type="danger" size="small">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
diff --git a/src/views/exam/exam/ExamManage.vue b/src/views/exam/exam/ExamManage.vue
index 5d391ab..3cccf66 100644
--- a/src/views/exam/exam/ExamManage.vue
+++ b/src/views/exam/exam/ExamManage.vue
@@ -64,7 +64,7 @@
width="150px"
prop="createTime"
></el-table-column>
- <el-table-column label="鎿嶄綔" fiexd="right" width="210px">
+ <el-table-column label="鎿嶄綔" fiexd="right">
<template slot-scope="scope">
<el-button
type="primary"
@@ -72,8 +72,16 @@
@click="handlerEdit(scope.row)"
>淇敼
</el-button>
- <el-button type="danger" size="small" @click="deleteExam(scope.row.id)">鍒犻櫎</el-button>
- <el-button type="success" size="small" @click="markPaper(scope.row)">闃呭嵎</el-button>
+ <el-popconfirm
+ v-if="scope.row.status === 'not_start'"
+ style="margin: 0 5px"
+ title="纭畾瑕佸垹闄よ鑰冭瘯鍚楋紵"
+ @confirm="deleteExam(scope.row.id)"
+ >
+ <el-button slot="reference" type="danger" size="small">鍒犻櫎</el-button>
+ </el-popconfirm>
+
+ <el-button v-if="scope.row.status === 'finished'" type="success" size="small" @click="markPaper(scope.row)">闃呭嵎</el-button>
</template>
</el-table-column>
</el-table>
diff --git a/src/views/user/student/list.vue b/src/views/user/student/list.vue
index 8144dd3..e62cc7c 100644
--- a/src/views/user/student/list.vue
+++ b/src/views/user/student/list.vue
@@ -13,7 +13,6 @@
</el-form>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
- <el-table-column prop="id" label="Id" />
<el-table-column prop="userName" label="鐢ㄦ埛鍚�"/>
<el-table-column prop="realName" label="鐪熷疄濮撳悕" />
<el-table-column prop="userLevel" label="瀛︾骇" :formatter="levelFormatter"/>
--
Gitblit v1.8.0