From 68b8ed3b4b7ddbb5fe113c1d7df3aa909dc66fb6 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 03 七月 2024 18:37:29 +0800
Subject: [PATCH] feat：新增随机时间题目配置
---
src/views/exam/paper/edit.vue | 115 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 71 insertions(+), 44 deletions(-)
diff --git a/src/views/exam/paper/edit.vue b/src/views/exam/paper/edit.vue
index 9b205ac..cbe9c5f 100644
--- a/src/views/exam/paper/edit.vue
+++ b/src/views/exam/paper/edit.vue
@@ -1,20 +1,21 @@
<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-select>
- </el-form-item>
- <el-form-item label="璇剧洰锛�" prop="subjectId" required>
- <el-select ref="subjectIdRef" v-model="form.subjectId" placeholder="璇剧洰" multiple collapse-tags>
- <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id" :label="item.name + ' '"></el-option>
+ <el-form-item label="鑰冪敓锛�" prop="userIds" required>
+ <el-select v-model="form.userIds" :collapse-tags="true" multiple placeholder="璇烽�夋嫨" @focus="selectStudent"
+ popper-class="examinee-popper">
+ <el-option v-for="item in form.examineeList" :value="item.id" :label="item.realName"
+ :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="閮ㄩ棬锛�" prop="deptId" required>
- <el-select v-model="form.deptId" collapse-tags placeholder="閮ㄩ棬">
+ <el-select v-model="form.deptId" collapse-tags @change="getSubject" placeholder="閮ㄩ棬">
<el-option v-for="item in depts" :key="item.id" :value="item.id" :label="item.name"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璇剧洰锛�" prop="subjectId" required>
+ <el-select ref="subjectIdRef" v-model="form.subjectId" :disabled="! form.deptId" placeholder="璇剧洰" multiple collapse-tags>
+ <el-option v-for="item in subjectFilter" :key="item.id" :value="item.id" :label="item.name + ' '"></el-option>
</el-select>
</el-form-item>
<el-form-item label="璇曞嵎绫诲瀷锛�" prop="paperType" required>
@@ -101,8 +102,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,7 +133,12 @@
<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>
@@ -145,13 +151,13 @@
<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>
<pagination v-show="total > 0" :total="total" :page.sync="student.pageIndex" :limit.sync="student.pageSize"
- @pagination="selectStudent" />
+ @pagination="getStudent" />
<span slot="footer" class="dialog-footer">
<el-button @click="studentDialog = false">鍙� 娑�</el-button>
<el-button type="primary" @click="confirmStudentSelect">纭畾</el-button>
@@ -165,6 +171,7 @@
import { mapGetters, mapState, mapActions } from 'vuex';
import Pagination from '@/components/Pagination';
import QuestionShow from '../question/components/Show';
+import subjectApi from '@/api/subject';
import examPaperApi from '@/api/examPaper';
import questionApi from '@/api/question';
import departmentApi from '@/api/department';
@@ -177,12 +184,17 @@
tags: [],
depts: [],
studentDialog: false,
+
+ isFirstShow: true,
+
+
student: {
deptIds: [],
pageIndex: 1,
pageSize: 5,
listLoading: true,
- multipleSelection: []
+ multipleSelection: [],
+ excludeTagIds: [],
},
tableData: [],
total: 0,
@@ -207,13 +219,15 @@
suggestTime: null,
titleItems: [],
subjectSource: {},
- questionTypeVMS: []
+ questionTypeVMS: [],
+ examineeList: [],
+ userNames: []
},
subjectFilter: null,
formLoading: false,
rules: {
- menuIds: [
- { required: true, message: '璇烽�夋嫨', trigger: 'change' }
+ userIds: [
+ { required: true, message: '璇烽�夋嫨鑰冪敓', trigger: 'change' }
],
subjectId: [
{ required: true, message: '璇烽�夋嫨璇剧洰', trigger: 'change' }
@@ -235,7 +249,7 @@
multipleSelection: [],
showDialog: false,
queryParam: {
- id: null,
+ titleContent: "",
questionType: null,
subjectId: 1,
pageIndex: 1,
@@ -246,10 +260,6 @@
total: 0
},
currentTitleItem: null,
-
-
- examineeList: [],
-
};
},
created() {
@@ -261,9 +271,15 @@
if (id && parseInt(id) !== 0) {
_this.formLoading = true;
examPaperApi.select(id).then(re => {
+ const { userIds, userNames } = re.response;
+
_this.form = re.response;
- _this.form.menuIds = JSON.parse(re.response.menuIds);
- console.log(_this.form);
+ _this.form.examineeList = userIds.map((item, index) => {
+ return {
+ id: item,
+ realName: userNames && userNames[index] ? userNames[index] : ''
+ };
+ });
_this.formLoading = false;
});
}
@@ -277,6 +293,13 @@
});
},
methods: {
+ getSubject(deptId) {
+ // 鑾峰彇瀵瑰簲閮ㄩ棬鐨勮鐩�
+ subjectApi.selectByDeptId(deptId).then(res => {
+ this.form.subjectId = null
+ this.subjectFilter = res.response
+ })
+ },
getTags() {
userApi.tagList(null).then(data => {
this.tags = data.response;
@@ -286,21 +309,21 @@
this.getTags();
this.studentDialog = true;
this.student.listLoading = true;
+ this.getStudent();
+ },
+ getStudent() {
+ this.student.listLoading = true;
examPaperApi.selectStudent(this.student).then(res => {
this.tableData = res.response.list;
this.total = res.response.total;
this.student.listLoading = false;
-
- this.$nextTick(() => {
- this.tableData.map(data => {
- if (this.form.menuIds.find(item => item === data.id)) {
- this.$refs.multipleTable.toggleRowSelection(data, true);
- } else {
- this.$refs.multipleTable.toggleRowSelection(data, false);
- }
+ if (this.studentDialog && this.isFirstShow) {
+ this.isFirstShow = false;
+ this.form.examineeList.forEach(item => {
+ this.$refs.multipleTable.toggleRowSelection(item, true);
});
- });
+ }
});
},
handleChange(val) {
@@ -359,9 +382,6 @@
// }
});
this.form.subjectSource = obj1;
-
- console.log(this.form.subjectSource);
- console.log(this.form.questionTypeVMS);
// this.form.paperType = 7
this.form.titleItems = [];
} else {
@@ -380,8 +400,8 @@
if (this.subjectIdList.length == 1) {
tempForm.subjectId = tempForm.subjectId;
};
- tempForm.userIds = tempForm.menuIds;
- tempForm.menuIds = JSON.stringify(tempForm.menuIds);
+
+ tempForm.menuIds = tempForm.userIds.join(',');
if (tempForm.questionTypeVMS == null) {
tempForm.questionTypeVMS = [];
@@ -411,7 +431,6 @@
});
},
addQuestion(titleItem) {
- console.log('titleItem', titleItem);
this.currentTitleItem = titleItem;
this.questionPage.showDialog = true;
this.search();
@@ -438,7 +457,15 @@
this.questionPage.showDialog = false;
},
confirmStudentSelect() {
- this.form.menuIds = this.student.multipleSelection.map((item) => item.id);
+ this.form.userIds = this.student.multipleSelection.map((item) => item.id);
+
+ this.form.examineeList = this.student.multipleSelection.map((item) => {
+ return {
+ id: item.id,
+ realName: item.realName
+ };
+ });
+ this.student.multipleSelection = [];
this.studentDialog = false;
},
@@ -513,7 +540,7 @@
paperTypeEnum: state => state.exam.examPaper.paperTypeEnum,
levelEnum: state => state.user.levelEnum
}),
- ...mapState('exam', { subjects: state => state.subjects })
+ ...mapState('exam', { subjects: state => state.subjects }),
}
};
</script>
--
Gitblit v1.8.0