Skip to content

S
school-paper-admin-front
Commit e03b4576 by H.wb.wang.peixun
Options

接口对接

parent bd22908c
Showing with 57 additions and 27 deletions
src/api/school-paper/testPaperRecord.js
import request from '@/utils/request' import request from '@/utils/request'
// 查询答题记录列表 // 审批阅卷班级列表
export function listTestPaperRecord(query) { export function listTestPaperRecord(query) {
return request({ return request({
url: '/school-paper/testPaperRecord/getPhaseList', url: '/school-paper/testPaperRecord/getPhaseList',
...@@ -8,7 +8,14 @@ export function listTestPaperRecord(query) { ...@@ -8,7 +8,14 @@ export function listTestPaperRecord(query) {
params: query params: query
}) })
} }
// 审批阅卷学生列表
export function listgetClassList(query) {
return request({
url: '/school-paper/testPaperRecord/getClassList',
method: 'get',
params: query
})
}
// 查询答题记录详细 // 查询答题记录详细
export function getTestPaperRecord(id) { export function getTestPaperRecord(id) {
return request({ return request({
......
src/views/school-paper/questionBank/index.vue
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="阶段" prop="phaseId"> <el-form-item label="班级" prop="phaseId">
<el-select clearable v-model="queryParams.phaseId" placeholder="请选择阶段"> <el-select clearable v-model="queryParams.phaseId" placeholder="请选择班级">
<el-option v-for="item in PhaseList" :key="item.deptId" :label="item.deptName" :value="item.deptId"> <el-option v-for="item in PhaseList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
</el-option> </el-option>
</el-select> </el-select>
......
src/views/school-paper/testPaper/index.vue
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
<el-form-item label="审批阅卷" prop="testName"> <el-form-item label="审批阅卷" prop="testName">
<el-input v-model="queryParams.testName" placeholder="请输入试卷名称搜索" clearable /> <el-input v-model="queryParams.testName" placeholder="请输入试卷名称搜索" clearable />
</el-form-item> </el-form-item>
<el-form-item label="阶段" prop="categoryId"> <el-form-item label="班级" prop="categoryId">
<el-select v-model="value" placeholder="请选择"> <el-select v-model="value" placeholder="请选择">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in PhaseList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['school-paper:testPaper:export']" v-hasPermi="['school-paper:testPaper:export']"
>导出</el-button> >导出</el-button>handleUpdate
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> --> </el-row> -->
...@@ -169,6 +169,9 @@ ...@@ -169,6 +169,9 @@
<script> <script>
import { listTestPaper, getTestPaper, delTestPaper, addTestPaper, updateTestPaper, questionType } from "@/api/school-paper/testPaper"; import { listTestPaper, getTestPaper, delTestPaper, addTestPaper, updateTestPaper, questionType } from "@/api/school-paper/testPaper";
import {
getPhaseList
} from "@/api/school-paper/questionBank";
import Treeselect from "./components/treeselect.vue" import Treeselect from "./components/treeselect.vue"
export default { export default {
...@@ -176,6 +179,7 @@ export default { ...@@ -176,6 +179,7 @@ export default {
components: { Treeselect }, components: { Treeselect },
data() { data() {
return { return {
PhaseList: [], // 阶段
rightAnswers: '', rightAnswers: '',
srcList: [], srcList: [],
url: '', url: '',
...@@ -283,12 +287,16 @@ export default { ...@@ -283,12 +287,16 @@ export default {
}, },
methods: { methods: {
//题库类别 //题库类别
questionType() { questionType() {
questionType({ pageSize: 9999, pageNum: 1 }).then((res) => { questionType({ pageSize: 9999, pageNum: 1 }).then((res) => {
this.category = res.rows this.category = res.rows
// console.log(res,'this.questionBankList======') // console.log(res,'this.questionBankList======')
}) })
getPhaseList().then((res) => {
this.PhaseList = res.data
})
}, },
clickMark(val) { clickMark(val) {
// if(val == 1){ // if(val == 1){
...@@ -356,8 +364,8 @@ export default { ...@@ -356,8 +364,8 @@ export default {
getTestPaper(id).then(response => { getTestPaper(id).then(response => {
this.loading = false; this.loading = false;
this.form = response.data; this.form = response.data;
this.open = true; this.opens = true;
this.title = "修改试卷"; this.title = "查看试卷";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
......
src/views/school-paper/testPaperRecord/index.vue
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="审批阅卷" prop="userId"> <el-form-item label="审批阅卷" prop="testName">
<el-input v-model="queryParams.userId" placeholder="请输入试卷名称搜索" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.testName" placeholder="请输入试卷名称搜索" clearable :disabled="disabled"/>
</el-form-item> </el-form-item>
<el-form-item label="阶段" prop="testPaperId"> <el-form-item label="班级" prop="phaseId">
<el-select v-model="value" placeholder="请选择阶段"> <el-select v-model="queryParams.phaseId" placeholder="请选择班级">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> <el-option v-for="item in PhaseList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -66,9 +66,9 @@ ...@@ -66,9 +66,9 @@
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" /> <!-- <el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键id" align="center" prop="id" v-if="true"/> --> <el-table-column label="主键id" align="center" prop="id" v-if="true"/> -->
<el-table-column label="试卷名称" prop="testName" /> <el-table-column label="试卷名称" prop="testName" />
<el-table-column label="满分" prop="totalPoints" /> <el-table-column label="满分" prop="totalPoints" />
<el-table-column label="阶段" prop="status" /> <el-table-column label="班级" prop="classId" />
<!-- <el-table-column label="总得分" align="center" prop="totalPoints" /> <!-- <el-table-column label="总得分" align="center" prop="totalPoints" />
<el-table-column label="备注" align="center" prop="remark" /> --> <el-table-column label="备注" align="center" prop="remark" /> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
...@@ -89,9 +89,9 @@ ...@@ -89,9 +89,9 @@
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" /> <!-- <el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键id" align="center" prop="id" v-if="true"/> --> <el-table-column label="主键id" align="center" prop="id" v-if="true"/> -->
<el-table-column label="同学名称" prop="userId" /> <el-table-column label="同学名称" prop="userId" />
<el-table-column label="班级" prop="testPaperId" /> <el-table-column label="班级" prop="classId" />
<el-table-column label="得分" prop="status" /> <el-table-column label="得分" prop="status" />
<!-- <el-table-column label="总得分" align="center" prop="totalPoints" /> <!-- <el-table-column label="总得分" align="center" prop="totalPoints" />
<el-table-column label="备注" align="center" prop="remark" /> --> <el-table-column label="备注" align="center" prop="remark" /> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
...@@ -134,8 +134,10 @@ ...@@ -134,8 +134,10 @@
</template> </template>
<script> <script>
import { listTestPaperRecord, getTestPaperRecord, delTestPaperRecord, addTestPaperRecord, updateTestPaperRecord } from "@/api/school-paper/testPaperRecord"; import { listTestPaperRecord, getTestPaperRecord, delTestPaperRecord, addTestPaperRecord, updateTestPaperRecord,listgetClassList } from "@/api/school-paper/testPaperRecord";
import {
getPhaseList
} from "@/api/school-paper/questionBank";
export default { export default {
name: "TestPaperRecord", name: "TestPaperRecord",
data() { data() {
...@@ -145,6 +147,8 @@ export default { ...@@ -145,6 +147,8 @@ export default {
'https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg', 'https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg',
'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg' 'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg'
], ],
disabled:false,
PhaseList: [], // 阶段
value: '', value: '',
typePaper: 1, typePaper: 1,
options: [{ options: [{
...@@ -187,10 +191,8 @@ export default { ...@@ -187,10 +191,8 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
userId: undefined, phaseId: undefined,
testPaperId: undefined, testName: undefined,
status: undefined,
totalPoints: undefined,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
...@@ -219,11 +221,24 @@ export default { ...@@ -219,11 +221,24 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
this.questionType()
}, },
methods: { methods: {
// 阶段
questionType() {
getPhaseList().then((res) => {
this.PhaseList = res.data
})
},
// 批卷 // 批卷
examination(val) { examination(val) {
if (val == 1) { if (val == 1) {
listgetClassList(this.queryParams).then(response => {
this.testPaperRecordList = response.rows;
this.total = response.total;
this.loading = false;
});
this.disabled = true
this.typePaper = 2 this.typePaper = 2
} else if (val == 2) { } else if (val == 2) {
this.reset(); this.reset();
......
src/views/system/dept/index.vue
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="阶段" prop="parentId"> <el-form-item label="班级" prop="parentId">
<treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" :show-count="true" placeholder="选择上级阶段" /> <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" :show-count="true" placeholder="选择上级阶段" />
</el-form-item> </el-form-item>
</el-col> </el-col>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment