|
|
@@ -6,6 +6,7 @@
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="完成状态">
|
|
|
<el-select
|
|
|
+ v-if="form.examType == '' || form.examType == 'ONLINE'"
|
|
|
class="form_search_width"
|
|
|
size="small"
|
|
|
v-model="form.finished"
|
|
|
@@ -15,6 +16,18 @@
|
|
|
<el-option value="true" label="已完成"></el-option>
|
|
|
<el-option value="false" label="未完成"></el-option>
|
|
|
</el-select>
|
|
|
+ <el-select
|
|
|
+ v-if="form.examType == 'OFFLINE'"
|
|
|
+ class="form_search_width"
|
|
|
+ size="small"
|
|
|
+ v-model="form.finished"
|
|
|
+ clearable
|
|
|
+ placeholder="全部"
|
|
|
+ >
|
|
|
+ <el-option value="0" label="未抽题"></el-option>
|
|
|
+ <el-option value="1" label="已抽题"></el-option>
|
|
|
+ <el-option value="2" label="已上传"></el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
@@ -59,6 +72,7 @@
|
|
|
>重置</el-button
|
|
|
>
|
|
|
</el-col>
|
|
|
+ <div class="block-seperator"></div>
|
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
|
<span>批量操作：</span>
|
|
|
@@ -106,23 +120,8 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column fixed="right" sortable label="完成状态">
|
|
|
<template slot-scope="scope">
|
|
|
- <span
|
|
|
- v-show="scope.row.finished && scope.row.examType == 'ONLINE'"
|
|
|
- ><el-tag type="success">已完成</el-tag>
|
|
|
- </span>
|
|
|
- <span
|
|
|
- v-show="!scope.row.finished && scope.row.examType == 'ONLINE'"
|
|
|
- ><el-tag type="danger">未完成</el-tag>
|
|
|
- </span>
|
|
|
- <span
|
|
|
- v-show="scope.row.finished && scope.row.examType == 'OFFLINE'"
|
|
|
- ><el-tag type="success">已抽题</el-tag>
|
|
|
- </span>
|
|
|
- <span
|
|
|
- v-show="
|
|
|
- !scope.row.finished && scope.row.examType == 'OFFLINE'
|
|
|
- "
|
|
|
- ><el-tag type="danger">未抽题</el-tag>
|
|
|
+ <span>
|
|
|
+ <el-tag> {{ scope.row.finishedStatus }} </el-tag>
|
|
|
</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -131,8 +130,9 @@
|
|
|
<el-row class="operateRow">
|
|
|
<el-col :span="24">
|
|
|
<el-button
|
|
|
- size="mini"
|
|
|
+ plain
|
|
|
type="primary"
|
|
|
+ size="mini"
|
|
|
icon="el-icon-view"
|
|
|
@click="previewPaper(scope.row.examStudentId)"
|
|
|
v-if="scope.row.examType == 'OFFLINE'"
|
|
|
@@ -143,8 +143,9 @@
|
|
|
<el-row class="operateRow">
|
|
|
<el-col :span="24">
|
|
|
<el-button
|
|
|
+ plain
|
|
|
+ type="primary"
|
|
|
size="mini"
|
|
|
- type="success"
|
|
|
icon="el-icon-download"
|
|
|
@click="exportPaper(scope.row.examStudentId)"
|
|
|
v-if="scope.row.examType == 'OFFLINE'"
|
|
|
@@ -155,8 +156,9 @@
|
|
|
<el-row class="operateRow">
|
|
|
<el-col :span="24">
|
|
|
<el-button
|
|
|
+ plain
|
|
|
+ type="primary"
|
|
|
size="mini"
|
|
|
- type="warning"
|
|
|
icon="el-icon-upload2"
|
|
|
@click="openUploadAnswerDialog(scope.row.examStudentId)"
|
|
|
v-if="
|
|
|
@@ -259,7 +261,7 @@ export default {
|
|
|
filterCondition: ""
|
|
|
},
|
|
|
tableData: [],
|
|
|
- exportUrl: "/api/ecs_oe_admin/exam/student/all/list/export",
|
|
|
+ exportUrl: "/api/ecs_oe_admin/exam/student/examScheduling/list/export",
|
|
|
exportFileName: "考试进度详情",
|
|
|
currentOfflineExamRecordDataId: "",
|
|
|
offlineAnswerFile: "",
|
|
|
@@ -314,7 +316,7 @@ export default {
|
|
|
}
|
|
|
this.tableLoading = true;
|
|
|
this.$http
|
|
|
- .post("/api/ecs_oe_admin/exam/student/all/list", this.form)
|
|
|
+ .post("/api/ecs_oe_admin/exam/student/examScheduling/list", this.form)
|
|
|
.then(response => {
|
|
|
if (response.data) {
|
|
|
var dataList = response.data.content;
|
|
|
@@ -354,9 +356,7 @@ export default {
|
|
|
if (response.data) {
|
|
|
var examRecordList = response.data;
|
|
|
if (examRecordList && examRecordList.length > 0) {
|
|
|
- window.open(
|
|
|
- "/questions/preview_paper/" + examRecordList[0].basePaperId
|
|
|
- );
|
|
|
+ window.open("/preview_paper/" + examRecordList[0].basePaperId);
|
|
|
} else {
|
|
|
this.$message({
|
|
|
message: "该考生未参加考试",
|
chenken