From 827c151dac25d873c21929b5b0ded81e82937854 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 12 七月 2024 17:27:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/exam/paper/list.vue | 12 +
src/api/user.js | 4
src/views/exam/personalRandomTemplate/edit.vue | 29 +++
src/views/exam/question/list.vue | 10
src/views/education/department/edit.vue | 4
src/views/exam/personalRandomTemplate/list.vue | 117 +++++++++++---
src/views/education/subject/list.vue | 4
src/views/user/student/list.vue | 19 ++
src/router.js | 206 ++++++++++++------------
src/views/exam/paper/edit.vue | 11 +
src/api/examPaper.js | 2
src/views/answer/dataStatistics.vue | 11 +
12 files changed, 280 insertions(+), 149 deletions(-)
diff --git a/src/api/examPaper.js b/src/api/examPaper.js
index 6fd6a00..8bd4e30 100644
--- a/src/api/examPaper.js
+++ b/src/api/examPaper.js
@@ -8,7 +8,7 @@
missExamByTemplateId: query => post('/api/admin/exam/paper/missExamByTemplateId', query),
select: id => post('/api/admin/exam/paper/select/' + id),
deletePaper: id => post('/api/admin/exam/paper/delete/' + id),
- pageselfList: query => get('/api/admin/exam/templates/list', query),
+ pageselfList: query => post('/api/admin/exam/templates/list', query),
selfedit: query => post('/api/admin/exam/templates/edit', query),
selfselect: query => post('/api/admin/exam/templates/select/'+ query),
selfdeletePaper: id => post('/api/admin/exam/templates/remove/' + id),
diff --git a/src/api/user.js b/src/api/user.js
index 0716aeb..6a7b449 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -19,5 +19,7 @@
selectByUserName: query => post('/api/admin/user/selectByUserName', query),
addMeetin:query => post('/api/admin/video/add', query),
delMeetin:query => post('/api/admin/video/clear', query),
- setStatus:query => post('/api/admin/userCondition/examine/save', query)
+ setStatus:query => post('/api/admin/userCondition/examine/save', query),
+ getFailExamUser:query => get('/api/admin/user/getFailExamUser/' + query),
+ getFailTemplateUser:query => get('/api/admin/user/getFailTemplateUser/' + query)
}
diff --git a/src/router.js b/src/router.js
index 2fbb02d..ba0699d 100644
--- a/src/router.js
+++ b/src/router.js
@@ -99,26 +99,40 @@
]
},
{
- path: '/online/study',
+ path: '/education',
component: Layout,
- name: 'OnLineStudy',
+ name: 'EducationPage',
meta: {
- title: '鍦ㄧ嚎瀛︿範',
- icon: 'exam'
+ title: '閮ㄩ棬绠＄悊',
+ icon: 'education'
},
alwaysShow: true,
children: [
{
- path: 'type',
- component: () => import('@/views/onlineStudy/type'),
- name: 'Type',
- meta: { title: '瀛︿範绫诲瀷', noCache: true }
+ path: 'subject/list',
+ component: () => import('@/views/education/subject/list'),
+ name: 'EducationSubjectPage',
+ meta: { title: '閮ㄩ棬璇剧洰', noCache: true }
},
{
- path: 'file',
- component: () => import('@/views/onlineStudy/file'),
- name: 'File',
- meta: { title: '瀛︿範鏂囦欢', noCache: true }
+ path: 'department/list',
+ component: () => import('@/views/education/department/list'),
+ name: 'EducationDepartmentPage',
+ meta: { title: '閮ㄩ棬鍒楄〃', noCache: true }
+ },
+ {
+ path: 'subject/edit',
+ component: () => import('@/views/education/subject/edit'),
+ name: 'EducationSubjectEditPage',
+ meta: { title: '璇剧洰缂栬緫', noCache: true, activeMenu: '/education/subject/list' },
+ hidden: true
+ },
+ {
+ path: 'department/edit',
+ component: () => import('@/views/education/department/edit'),
+ name: 'EducationSubjectEditPage',
+ meta: { title: '閮ㄩ棬缂栬緫', noCache: true, activeMenu: '/education/department/list' },
+ hidden: true
}
]
},
@@ -239,68 +253,6 @@
]
},
{
- path: '/task',
- component: Layout,
- name: 'TaskPage',
- meta: {
- title: '浠诲姟绠＄悊',
- icon: 'task'
- },
- alwaysShow: true,
- children: [
- {
- path: 'list',
- component: () => import('@/views/task/list'),
- name: 'TaskListPage',
- meta: { title: '浠诲姟鍒楄〃', noCache: true }
- },
- {
- path: 'edit',
- component: () => import('@/views/task/edit'),
- name: 'TaskEditPage',
- meta: { title: '浠诲姟鍒涘缓', noCache: true }
- }
- ]
- },
- {
- path: '/education',
- component: Layout,
- name: 'EducationPage',
- meta: {
- title: '閮ㄩ棬绠＄悊',
- icon: 'education'
- },
- alwaysShow: true,
- children: [
- {
- path: 'subject/list',
- component: () => import('@/views/education/subject/list'),
- name: 'EducationSubjectPage',
- meta: { title: '閮ㄩ棬璇剧洰', noCache: true }
- },
- {
- path: 'department/list',
- component: () => import('@/views/education/department/list'),
- name: 'EducationDepartmentPage',
- meta: { title: '閮ㄩ棬鍒楄〃', noCache: true }
- },
- {
- path: 'subject/edit',
- component: () => import('@/views/education/subject/edit'),
- name: 'EducationSubjectEditPage',
- meta: { title: '璇剧洰缂栬緫', noCache: true, activeMenu: '/education/subject/list' },
- hidden: true
- },
- {
- path: 'department/edit',
- component: () => import('@/views/education/department/edit'),
- name: 'EducationSubjectEditPage',
- meta: { title: '閮ㄩ棬缂栬緫', noCache: true, activeMenu: '/education/department/list' },
- hidden: true
- }
- ]
- },
- {
path: '/answer',
component: Layout,
name: 'AnswerPage',
@@ -344,6 +296,30 @@
]
},
{
+ path: '/online/study',
+ component: Layout,
+ name: 'OnLineStudy',
+ meta: {
+ title: '鍦ㄧ嚎瀛︿範',
+ icon: 'exam'
+ },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'type',
+ component: () => import('@/views/onlineStudy/type'),
+ name: 'Type',
+ meta: { title: '瀛︿範绫诲瀷', noCache: true }
+ },
+ {
+ path: 'file',
+ component: () => import('@/views/onlineStudy/file'),
+ name: 'File',
+ meta: { title: '瀛︿範鏂囦欢', noCache: true }
+ }
+ ]
+ },
+ {
path: '/questionAnswer',
component: Layout,
name: 'questionAnswerPage',
@@ -369,47 +345,71 @@
]
},
{
- path: '/message',
+ path: '/task',
component: Layout,
- name: 'MessagePage',
+ name: 'TaskPage',
meta: {
- title: '娑堟伅涓績',
- icon: 'message'
+ title: '浠诲姟绠＄悊',
+ icon: 'task'
},
alwaysShow: true,
children: [
{
path: 'list',
- component: () => import('@/views/message/list'),
- name: 'MessageListPage',
- meta: { title: '娑堟伅鍒楄〃', noCache: true }
+ component: () => import('@/views/task/list'),
+ name: 'TaskListPage',
+ meta: { title: '浠诲姟鍒楄〃', noCache: true }
},
{
- path: 'send',
- component: () => import('@/views/message/send'),
- name: 'MessageSendPage',
- meta: { title: '娑堟伅鍙戦��', noCache: true }
+ path: 'edit',
+ component: () => import('@/views/task/edit'),
+ name: 'TaskEditPage',
+ meta: { title: '浠诲姟鍒涘缓', noCache: true }
}
]
},
- {
- path: '/log',
- component: Layout,
- name: 'LogPage',
- meta: {
- title: '鏃ュ織涓績',
- icon: 'log'
- },
- alwaysShow: true,
- children: [
- {
- path: 'user/list',
- component: () => import('@/views/log/list'),
- name: 'LogUserPage',
- meta: { title: '鐢ㄦ埛鏃ュ織', noCache: true }
- }
- ]
- },
+ // {
+ // path: '/message',
+ // component: Layout,
+ // name: 'MessagePage',
+ // meta: {
+ // title: '娑堟伅涓績',
+ // icon: 'message'
+ // },
+ // alwaysShow: true,
+ // children: [
+ // {
+ // path: 'list',
+ // component: () => import('@/views/message/list'),
+ // name: 'MessageListPage',
+ // meta: { title: '娑堟伅鍒楄〃', noCache: true }
+ // },
+ // {
+ // path: 'send',
+ // component: () => import('@/views/message/send'),
+ // name: 'MessageSendPage',
+ // meta: { title: '娑堟伅鍙戦��', noCache: true }
+ // }
+ // ]
+ // },
+ // {
+ // path: '/log',
+ // component: Layout,
+ // name: 'LogPage',
+ // meta: {
+ // title: '鏃ュ織涓績',
+ // icon: 'log'
+ // },
+ // alwaysShow: true,
+ // children: [
+ // {
+ // path: 'user/list',
+ // component: () => import('@/views/log/list'),
+ // name: 'LogUserPage',
+ // meta: { title: '鐢ㄦ埛鏃ュ織', noCache: true }
+ // }
+ // ]
+ // },
// {
// path: '/meeting',
// component: Layout,
diff --git a/src/views/answer/dataStatistics.vue b/src/views/answer/dataStatistics.vue
index 39c8bee..03861d0 100644
--- a/src/views/answer/dataStatistics.vue
+++ b/src/views/answer/dataStatistics.vue
@@ -9,6 +9,7 @@
<el-form-item>
<el-button type="primary" @click="submitForm">鏌ヨ</el-button>
<el-button type="danger" @click="handleExport" class="link-left">瀵煎嚭</el-button>
+ <el-button type="danger" @click="downloadUrlFile" class="link-left">鎴浘</el-button>
</el-form-item>
</el-form>
@@ -156,6 +157,16 @@
});
},
methods: {
+ downloadUrlFile(url, fileName) {
+ // 鑾峰彇base64鍥剧墖
+ const chartImgUrl = this.myChart.getDataURL({
+ pixelRatio: 2,
+ backgroundColor: '#fff'
+ })
+ console.log(chartImgUrl)
+ // 涓嬭浇base64鍥剧墖
+ this.downloadUrlFile(chartImgUrl, 'ECharts 2鍊嶅浘')
+ },
handleExport(){
let that = this
let url ='/api/admin/examPaperAnswer/export?id=' +this.queryParam.id + '&type=' + this.queryParam.type
diff --git a/src/views/education/department/edit.vue b/src/views/education/department/edit.vue
index 69a6dac..dcc071f 100644
--- a/src/views/education/department/edit.vue
+++ b/src/views/education/department/edit.vue
@@ -99,7 +99,9 @@
// let obj = {
// name: this.form.name
// }
- _this.form.parentId = _this.form.parentId[0]
+ if (_this.form.parentId) {
+ _this.form.parentId = _this.form.parentId[0];
+ }
if (_this.fig === 1) {
departmentApi.addData(this.form).then(res => {
console.log(res)
diff --git a/src/views/education/subject/list.vue b/src/views/education/subject/list.vue
index 58971fb..7267884 100644
--- a/src/views/education/subject/list.vue
+++ b/src/views/education/subject/list.vue
@@ -9,9 +9,9 @@
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm">鏌ヨ</el-button>
- <router-link :to="{path:'/education/subject/edit'}" class="link-left">
+ <!-- <router-link :to="{path:'/education/subject/edit'}" class="link-left">
<el-button type="primary">娣诲姞</el-button>
- </router-link>
+ </router-link> -->
</el-form-item>
</el-form>
diff --git a/src/views/exam/paper/edit.vue b/src/views/exam/paper/edit.vue
index 9936316..b9c2e96 100644
--- a/src/views/exam/paper/edit.vue
+++ b/src/views/exam/paper/edit.vue
@@ -155,6 +155,7 @@
</el-select> -->
<el-cascader
clearable
+ collapse-tags
v-model="student.deptIds"
:options="depts"
:props="{ emitPath: false, multiple: true, value: 'id', label: 'name', checkStrictly: true }"
@@ -232,7 +233,10 @@
limitDateTime: [],
name: '',
suggestTime: null,
- titleItems: [],
+ titleItems: [{
+ name: '',
+ questionItems: []
+ }],
subjectSource: {},
questionTypeVMS: [],
examineeList: [],
@@ -284,6 +288,7 @@
_this.subjectFilter = _this.subjects;
});
if (id && parseInt(id) !== 0) {
+ _this.selectAllBoolean = false;
_this.formLoading = true;
examPaperApi.select(id).then(re => {
const { userIds, userNames } = re.response;
@@ -327,20 +332,20 @@
this.getStudent();
},
selectAll () {
- this.selectAllBoolean = false;
let param = { ...this.student };
param.pageSize = 999999;
examPaperApi.selectStudent(param).then(res => {
this.handleSelection(res.response.list);
res.response.list.forEach(item => {
this.$refs.multipleTable.toggleRowSelection(item, true);
+ this.selectAllBoolean = false;
})
this.getStudent();
});
},
unselectAll () {
- this.selectAllBoolean = true;
this.$refs.multipleTable.clearSelection();
+ this.selectAllBoolean = true;
},
getStudent() {
this.student.listLoading = true;
diff --git a/src/views/exam/paper/list.vue b/src/views/exam/paper/list.vue
index 356a7b1..3b10078 100644
--- a/src/views/exam/paper/list.vue
+++ b/src/views/exam/paper/list.vue
@@ -48,7 +48,11 @@
width="550px">
<el-form :model="form" ref="form" :rules="rules">
<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-item label="鏃堕棿锛�" prop="limitDateTime" required v-if="examPaper.paperType === 4">
<el-date-picker v-model="form.limitDateTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"
@@ -70,6 +74,7 @@
import Pagination from '@/components/Pagination'
import examPaperApi from '@/api/examPaper'
import departmentApi from '@/api/department'
+import userApi from '@/api/user'
export default {
components: { Pagination },
@@ -165,8 +170,9 @@
}
this.dialogVisible = true;
this.examPaper = item;
- departmentApi.getUserByExam(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}})}})
+ console.log('item.id', item.id);
+ userApi.getFailExamUser(item.id).then(res => {
+ this.options = res.response;
})
},
submitUpdate () {
diff --git a/src/views/exam/personalRandomTemplate/edit.vue b/src/views/exam/personalRandomTemplate/edit.vue
index 6bd5423..7fc5262 100644
--- a/src/views/exam/personalRandomTemplate/edit.vue
+++ b/src/views/exam/personalRandomTemplate/edit.vue
@@ -159,6 +159,7 @@
</el-select> -->
<el-cascader
clearable
+ collapse-tags
v-model="student.deptIds"
:options="depts"
:props="{ multiple: true, emitPath: false, value: 'id', label: 'name', checkStrictly: true }"
@@ -247,7 +248,10 @@
limitDateTime: [],
name: '',
suggestTime: null,
- titleItems: [],
+ titleItems: [{
+ name: '',
+ questionItems: []
+ }],
subjectSource: {},
questionTypeVMS: [],
examineeList: [],
@@ -313,6 +317,7 @@
_this.subjectFilter = _this.subjects;
});
if (id && parseInt(id) !== 0) {
+ this.selectAllBoolean = false;
_this.formLoading = true;
await examPaperApi.selfselect(id).then(re => {
const { userIds, userNames } = re.response;
@@ -355,20 +360,21 @@
this.student.multipleSelection = val;
},
selectAll () {
- this.selectAllBoolean = false;
+ this.preSelectAll();
let param = { ...this.student };
param.pageSize = 999999;
examPaperApi.selectStudent(param).then(res => {
this.handleSelection(res.response.list);
res.response.list.forEach(item => {
this.$refs.multipleTable.toggleRowSelection(item, true);
+ this.selectAllBoolean = false;
})
this.getStudent();
});
},
unselectAll () {
- this.selectAllBoolean = true;
this.$refs.multipleTable.clearSelection();
+ this.selectAllBoolean = true;
},
confirmStudentSelect() {
this.form.userIds = this.student.multipleSelection.map((item) => item.id);
@@ -380,6 +386,18 @@
});
this.student.multipleSelection = [];
this.studentDialog = false;
+ },
+ preSelectAll() {
+ this.selectAllBoolean = true;
+ this.$refs.multipleTable.clearSelection();
+ 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 = [];
},
getTags() {
userApi.tagList(null).then(data => {
@@ -469,7 +487,10 @@
console.log(this.form.subjectSource);
console.log(this.form.questionTypeVMS);
// this.form.paperType = 7
- this.form.titleItems = [];
+ this.form.titleItems = [{
+ name: '',
+ questionItems: []
+ }];
} else {
this.form.subjectSource = {};
this.subjectIdList = [];
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;
})
},
diff --git a/src/views/exam/question/list.vue b/src/views/exam/question/list.vue
index bc0b9bb..5b63dfe 100644
--- a/src/views/exam/question/list.vue
+++ b/src/views/exam/question/list.vue
@@ -7,15 +7,19 @@
<!-- <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 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 label="棰樺瀷锛�">
<el-select v-model="queryParam.questionType" clearable>
<el-option v-for="item in questionType" :key="item.key" :value="item.key" :label="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="棰樼洰鍚嶏細">
- <el-input v-model="queryParam.questionName" clearable></el-input>
- </el-form-item>
+ <el-input v-model="queryParam.questionName" clearable></el-input>
+ </el-form-item>
<el-form-item>
<div style="display: flex">
<el-button class="op-item" type="primary" @click="submitForm">鏌ヨ</el-button>
diff --git a/src/views/user/student/list.vue b/src/views/user/student/list.vue
index c6b3a81..8060c00 100644
--- a/src/views/user/student/list.vue
+++ b/src/views/user/student/list.vue
@@ -4,6 +4,14 @@
<el-form-item label="鐪熷疄濮撳悕锛�">
<el-input v-model="queryParam.userName" size="small" clearable></el-input>
</el-form-item>
+ <el-form-item label="閮ㄩ棬锛�">
+ <el-cascader
+ clearable
+ v-model="queryParam.departmentId"
+ :options="depts"
+ :props="{ emitPath: false, value: 'id', label: 'name', checkStrictly: true, multiple: true }"
+ ></el-cascader>
+ </el-form-item>
<el-form-item >
<div style="display: flex">
<el-button type="primary" @click="submitForm" size="small">鏌ヨ</el-button>
@@ -29,9 +37,9 @@
<el-table-column prop="userName" label="鐢ㄦ埛鍚�"/>
<el-table-column prop="realName" label="鐪熷疄濮撳悕" width="150"/>
<el-table-column prop="deptNames" label="閮ㄩ棬" />
- <el-table-column label="鏍囩" prop="tagNames" width="80px">
+ <el-table-column label="鏍囩" prop="tagNames" align="center">
<template slot-scope="{row}">
- <el-tag style="margin: 5px;" v-for="(item,index) in row.tagNames" :key="index">{{ item }}</el-tag>
+ <el-tag v-for="item, index in row.tagNames" :key="index">{{ item }}</el-tag>
</template>
</el-table-column>
<el-table-column label="浜哄憳鐘舵��" prop="condition" align="center" width="100px">
@@ -126,12 +134,14 @@
},
data () {
return {
+ depts: [],
user:{},
statusVisible: false,
upLoadUrl:'/api/admin/user/import',
fileList:[],
queryParam: {
userName: '',
+ departmentId: [],
roles: [1],
pageIndex: 1,
pageSize: 10
@@ -162,7 +172,10 @@
}
},
created () {
- this.search()
+ this.search();
+ department.getDeptAdmins().then(res => {
+ this.depts = res.response;
+ })
},
methods: {
deptAdmin() {
--
Gitblit v1.8.0