|
@@ -12,73 +12,49 @@
|
|
|
<small class="marktitle titlefont">
|
|
|
<span>试卷编号:{{ task.paperName }}</span>
|
|
|
</small>
|
|
|
- <small class="marktitle">
|
|
|
- <el-button-group>
|
|
|
- <el-button size="small"
|
|
|
- ><span class="titlefont">已评</span></el-button
|
|
|
- >
|
|
|
- <el-button size="small" @click="markedClick"
|
|
|
- ><span class="titlefont">{{
|
|
|
- task.markedCount
|
|
|
- }}</span></el-button
|
|
|
- >
|
|
|
- </el-button-group>
|
|
|
+ <small class="marktitle titlefont">
|
|
|
+ <span>待评:{{ task.leftCount }}</span>
|
|
|
</small>
|
|
|
- <small class="marktitle">
|
|
|
- <el-button-group>
|
|
|
- <el-button size="small"
|
|
|
- ><span class="titlefont">待评</span></el-button
|
|
|
- >
|
|
|
- <el-button size="small"
|
|
|
- ><span class="titlefont">{{ task.leftCount }}</span></el-button
|
|
|
- >
|
|
|
- </el-button-group>
|
|
|
+ <small class="marktitle titlefont">
|
|
|
+ <span>
|
|
|
+ 进度:{{
|
|
|
+ (
|
|
|
+ ((task.totalCount - task.leftCount) * 100) /
|
|
|
+ task.totalCount
|
|
|
+ ).toFixed(2)
|
|
|
+ }}%
|
|
|
+ </span>
|
|
|
</small>
|
|
|
+ <!--
|
|
|
+ <small class="marktitle">
|
|
|
+ <el-button-group>
|
|
|
+ <el-button size="small">
|
|
|
+ <span class="titlefont">待评</span>
|
|
|
+ </el-button>
|
|
|
+ <el-button size="small">
|
|
|
+ <span class="titlefont">{{ task.leftCount }}</span>
|
|
|
+ </el-button>
|
|
|
+ </el-button-group>
|
|
|
+ </small>
|
|
|
+ -->
|
|
|
<small class="marktitle">
|
|
|
<el-button-group>
|
|
|
- <el-button size="small"
|
|
|
- ><span class="titlefont">进度</span></el-button
|
|
|
- >
|
|
|
- <el-button size="small"
|
|
|
- ><span class="titlefont"
|
|
|
- >{{
|
|
|
- (
|
|
|
- ((task.totalCount - task.leftCount) * 100) /
|
|
|
- task.totalCount
|
|
|
- ).toFixed(2)
|
|
|
- }}%</span
|
|
|
- ></el-button
|
|
|
- >
|
|
|
+ <el-button size="small">
|
|
|
+ <span class="titlefont">已评</span>
|
|
|
+ </el-button>
|
|
|
+ <el-button size="small" @click="markedClick">
|
|
|
+ <span class="titlefont"> {{ task.markedCount }} </span>
|
|
|
+ </el-button>
|
|
|
</el-button-group>
|
|
|
</small>
|
|
|
<small class="marktitle">
|
|
|
<el-button type="primary" @click="taskChange" size="small">
|
|
|
- <span class="titlefont"
|
|
|
- >切换任务 <i class="el-icon-caret-bottom el-icon--right"></i>
|
|
|
+ <span class="titlefont">
|
|
|
+ 切换任务 <i class="el-icon-caret-bottom el-icon--right"></i>
|
|
|
</span>
|
|
|
</el-button>
|
|
|
</small>
|
|
|
- <small class="marktitle">
|
|
|
- <el-button-group>
|
|
|
- <el-button size="small"
|
|
|
- ><span class="titlefont"
|
|
|
- ><v-icon name="user" style="height:12"/></span
|
|
|
- ></el-button>
|
|
|
- <el-button size="small"
|
|
|
- ><span class="titlefont">{{
|
|
|
- user.displayName
|
|
|
- }}</span></el-button
|
|
|
- >
|
|
|
- </el-button-group>
|
|
|
- </small>
|
|
|
- <small class="marktitle titlefont marksign">
|
|
|
- <el-button type="success" @click="backIndex" size="small">
|
|
|
- <v-icon name="sign-out-alt" />
|
|
|
- <span class="titlefont">退回 </span>
|
|
|
- </el-button>
|
|
|
- </small>
|
|
|
-
|
|
|
- <el-dialog title="切换任务" :visible.sync="taskVisible" size="large">
|
|
|
+ <el-dialog title="切换任务" :visible.sync="taskVisible" width="80%">
|
|
|
<div class="scroll">
|
|
|
<el-form
|
|
|
:inline="true"
|
|
@@ -132,9 +108,8 @@
|
|
|
size="small"
|
|
|
type="success"
|
|
|
@click="tasksSelect(scope.$index, scope.row);"
|
|
|
+ >选择</el-button
|
|
|
>
|
|
|
- 选择
|
|
|
- </el-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -147,8 +122,7 @@
|
|
|
:page-size="pageSize"
|
|
|
layout="total, prev, pager, next, jumper"
|
|
|
:total="changeTaskTotal"
|
|
|
- >
|
|
|
- </el-pagination>
|
|
|
+ ></el-pagination>
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
@@ -156,7 +130,7 @@
|
|
|
<el-dialog
|
|
|
title="已评任务"
|
|
|
:visible.sync="markedTaskVisible"
|
|
|
- size="large"
|
|
|
+ width="80%"
|
|
|
>
|
|
|
<div class="scroll">
|
|
|
<el-form
|
|
@@ -164,8 +138,7 @@
|
|
|
:model="markTaskFormSearch"
|
|
|
label-position="right"
|
|
|
label-width="70px"
|
|
|
- >
|
|
|
- </el-form>
|
|
|
+ ></el-form>
|
|
|
<el-table :data="markedResults" border style="width: 100%">
|
|
|
<el-table-column
|
|
|
label="答卷Id"
|
|
@@ -176,9 +149,9 @@
|
|
|
<el-table-column label="评阅时间">
|
|
|
<template slot-scope="scope">
|
|
|
<div>
|
|
|
- <span style="margin-left: 10px">{{
|
|
|
- dateFormatter(scope.row)
|
|
|
- }}</span>
|
|
|
+ <span style="margin-left: 10px">
|
|
|
+ {{ dateFormatter(scope.row) }}
|
|
|
+ </span>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -188,18 +161,18 @@
|
|
|
<el-table-column label="问题卷">
|
|
|
<template slot-scope="scope">
|
|
|
<div>
|
|
|
- <span style="margin-left: 10px">{{
|
|
|
- getTagName(scope.row.tag)
|
|
|
- }}</span>
|
|
|
+ <span style="margin-left: 10px">
|
|
|
+ {{ getTagName(scope.row.tag) }}
|
|
|
+ </span>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="评卷备注">
|
|
|
<template slot-scope="scope">
|
|
|
<div>
|
|
|
- <span style="margin-left: 10px">{{
|
|
|
- scope.row.markRemark
|
|
|
- }}</span>
|
|
|
+ <span style="margin-left: 10px">
|
|
|
+ {{ scope.row.markRemark }}
|
|
|
+ </span>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -210,9 +183,8 @@
|
|
|
size="small"
|
|
|
type="success"
|
|
|
@click="markTaskSelect(scope.$index, scope.row);"
|
|
|
+ >选择</el-button
|
|
|
>
|
|
|
- 选择
|
|
|
- </el-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -225,12 +197,25 @@
|
|
|
:page-size="pageSize"
|
|
|
layout="total, prev, pager, next, jumper"
|
|
|
:total="markedTotal"
|
|
|
- >
|
|
|
- </el-pagination>
|
|
|
+ ></el-pagination>
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
</span>
|
|
|
+ <span class="pull-right">
|
|
|
+ <small class="marktitle titlefont">
|
|
|
+ <span class="titlefont">
|
|
|
+ <v-icon name="user" style="height:12" />
|
|
|
+ {{ user.displayName }}
|
|
|
+ </span>
|
|
|
+ </small>
|
|
|
+ <small class="marktitle titlefont marksign">
|
|
|
+ <el-button type="success" @click="backIndex" size="mini">
|
|
|
+ <v-icon name="sign-out-alt" />
|
|
|
+ <span class="titlefont">退回</span>
|
|
|
+ </el-button>
|
|
|
+ </small>
|
|
|
+ </span>
|
|
|
</span>
|
|
|
</section>
|
|
|
|
|
@@ -249,6 +234,7 @@
|
|
|
:markSign="markSign"
|
|
|
:studentPaper="studentPaper"
|
|
|
:examType="examType"
|
|
|
+ :answerHtml="answerHtml"
|
|
|
></tpMain>
|
|
|
<!-- 文本图片给分板 -->
|
|
|
<tpScoreboard
|
|
@@ -274,7 +260,7 @@
|
|
|
import { mapState } from "vuex";
|
|
|
import TpMain from "./TpMain.vue";
|
|
|
import TpScoreBoard from "./TpScoreBoard.vue";
|
|
|
-import { MARKING_API, DATA_PROCESS_API } from "../constants/constants";
|
|
|
+import { MARKING_API, DATA_PROCESS_API, Q_API } from "../constants/constants";
|
|
|
export default {
|
|
|
components: {
|
|
|
tpMain: TpMain,
|
|
@@ -329,7 +315,8 @@ export default {
|
|
|
backMark: false,
|
|
|
//获取试卷标志(成功获取true,没有试卷false)
|
|
|
paperMark: true,
|
|
|
- tags: []
|
|
|
+ tags: [],
|
|
|
+ answerHtml: null
|
|
|
};
|
|
|
},
|
|
|
methods: {
|
|
@@ -363,10 +350,12 @@ export default {
|
|
|
this.getChangeTasks();
|
|
|
},
|
|
|
async tasksSelect(index, row) {
|
|
|
+ this.answerHtml = null;
|
|
|
await this.initMarkItem();
|
|
|
await this.markInit();
|
|
|
this.task = row;
|
|
|
await this.getPaper();
|
|
|
+ await this.getAnswerHtml();
|
|
|
await this.getMarkRange();
|
|
|
await this.getMarkedTask();
|
|
|
this.taskVisible = false;
|
|
@@ -389,12 +378,13 @@ export default {
|
|
|
this.markedCurrentPage = val;
|
|
|
this.getMarkedTask();
|
|
|
},
|
|
|
- markTaskSelect(index, row) {
|
|
|
+ async markTaskSelect(index, row) {
|
|
|
this.backMark = true;
|
|
|
this.paperMark = true;
|
|
|
this.textarea = row.markRemark;
|
|
|
- this.getMarkedPaper(row.studentPaperId);
|
|
|
- this.getMarkedResultItems(row.id);
|
|
|
+ await this.getMarkedPaper(row.studentPaperId);
|
|
|
+ await this.getMarkedResultItems(row.id);
|
|
|
+ await this.getAnswerHtml();
|
|
|
this.markedTaskVisible = false;
|
|
|
},
|
|
|
async markInit() {
|
|
@@ -582,6 +572,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
async getNext() {
|
|
|
+ this.answerHtml = null;
|
|
|
//试卷全部评完且回评时不继续获取试卷
|
|
|
if (this.backMark && this.allMarked) {
|
|
|
return;
|
|
@@ -589,6 +580,7 @@ export default {
|
|
|
this.initMarkItem();
|
|
|
await this.markInit();
|
|
|
await this.getPaper();
|
|
|
+ await this.getAnswerHtml();
|
|
|
await this.getChangeTasks();
|
|
|
await this.getMarkRange();
|
|
|
await this.getMarkedTask();
|
|
@@ -615,6 +607,16 @@ export default {
|
|
|
type: "warning"
|
|
|
});
|
|
|
}
|
|
|
+ },
|
|
|
+ async getAnswerHtml() {
|
|
|
+ if (this.studentPaper.basePaperId) {
|
|
|
+ var paperId = this.studentPaper.basePaperId;
|
|
|
+ await this.$http
|
|
|
+ .get(Q_API + "/extract/getAnswerHtml/" + paperId)
|
|
|
+ .then(response => {
|
|
|
+ this.answerHtml = response.data;
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
@@ -658,6 +660,7 @@ export default {
|
|
|
await this.markInit();
|
|
|
await this.getChangeTasks();
|
|
|
await this.getPaper();
|
|
|
+ await this.getAnswerHtml();
|
|
|
await this.getMarkRange();
|
|
|
await this.getMarkedTask();
|
|
|
this.getTags();
|
|
@@ -671,13 +674,11 @@ export default {
|
|
|
}
|
|
|
.content {
|
|
|
min-height: 600px;
|
|
|
- padding: 15px;
|
|
|
margin-right: auto;
|
|
|
margin-left: auto;
|
|
|
- margin-top: 10px;
|
|
|
+ margin-top: 5px;
|
|
|
padding-left: 15px;
|
|
|
padding-right: 15px;
|
|
|
- padding-top: 60px;
|
|
|
}
|
|
|
small {
|
|
|
font-size: 18px;
|
|
@@ -687,19 +688,18 @@ small {
|
|
|
}
|
|
|
.content-header {
|
|
|
margin-top: 10px;
|
|
|
-}
|
|
|
-section {
|
|
|
- margin-top: 10px;
|
|
|
- margin-bottom: 20px;
|
|
|
+ margin-left: 15px;
|
|
|
+ overflow: hidden;
|
|
|
}
|
|
|
.box-body {
|
|
|
height: 100%;
|
|
|
- width: 100%;
|
|
|
border-top-left-radius: 0;
|
|
|
border-top-right-radius: 0;
|
|
|
border-bottom-right-radius: 3px;
|
|
|
border-bottom-left-radius: 3px;
|
|
|
- padding: 10px;
|
|
|
+ padding-left: 10px;
|
|
|
+ padding-right: 10px;
|
|
|
+ overflow: hidden;
|
|
|
}
|
|
|
.backcolor {
|
|
|
background-color: #ecf0f5;
|
|
@@ -708,7 +708,7 @@ li {
|
|
|
list-style-type: none;
|
|
|
}
|
|
|
.marktitle {
|
|
|
- margin-right: 10px;
|
|
|
+ margin-right: 20px;
|
|
|
margin-bottom: 10px;
|
|
|
font-size: 18px;
|
|
|
font-weight: 700;
|
|
@@ -738,6 +738,7 @@ li {
|
|
|
.label-danger {
|
|
|
background-color: #d9534f;
|
|
|
color: #fff;
|
|
|
+ padding: 2px;
|
|
|
}
|
|
|
.box.box-info {
|
|
|
border-top-color: #20a0ff;
|