From c3bb35b20d6e076f73a1cad50fd6b9b94ca399a7 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期一, 06 一月 2025 16:15:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/onlineEducation/studentSupervision/index.vue | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/views/onlineEducation/studentSupervision/index.vue b/src/views/onlineEducation/studentSupervision/index.vue
index 3787e21..555b8da 100644
--- a/src/views/onlineEducation/studentSupervision/index.vue
+++ b/src/views/onlineEducation/studentSupervision/index.vue
@@ -18,7 +18,7 @@
</div>
<el-table v-loading="loading" :data="expertList">
<el-table-column label="姓名" align="center" prop="name" />
- <el-table-column label="身份证号" align="center" prop="idcard" :show-overflow-tooltip="true" />
+ <el-table-column label="身份证号" align="center" prop="idcard" :show-overflow-tooltip="true" width="170" />
<el-table-column label="性别" align="center" prop="sex" >
<template #default="scope">
<span>{{scope.row.sex == 1 ? '男' : scope.row.sex == 2?'女':'未知'}}</span>
@@ -69,34 +69,35 @@
:visible.sync="learningDialog"
:modal-append-to-body="false"
:close-on-click-modal="false"
- width="850px"
+ width="900px"
append-to-body
:before-close="handleCloseLearning">
- <learning-record ref="learnRef" ></learning-record>
+ <learning ref="learnRef" ></learning>
</el-dialog>
<el-dialog
title="考试记录"
:visible.sync="dialogVisible"
:modal-append-to-body="false"
:close-on-click-modal="false"
- width="850px"
+ width="900px"
:before-close="handleClose">
- <exam-manage ref="examRef" ></exam-manage>
+ <examRecord ref="examRef" ></examRecord>
</el-dialog>
</div>
</template>
<script>
-import examManage from '@/views/onlineEducation/examManage/index.vue'
-import learningRecord from '@/views/onlineEducation/learnRecord/index.vue'
+import examRecord from '../studentSupervision/compontents/examlRecord.vue'
+import learning from '../studentSupervision/compontents/learningRecord.vue'
import { listStudent } from '@/api/onlineEducation/student'
import noPic from '@/assets/images/none.png'
+import Cookies from 'js-cookie'
import { listPlat } from '@/api/onlineEducation/plat'
export default {
name: "nPeopleManage",
dicts: [],
- components: {learningRecord,examManage},
+ components: {learning,examRecord},
data() {
return {
loading: false,
@@ -129,8 +130,7 @@
this.expertList = res.rows.map(item => {
return {
...item,
- authPhoto: item.authPhoto !='-' ? item.authPhoto : noPic
-
+ authPhoto: item.authPhoto !='-' ? item.authPhoto : noPic,
}
})
this.total = res.total
@@ -155,21 +155,25 @@
},
viewLearnRecord(data){
this.learningDialog = true
+ Cookies.set('learnRecord',true)
setTimeout(() => {
this.$refs.learnRef.getList(data)
},10)
},
viewExamRecord(data){
this.dialogVisible = true
+ Cookies.set('examRecord',true)
setTimeout(() => {
this.$refs.examRef.getList(data)
},10)
},
handleClose() {
+ Cookies.remove('examRecord')
this.dialogVisible = false;
},
handleCloseLearning() {
+ Cookies.remove('learnRecord')
this.learningDialog = false;
}
--
Gitblit v1.9.2