From 9030c2fe74229e892a66f295b629b5dd31244ea0 Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期日, 16 七月 2023 10:03:37 +0800
Subject: [PATCH] 随机试卷修改
---
src/api/department.js | 2 +
src/views/log/list.vue | 4 --
src/views/message/list.vue | 1
vue.config.js | 2
src/views/task/edit.vue | 1
src/views/exam/question/list.vue | 1
src/views/task/list.vue | 1
src/views/education/subject/list.vue | 1
src/views/user/student/list.vue | 1
src/views/education/department/list.vue | 1
src/views/exam/paper/list.vue | 1
src/views/user/admin/list.vue | 1
src/views/answer/list.vue | 1
src/views/exam/paper/edit.vue | 53 +++++++++++++++++++++-----
14 files changed, 46 insertions(+), 25 deletions(-)
diff --git a/src/api/department.js b/src/api/department.js
index ad2e75c..5bb8fc0 100644
--- a/src/api/department.js
+++ b/src/api/department.js
@@ -5,6 +5,8 @@
pageList: query => post('/api/admin/department/page/list', query),
edit: query => post('/api/admin/department/update', query),
select: id => post('/api/admin/department/get/' + id),
+ selectUser: id => post('/api/admin/department/getUserByDepartment/' + id),
+ selectDepartmentUser: id => post('/api/admin/department/getDepartmentUser'),
deleteSubject: id => post('/api/admin/education/department/delete/' + id),
addData:query=>post('/api/admin/department/add',query)
}
diff --git a/src/views/answer/list.vue b/src/views/answer/list.vue
index c84f010..3c8122c 100644
--- a/src/views/answer/list.vue
+++ b/src/views/answer/list.vue
@@ -22,7 +22,6 @@
</el-form>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
- <el-table-column prop="id" label="Id" width="100" />
<el-table-column prop="paperName" label="璇曞嵎鍚嶇О"/>
<el-table-column prop="userName" label="鐢ㄦ埛鍚嶇О"/>
<el-table-column label="寰楀垎" width="100px" >
diff --git a/src/views/education/department/list.vue b/src/views/education/department/list.vue
index c0d19bb..2821948 100644
--- a/src/views/education/department/list.vue
+++ b/src/views/education/department/list.vue
@@ -16,7 +16,6 @@
</el-form>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
- <el-table-column prop="id" label="Id" />
<el-table-column prop="name" label="閮ㄩ棬"/>
<!-- <el-table-column prop="levelName" label="閮ㄩ棬" />-->
<el-table-column width="220px" label="鎿嶄綔" align="center">
diff --git a/src/views/education/subject/list.vue b/src/views/education/subject/list.vue
index 39ac2b6..9299e88 100644
--- a/src/views/education/subject/list.vue
+++ b/src/views/education/subject/list.vue
@@ -16,7 +16,6 @@
</el-form>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
- <el-table-column prop="id" label="Id" />
<el-table-column prop="name" label="璇剧洰"/>
<!-- <el-table-column prop="levelName" label="閮ㄩ棬" />-->
<el-table-column width="220px" label="鎿嶄綔" align="center">
diff --git a/src/views/exam/paper/edit.vue b/src/views/exam/paper/edit.vue
index 55bc547..7012242 100644
--- a/src/views/exam/paper/edit.vue
+++ b/src/views/exam/paper/edit.vue
@@ -1,11 +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="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="userIds" required>
+ <el-cascader v-model="form.userIds" :options="options" :props="props" clearable collapse-tags>
+ </el-cascader>
</el-form-item>
<el-form-item label="璇剧洰锛�" prop="subjectId" required>
<el-select ref="subjectIdRef" v-model="form.subjectId" placeholder="璇剧洰" multiple
@@ -110,7 +108,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>
@@ -132,16 +129,37 @@
import QuestionShow from '../question/components/Show'
import examPaperApi from '@/api/examPaper'
import questionApi from '@/api/question'
+import departmentApi from '@/api/department'
export default {
components: { Pagination, QuestionShow },
data () {
return {
+ props: {
+ multiple: true
+ // lazy: true,
+ // lazyLoad (node, resolve) {
+ // console.log(node,"node");
+ // var that = this;
+ // departmentApi.selectUser(node.value).then(re=>{
+ // console.log(re,"re");
+ // const nodes = re.response.map(xxx=>{
+ // return {value: xxx.id,label: xxx.realName,leaf: node.level >= 1}
+ // });
+ // resolve(nodes);
+ // })
+ // }
+ },
+ options: [],
+ departCascaderProps:{
+ multiple: true
+ },
subjectIdList:[],
form: {
aggregateSource:100,
id: null,
departmentIds: [],
+ userIds: [],
subjectId: [],
paperType: 1,
limitDateTime: [],
@@ -154,8 +172,8 @@
subjectFilter: null,
formLoading: false,
rules: {
- departmentIds: [
- { required: true, message: '璇烽�夋嫨閮ㄩ棬', trigger: 'change' }
+ userIds: [
+ { required: true, message: '璇烽�夋嫨', trigger: 'change' }
],
subjectId: [
{ required: true, message: '璇烽�夋嫨璇剧洰', trigger: 'change' }
@@ -197,9 +215,16 @@
_this.formLoading = true
examPaperApi.select(id).then(re => {
_this.form = re.response
+ _this.form.userIds = re.response.userId
+ 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}})}})
+ })
},
methods: {
titlejs(val){
@@ -274,11 +299,19 @@
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.userIds){
+ op.push(ele[1])
+ };
+ this.form.userIds = op;
+ 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)
diff --git a/src/views/exam/paper/list.vue b/src/views/exam/paper/list.vue
index 0e1f88a..356bc5d 100644
--- a/src/views/exam/paper/list.vue
+++ b/src/views/exam/paper/list.vue
@@ -22,7 +22,6 @@
</el-form-item>
</el-form>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
- <el-table-column prop="id" label="Id" width="90px"/>
<el-table-column prop="subjectId" label="璇剧洰" :formatter="subjectFormatter" width="120px" />
<el-table-column prop="name" label="鍚嶇О" />
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="160px"/>
diff --git a/src/views/exam/question/list.vue b/src/views/exam/question/list.vue
index 532f6c3..8beb50c 100644
--- a/src/views/exam/question/list.vue
+++ b/src/views/exam/question/list.vue
@@ -51,7 +51,6 @@
</el-form-item>
</el-form>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
- <el-table-column prop="id" label="Id" width="90px"/>
<el-table-column prop="subjectId" label="璇剧洰" :formatter="subjectIdFormatte" width="120px"/>
<!-- <el-table-column prop="subjectId" label="璇剧洰">-->
<!-- <template slot-scope="scope">-->
diff --git a/src/views/log/list.vue b/src/views/log/list.vue
index 60069de..bc260e8 100644
--- a/src/views/log/list.vue
+++ b/src/views/log/list.vue
@@ -1,9 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParam" ref="queryForm" :inline="true">
- <el-form-item label="鐢ㄦ埛Id锛�">
- <el-input v-model="queryParam.userId"></el-input>
- </el-form-item>
<el-form-item label="鐢ㄦ埛鍚嶏細">
<el-input v-model="queryParam.userName"></el-input>
</el-form-item>
@@ -13,7 +10,6 @@
</el-form>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
- <el-table-column prop="id" label="Id" width="100" />
<el-table-column prop="userName" label="鐢ㄦ埛鍚�" width="150" />
<el-table-column prop="realName" label="鐪熷疄濮撳悕" width="150" />
<el-table-column prop="content" label="鍔ㄦ��" />
diff --git a/src/views/message/list.vue b/src/views/message/list.vue
index e9597fd..76cf94e 100644
--- a/src/views/message/list.vue
+++ b/src/views/message/list.vue
@@ -10,7 +10,6 @@
</el-form>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
- <el-table-column prop="id" label="Id" width="100" />
<el-table-column prop="title" label="鏍囬" show-overflow-tooltip/>
<el-table-column prop="content" label="鍐呭" show-overflow-tooltip />
<el-table-column prop="sendUserName" label="鍙戦�佷汉" width="100" />
diff --git a/src/views/task/edit.vue b/src/views/task/edit.vue
index e449912..bc7eee9 100644
--- a/src/views/task/edit.vue
+++ b/src/views/task/edit.vue
@@ -43,7 +43,6 @@
<el-table v-loading="paperPage.listLoading" :data="paperPage.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="90px"/>
<el-table-column prop="subjectId" label="璇剧洰" :formatter="subjectFormatter" width="120px" />
<el-table-column prop="name" label="鍚嶇О" />
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="160px"/>
diff --git a/src/views/task/list.vue b/src/views/task/list.vue
index 18d3a1b..13dc9c7 100644
--- a/src/views/task/list.vue
+++ b/src/views/task/list.vue
@@ -12,7 +12,6 @@
</el-form>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
- <el-table-column prop="id" label="Id" width="100" />
<el-table-column prop="title" label="鏍囬" />
<el-table-column prop="gradeLevel" label="瀛︾骇" :formatter="levelFormatter"/>
<el-table-column prop="createUserName" label="鍙戦�佷汉" width="100" />
diff --git a/src/views/user/admin/list.vue b/src/views/user/admin/list.vue
index 84c860d..922b592 100644
--- a/src/views/user/admin/list.vue
+++ b/src/views/user/admin/list.vue
@@ -13,7 +13,6 @@
</el-form>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
- <el-table-column prop="id" label="Id" />
<el-table-column prop="userName" label="鐢ㄦ埛鍚�"/>
<el-table-column prop="realName" label="鐪熷疄濮撳悕" />
<el-table-column prop="sex" label="鎬у埆" width="60px;" :formatter="sexFormatter"/>
diff --git a/src/views/user/student/list.vue b/src/views/user/student/list.vue
index 63db439..98b2a4a 100644
--- a/src/views/user/student/list.vue
+++ b/src/views/user/student/list.vue
@@ -27,7 +27,6 @@
</el-form>
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
- <el-table-column prop="id" label="Id" />
<el-table-column prop="userName" label="鐢ㄦ埛鍚�"/>
<el-table-column prop="realName" label="鐪熷疄濮撳悕" />
<el-table-column prop="userLevel" label="瀛︾骇" :formatter="levelFormatter"/>
diff --git a/vue.config.js b/vue.config.js
index 2284dab..43e9f92 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -19,7 +19,7 @@
hotOnly: false,
proxy: {
'/api': {
- target: 'http://192.168.3.228:8000',
+ target: 'http://localhost:8000',
changeOrigin: true
}
}
--
Gitblit v1.8.0