From 2b0bd5dd65c44e759d83edc85a991e36ac37df60 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期五, 17 五月 2024 16:01:25 +0800
Subject: [PATCH] 取消重复判断
---
src/views/exam/paper/edit.vue | 150 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 128 insertions(+), 22 deletions(-)
diff --git a/src/views/exam/paper/edit.vue b/src/views/exam/paper/edit.vue
index 317fb5e..65d47b1 100644
--- a/src/views/exam/paper/edit.vue
+++ b/src/views/exam/paper/edit.vue
@@ -1,17 +1,19 @@
<template>
<div class="app-container">
<el-form :model="form" ref="form" label-width="200px" v-loading="formLoading" :rules="rules">
- <el-form-item label="閮ㄩ棬锛�" prop="departmentIds" required>
- <el-select v-model="form.departmentIds" placeholder="閮ㄩ棬" @change="levelChange" multiple
- collapse-tags>
- <el-option v-for="item in levelEnum" :key="item.key" :value="item.key" :label="item.value"></el-option>
- </el-select>
+ <el-form-item label="鑰冪敓锛�" prop="menuIds" required>
+ <el-select v-model="form.menuIds" :collapse-tags="true" multiple placeholder="璇烽�夋嫨" @focus="selectStudent"></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-select>
+ </el-form-item>
+ <el-form-item label="閮ㄩ棬锛�" prop="deptId" required>
+ <el-select v-model="form.deptId" collapse-tags 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="paperType" required>
@@ -110,7 +112,6 @@
<el-table v-loading="questionPage.listLoading" :data="questionPage.tableData"
@selection-change="handleSelectionChange" border fit highlight-current-row style="width: 100%">
<el-table-column type="selection" width="35"></el-table-column>
- <el-table-column prop="id" label="Id" width="60px"/>
<el-table-column prop="questionType" label="棰樺瀷" :formatter="questionTypeFormatter" width="70px"/>
<el-table-column prop="shortTitle" label="棰樺共" show-overflow-tooltip/>
</el-table>
@@ -120,6 +121,35 @@
<span slot="footer" class="dialog-footer">
<el-button @click="questionPage.showDialog = false">鍙� 娑�</el-button>
<el-button type="primary" @click="confirmQuestionSelect">纭畾</el-button>
+ </span>
+ </el-dialog>
+
+ <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-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-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>
+ <el-button type="primary" @click="selectStudent">鏌ヨ</el-button>
+ </el-form-item>
+ </el-form>
+ <el-table v-loading="student.listLoading" :data="tableData" border fit highlight-current-row style="width: 100%" @selection-change="handleSelection">
+ <el-table-column type="selection"></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"/>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="studentDialog = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="confirmStudentSelect">纭畾</el-button>
</span>
</el-dialog>
</div>
@@ -132,16 +162,39 @@
import QuestionShow from '../question/components/Show'
import examPaperApi from '@/api/examPaper'
import questionApi from '@/api/question'
+import departmentApi from '@/api/department'
+import userApi from '@/api/user'
export default {
components: { Pagination, QuestionShow },
data () {
return {
+ tags: [],
+ depts: [],
+ student: {},
+ studentDialog: false,
+ student: {
+ pageIndex: 1,
+ pageSize: 5,
+ listLoading: true,
+ multipleSelection: []
+ },
+ tableData: [],
+ total: 0,
+ props: {
+ multiple: true
+ },
+ options: [],
+ departCascaderProps:{
+ multiple: true
+ },
subjectIdList:[],
form: {
+ menuIds: [],
aggregateSource:100,
id: null,
departmentIds: [],
+ userIds: [],
subjectId: [],
paperType: 1,
limitDateTime: [],
@@ -154,11 +207,14 @@
subjectFilter: null,
formLoading: false,
rules: {
- departmentIds: [
- { required: true, message: '璇烽�夋嫨閮ㄩ棬', trigger: 'change' }
+ menuIds: [
+ { required: true, message: '璇烽�夋嫨', trigger: 'change' }
],
subjectId: [
{ required: true, message: '璇烽�夋嫨璇剧洰', trigger: 'change' }
+ ],
+ deptId: [
+ { required: true, message: '璇烽�夋嫨閮ㄩ棬', trigger: 'change' }
],
paperType: [
{ required: true, message: '璇烽�夋嫨璇曞嵎绫诲瀷', trigger: 'change' }
@@ -197,11 +253,38 @@
_this.formLoading = true
examPaperApi.select(id).then(re => {
_this.form = re.response
+ _this.form.menuIds = JSON.parse(re.response.menuIds)
+ console.log(_this.form)
_this.formLoading = false
})
}
+ departmentApi.selectDepartmentUser().then(res => {
+ console.log("res",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}})}})
+ })
+ departmentApi.getDeptAdmins().then(res => {
+ this.depts = res.response
+ })
},
methods: {
+ getTags () {
+ userApi.tagList(null).then(data => {
+ this.tags = data.response
+ })
+ },
+ selectStudent() {
+ this.getTags();
+ this.studentDialog = true;
+ examPaperApi.selectStudent(this.student).then(res => {
+ this.tableData = res.response.list
+ this.total = res.response.total
+ this.student.listLoading = false
+ })
+ },
+ handleChange(val){
+ console.log(val)
+ },
titlejs(val){
console.log(val)
let str = ''
@@ -265,20 +348,28 @@
}else {
this.form.subjectSource={}
this.subjectIdList = []
+ this.form.questionTypeVMS=[]
// this.form.paperType = 1
}
},
submitForm () {
let _this = this
- console.log(this.subjectIdList)
- console.log(this.form.subjectSource)
this.$refs.form.validate((valid) => {
if (valid) {
- this.formLoading = true
+ this.formLoading = true;
if (this.subjectIdList.length == 1){
this.form.subjectId= this.form.subjectId
+ };
+ // let op = [];
+ // for(var ele of this.form.menuIds){
+ // op.push(ele[1])
+ // };
+ this.form.userIds = this.form.menuIds;
+ this.form.menuIds = JSON.stringify(this.form.menuIds);
+ console.log("laks",this.form)
+ if(this.form.questionTypeVMS == null){
+ this.form.questionTypeVMS = [];
}
-
examPaperApi.edit(this.form).then(re => {
if (re.code === 1) {
_this.$message.success(re.message)
@@ -304,6 +395,7 @@
})
},
addQuestion (titleItem) {
+ console.log('titleItem', titleItem)
this.currentTitleItem = titleItem
this.questionPage.showDialog = true
this.search()
@@ -322,10 +414,18 @@
let _this = this
this.questionPage.multipleSelection.forEach(q => {
questionApi.select(q.id).then(re => {
- _this.currentTitleItem.questionItems.push(re.response)
+ if (!_this.currentTitleItem.questionItems.some(obj => obj.id === re.response.id)) {
+ _this.currentTitleItem.questionItems.push(re.response)
+ }
})
})
this.questionPage.showDialog = false
+ },
+ confirmStudentSelect () {
+ this.student.multipleSelection.forEach(q => {
+ this.form.menuIds.push(q.id)
+ })
+ this.studentDialog = false
},
levelChange () {
// this.form.subjectId = null
@@ -361,6 +461,9 @@
handleSelectionChange (val) {
this.questionPage.multipleSelection = val
},
+ handleSelection (val) {
+ this.student.multipleSelection = val
+ },
questionTypeFormatter (row, column, cellValue, index) {
return this.enumFormat(this.questionTypeEnum, cellValue)
},
@@ -370,15 +473,18 @@
resetForm () {
let lastId = this.form.id
this.$refs['form'].resetFields()
- this.form = {
- id: null,
- departmentIds: [],
- subjectId: null,
- paperType: 1,
- limitDateTime: [],
- name: '',
- suggestTime: null,
- titleItems: []
+ this.form= {
+ aggregateSource:100,
+ id: null,
+ departmentIds: [],
+ subjectId: [],
+ paperType: 1,
+ limitDateTime: [],
+ name: '',
+ suggestTime: null,
+ titleItems: [],
+ subjectSource:null,
+ questionTypeVMS:[]
}
this.form.id = lastId
},
--
Gitblit v1.8.0