From f0f200abf841d5d7fe5e2921e6ded8f0147e9c92 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 10 七月 2024 18:02:07 +0800
Subject: [PATCH] feat 用户列表增加部门条件 随机试卷列表增加部门，时间，科目条件 补考直接展示学生 试卷标题默认展示一个
---
src/views/exam/personalRandomTemplate/list.vue | 117 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 92 insertions(+), 25 deletions(-)
diff --git a/src/views/exam/personalRandomTemplate/list.vue b/src/views/exam/personalRandomTemplate/list.vue
index 75adcf9..dd85102 100644
--- a/src/views/exam/personalRandomTemplate/list.vue
+++ b/src/views/exam/personalRandomTemplate/list.vue
@@ -1,26 +1,40 @@
<template>
<div class="app-container">
-<!-- <el-form :model="queryParam" ref="queryForm" :inline="true">-->
-<!-- <el-form-item label="棰樼洰ID锛�">-->
-<!-- <el-input v-model="queryParam.id" clearable></el-input>-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="閮ㄩ棬锛�">-->
-<!-- <el-select v-model="queryParam.level" placeholder="閮ㄩ棬" @change="levelChange" clearable>-->
-<!-- <el-option v-for="item in levelEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>-->
-<!-- </el-select>-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="璇剧洰锛�" >-->
-<!-- <el-select v-model="queryParam.subjectId" clearable>-->
-<!-- <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>-->
-<!-- <el-button type="primary" @click="submitForm">鏌ヨ</el-button>-->
-<!-- <router-link :to="{path:'/exam/personalSimulation/edit'}" class="link-left">-->
-<!-- <el-button type="primary">娣诲姞</el-button>-->
-<!-- </router-link>-->
-<!-- </el-form-item>-->
-<!-- </el-form>-->
+ <el-form :model="queryParam" ref="queryForm" :inline="true">
+ <el-form-item label="鍚嶇О锛�">
+ <el-input v-model="queryParam.name" clearable></el-input>
+ </el-form-item>
+ <el-form-item label="閮ㄩ棬锛�">
+ <el-cascader
+ clearable
+ v-model="queryParam.deptId"
+ :options="depts"
+ :props="{ emitPath: false, value: 'id', label: 'name', checkStrictly: true, multiple: true }"
+ ></el-cascader>
+ </el-form-item>
+ <el-form-item label="璇剧洰锛�" >
+ <el-select v-model="queryParam.subjectId" clearable multiple>
+ <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>
+ <el-date-picker
+ v-model="queryParam.period"
+ type="daterange"
+ unlink-panels
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ :picker-options="pickerOptions">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="submitForm">鏌ヨ</el-button>
+ <!-- <router-link :to="{path:'/exam/personalSimulation/edit'}" class="link-left">
+ <el-button type="primary">娣诲姞</el-button>
+ </router-link> -->
+ </el-form-item>
+ </el-form>
<router-link :to="{path:'/exam/personalRandomTemplate/edit'}">
<el-button type="primary" size="small" style="margin-bottom: 5px">娣诲姞</el-button>
</router-link>
@@ -28,6 +42,7 @@
<el-table-column prop="subjectNames" label="璇剧洰" />
<el-table-column prop="name" label="鍚嶇О" />
<el-table-column prop="createDepartment" label="鍒涘缓閮ㄩ棬" />
+ <el-table-column prop="ctime" label="鍒涘缓鏃堕棿" />
<el-table-column label="鎿嶄綔" align="center" width="360px">
<template slot-scope="{row}">
<el-button size="small" @click="$router.push({path:'/exam/personalRandomTemplate/edit',query:{id:row.id}})" >缂栬緫</el-button>
@@ -44,9 +59,12 @@
title="琛ヨ��"
:visible.sync="dialogVisible"
width="550px">
- <el-form :model="form" ref="form" :rules="rules">
+ <el-form :model="form" ref="form">
<el-form-item label="鑰冪敓锛�" prop="menuIds" required>
- <el-cascader v-model="form.menuIds" :options="options" :props="{ multiple: true }" clearable collapse-tags></el-cascader>
+ <!-- <el-cascader v-model="form.menuIds" :options="options" :props="{ multiple: true }" clearable collapse-tags></el-cascader> -->
+ <el-select v-model="form.menuIds" multiple clearable placeholder="璇烽�夋嫨">
+ <el-option v-for="item in options" :key="item.id" :label="item.realName" :value="item.id"></el-option>
+ </el-select>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -62,11 +80,57 @@
import Pagination from '@/components/Pagination'
import examPaperApi from '@/api/examPaper'
import departmentApi from '@/api/department'
+import userApi from '@/api/user'
export default {
components: { Pagination },
data () {
return {
+ pickerOptions: {
+ shortcuts: [{
+ text: '鏈�杩戜竴鍛�',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+ picker.$emit('pick', [start, end]);
+ }
+ }, {
+ text: '鏈�杩戜竴涓湀',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+ picker.$emit('pick', [start, end]);
+ }
+ }, {
+ text: '鏈�杩戜笁涓湀',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+ picker.$emit('pick', [start, end]);
+ }
+ }, {
+ text: '鏈�杩戝崐骞�',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 183);
+ picker.$emit('pick', [start, end]);
+ }
+ }, {
+ text: '鏈�杩戜竴骞�',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 365);
+ picker.$emit('pick', [start, end]);
+ }
+ }]
+ },
+ options: [],
+ depts: [],
form: {
menuIds: [],
userIds: [],
@@ -93,6 +157,9 @@
this.search()
this.queryParam.subjectId = null
this.subjectFilter = this.subjects
+ departmentApi.getDeptAdmins().then(res => {
+ this.depts = res.response;
+ })
},
methods: {
missExam(item) {
@@ -103,8 +170,8 @@
limitDateTime: []
}
this.examPaper = item;
- departmentApi.getDepartmentUserByTemplateId(item.id).then(res => {
- this.options = res.response.map(x=>{return{value:x.department.id,label:x.department.name,children:x.userList.map(xx=>{return{value: xx.id,label: xx.realName}})}})
+ userApi.getFailExamUser(item.id).then(res => {
+ this.options = res.response;
this.dialogVisible = true;
})
},
--
Gitblit v1.8.0