From f034175e69ab511c253e47b6a3882af4ba329e6d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 27 五月 2024 14:19:55 +0800
Subject: [PATCH] 路由名字调整、导出题目增加loading
---
src/views/exam/paper/edit.vue | 68 ++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 27 deletions(-)
diff --git a/src/views/exam/paper/edit.vue b/src/views/exam/paper/edit.vue
index 2fa591e..d15ce0e 100644
--- a/src/views/exam/paper/edit.vue
+++ b/src/views/exam/paper/edit.vue
@@ -1,10 +1,9 @@
<template>
<div class="app-container">
<el-form :model="form" ref="form" label-width="200px" v-loading="formLoading" :rules="rules">
- <el-form-item label="鑰冪敓锛�" prop="menuIds" required>
- <el-select v-model="form.menuIds" :collapse-tags="true" multiple placeholder="璇烽�夋嫨" @focus="selectStudent"
- popper-class="examinee-popper"
- >
+ <el-form-item label="鑰冪敓锛�" prop="examineeList" required>
+ <el-select v-model="form.examineeList" :collapse-tags="true" multiple placeholder="璇烽�夋嫨" @focus="selectStudent"
+ popper-class="examinee-popper">
</el-select>
</el-form-item>
<el-form-item label="璇剧洰锛�" prop="subjectId" required>
@@ -101,8 +100,8 @@
</el-form>
<el-dialog :visible.sync="questionPage.showDialog" width="70%">
<el-form :model="questionPage.queryParam" ref="queryForm" :inline="true">
- <el-form-item label="ID锛�">
- <el-input v-model="questionPage.queryParam.id" clearable></el-input>
+ <el-form-item label="棰樺共锛�">
+ <el-input v-model="questionPage.queryParam.titleContent" clearable></el-input>
</el-form-item>
<el-form-item label="棰樺瀷锛�">
<el-select v-model="questionPage.queryParam.questionType" clearable>
@@ -132,12 +131,17 @@
<el-dialog :visible.sync="studentDialog" width="70%">
<el-form :model="student" ref="queryForm" :inline="true">
<el-form-item label="鏍囩锛�">
- <el-select v-model="student.tagId" clearable>
+ <el-select v-model="student.tagIds" clearable multiple>
+ <el-option v-for="item in tags" :key="item.id" :value="item.id" :label="item.name"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎺掗櫎鏍囩锛�">
+ <el-select v-model="student.excludeTagIds" clearable multiple>
<el-option v-for="item in tags" :key="item.id" :value="item.id" :label="item.name"></el-option>
</el-select>
</el-form-item>
<el-form-item label="閮ㄩ棬锛�">
- <el-select v-model="student.deptId" clearable>
+ <el-select v-model="student.deptIds" clearable multiple>
<el-option v-for="item in depts" :key="item.id" :value="item.id" :label="item.name"></el-option>
</el-select>
</el-form-item>
@@ -145,10 +149,10 @@
<el-button type="primary" @click="selectStudent">鏌ヨ</el-button>
</el-form-item>
</el-form>
- <el-table ref="multipleTable" v-loading="student.listLoading" :data="tableData" border fit highlight-current-row style="width: 100%"
- @selection-change="handleSelection" row-key="id">
+ <el-table ref="multipleTable" v-loading="student.listLoading" :data="tableData" border fit highlight-current-row
+ style="width: 100%" @selection-change="handleSelection" row-key="id">
<el-table-column type="selection" :reserve-selection="true"></el-table-column>
- <el-table-column prop="realName" label="鐢ㄦ埛" />
+ <el-table-column prop="realName" label="瀛﹀憳" />
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="student.pageIndex" :limit.sync="student.pageSize"
@pagination="selectStudent" />
@@ -176,13 +180,14 @@
return {
tags: [],
depts: [],
- student: {},
studentDialog: false,
student: {
+ deptIds: [],
pageIndex: 1,
pageSize: 5,
listLoading: true,
- multipleSelection: []
+ multipleSelection: [],
+ excludeTagIds: []
},
tableData: [],
total: 0,
@@ -207,12 +212,13 @@
suggestTime: null,
titleItems: [],
subjectSource: {},
- questionTypeVMS: []
+ questionTypeVMS: [],
+ examineeList: []
},
subjectFilter: null,
formLoading: false,
rules: {
- menuIds: [
+ examineeList: [
{ required: true, message: '璇烽�夋嫨', trigger: 'change' }
],
subjectId: [
@@ -235,7 +241,7 @@
multipleSelection: [],
showDialog: false,
queryParam: {
- id: null,
+ titleContent: "",
questionType: null,
subjectId: 1,
pageIndex: 1,
@@ -246,10 +252,6 @@
total: 0
},
currentTitleItem: null,
-
-
- examineeList: [],
-
};
},
created() {
@@ -262,7 +264,8 @@
_this.formLoading = true;
examPaperApi.select(id).then(re => {
_this.form = re.response;
- _this.form.menuIds = JSON.parse(re.response.menuIds);
+ // _this.form.menuIds = JSON.parse(re.response.menuIds);
+ _this.examineeList = JSON.parse(re.response.userIds).map(item => item.realName);
console.log(_this.form);
_this.formLoading = false;
});
@@ -286,6 +289,7 @@
this.getTags();
this.studentDialog = true;
this.student.listLoading = true;
+
examPaperApi.selectStudent(this.student).then(res => {
this.tableData = res.response.list;
this.total = res.response.total;
@@ -293,7 +297,7 @@
this.$nextTick(() => {
this.tableData.map(data => {
- if (this.form.menuIds.find(item => item === data.id)) {
+ if (this.form.userIds.find(item => item === data.id)) {
this.$refs.multipleTable.toggleRowSelection(data, true);
} else {
this.$refs.multipleTable.toggleRowSelection(data, false);
@@ -306,7 +310,6 @@
console.log(val);
},
titlejs(val) {
- console.log(val);
let str = '';
this.subjectFilter.forEach(item => {
if (item.id == val) {
@@ -316,7 +319,6 @@
return str;
},
subjectIdEvent(e) {
- console.log(e, this.$refs.subjectIdRef.selected);
let arr = [];
if (e) {
@@ -382,7 +384,7 @@
tempForm.subjectId = tempForm.subjectId;
};
tempForm.userIds = tempForm.menuIds;
- tempForm.menuIds = JSON.stringify(tempForm.menuIds);
+ // tempForm.menuIds = JSON.stringify(tempForm.menuIds);
if (tempForm.questionTypeVMS == null) {
tempForm.questionTypeVMS = [];
@@ -439,7 +441,15 @@
this.questionPage.showDialog = false;
},
confirmStudentSelect() {
- this.form.menuIds = this.student.multipleSelection.map((item) => item.id);
+ // this.form.menuIds = this.student.multipleSelection.map((item) => item.id);
+ this.form.userIds = this.student.multipleSelection.map((item) => {
+ return {
+ id: item.id,
+ realName: item.realName
+ };
+ });
+ this.form.examineeList = this.student.multipleSelection.map((item) => item.realName);
+
this.studentDialog = false;
},
@@ -514,7 +524,11 @@
paperTypeEnum: state => state.exam.examPaper.paperTypeEnum,
levelEnum: state => state.user.levelEnum
}),
- ...mapState('exam', { subjects: state => state.subjects })
+ ...mapState('exam', { subjects: state => state.subjects }),
+
+ examineeFormat() {
+ return this.examineeList.map(item => item.realName);
+ }
}
};
</script>
--
Gitblit v1.8.0