|
@@ -17,6 +17,10 @@
|
|
|
<div class="board-score">
|
|
|
<span>{{ totalScore }}分</span>
|
|
|
</div>
|
|
|
+ <div class="total-all-score-title"><span>全卷分</span></div>
|
|
|
+ <div class="total-all-score">
|
|
|
+ <span>{{ totalAllScore }}</span>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<!-- 鼠标模式 -->
|
|
|
<div v-if="isMouseMode">
|
|
@@ -221,6 +225,7 @@ import { CORE_API, MARKING_API } from "@/constants/constants";
|
|
|
import { EVENTHUB } from "../constants/constants";
|
|
|
export default {
|
|
|
props: {
|
|
|
+ objectiveScore: { type: Number, default: 0.0 },
|
|
|
paperMarkSign: {
|
|
|
type: Array,
|
|
|
default: () => [],
|
|
@@ -340,6 +345,9 @@ export default {
|
|
|
}
|
|
|
return totalScore;
|
|
|
},
|
|
|
+ totalAllScore() {
|
|
|
+ return this.accAdd(this.totalScore, this.objectiveScore);
|
|
|
+ },
|
|
|
itemScores() {
|
|
|
var itemScores = [];
|
|
|
var scoreInterval = this.resultItem.markItem.scoreInterval;
|
|
@@ -938,7 +946,7 @@ li {
|
|
|
.second-board {
|
|
|
color: white;
|
|
|
margin-top: 20px;
|
|
|
- padding-bottom: 20px;
|
|
|
+ padding-bottom: 54px;
|
|
|
border-bottom: 1px solid #ccc;
|
|
|
}
|
|
|
.clear {
|
|
@@ -1038,7 +1046,7 @@ li {
|
|
|
border-bottom: 1px solid #ccc;
|
|
|
}
|
|
|
.board-title {
|
|
|
- height: 50px;
|
|
|
+ height: 34px;
|
|
|
width: 80px;
|
|
|
background: rgb(255, 109, 109);
|
|
|
border: 2px solid rgb(255, 109, 109);
|
|
@@ -1048,22 +1056,36 @@ li {
|
|
|
border-top-left-radius: 15px;
|
|
|
border-bottom-left-radius: 15px;
|
|
|
float: left;
|
|
|
- font-size: 30px;
|
|
|
- line-height: 0.5;
|
|
|
+ font-size: 24px;
|
|
|
+ line-height: 0;
|
|
|
}
|
|
|
.board-score {
|
|
|
- height: 50px;
|
|
|
- width: 110px;
|
|
|
+ float: left;
|
|
|
+ height: 34px;
|
|
|
+ width: 63px;
|
|
|
border: 2px solid rgb(255, 109, 109);
|
|
|
- margin-left: 80px;
|
|
|
text-align: center;
|
|
|
padding-top: 20px;
|
|
|
font-weight: 600;
|
|
|
color: rgb(255, 109, 109);
|
|
|
border-top-right-radius: 15px;
|
|
|
border-bottom-right-radius: 15px;
|
|
|
- font-size: 30px;
|
|
|
- line-height: 0.5;
|
|
|
+ font-size: 20px;
|
|
|
+ line-height: 0;
|
|
|
+}
|
|
|
+.total-all-score-title {
|
|
|
+ color: black;
|
|
|
+ margin-left: 10px;
|
|
|
+ float: left;
|
|
|
+ font-weight: 600;
|
|
|
+ line-height: 3;
|
|
|
+}
|
|
|
+.total-all-score {
|
|
|
+ color: red;
|
|
|
+ margin-left: 10px;
|
|
|
+ font-weight: 600;
|
|
|
+ line-height: 3;
|
|
|
+ float: left;
|
|
|
}
|
|
|
.title-board {
|
|
|
margin-top: 20px;
|