|
@@ -1,44 +1,3 @@
|
|
-<style scoped>
|
|
|
|
-.markmain {
|
|
|
|
- width: 74%;
|
|
|
|
-}
|
|
|
|
-.scroll {
|
|
|
|
- overflow: auto;
|
|
|
|
- height: 600px;
|
|
|
|
-}
|
|
|
|
-.marktitle {
|
|
|
|
- margin-right: 20px;
|
|
|
|
- margin-bottom: 20px;
|
|
|
|
-}
|
|
|
|
-.signTitle {
|
|
|
|
- margin-left: 35%;
|
|
|
|
-}
|
|
|
|
-.itemTitle {
|
|
|
|
- margin-right: 10px;
|
|
|
|
-}
|
|
|
|
-.titlefont {
|
|
|
|
- font-size: 15px;
|
|
|
|
-}
|
|
|
|
-li {
|
|
|
|
- list-style-type: none;
|
|
|
|
-}
|
|
|
|
-.markbutton {
|
|
|
|
- width: 40px;
|
|
|
|
- height: 40px;
|
|
|
|
-}
|
|
|
|
-img {
|
|
|
|
- width: 100%;
|
|
|
|
- height: 100%;
|
|
|
|
-}
|
|
|
|
-.paper {
|
|
|
|
- width: 90%;
|
|
|
|
- min-height: 600px;
|
|
|
|
-}
|
|
|
|
-.fixed {
|
|
|
|
- position: fixed;
|
|
|
|
-}
|
|
|
|
-</style>
|
|
|
|
-<script src="../assets/js/Print.js"></script>
|
|
|
|
<template>
|
|
<template>
|
|
<div class="markmain pull-left scroll" id="student_paper">
|
|
<div class="markmain pull-left scroll" id="student_paper">
|
|
<el-tabs :active-name="activeName">
|
|
<el-tabs :active-name="activeName">
|
|
@@ -103,40 +62,21 @@ img {
|
|
打印
|
|
打印
|
|
</el-button>
|
|
</el-button>
|
|
</div>
|
|
</div>
|
|
- <div class="paper" id="answer-content">{{ getAnswerHtml }}</div>
|
|
|
|
|
|
+ <div
|
|
|
|
+ class="paper"
|
|
|
|
+ id="answer-content"
|
|
|
|
+ v-html="getAnswerHtml()"
|
|
|
|
+ ></div>
|
|
</div>
|
|
</div>
|
|
</el-tab-pane>
|
|
</el-tab-pane>
|
|
</template>
|
|
</template>
|
|
-
|
|
|
|
- <!--
|
|
|
|
- <el-tab-pane label="标答" name="second">
|
|
|
|
- <div id="answer-source" v-if="this.markTask.answer_source.type=='text'">
|
|
|
|
- <embed :src="this.markTask.answer_source.url"></embed>
|
|
|
|
- </div>
|
|
|
|
- <div v-if="this.markTask.answer_source.type=='picture'">
|
|
|
|
- <div v-for="url in this.markTask.answer_source.url">
|
|
|
|
- <img :src="url"></img>
|
|
|
|
- </div>
|
|
|
|
- </div>
|
|
|
|
- </el-tab-pane>
|
|
|
|
-
|
|
|
|
- <el-tab-pane label="试卷" name="third">
|
|
|
|
- <div id="paper-source" v-if="this.markTask.paper_source.type=='text'">
|
|
|
|
- <embed :src="this.markTask.paper_source.url"></embed>
|
|
|
|
- </div>
|
|
|
|
- <div v-if="this.markTask.paper_source.type=='picture'">
|
|
|
|
- <div v-for="url in this.markTask.paper_source.url">
|
|
|
|
- <img :src="url"></img>
|
|
|
|
- </div>
|
|
|
|
- </div>
|
|
|
|
- </el-tab-pane>
|
|
|
|
- -->
|
|
|
|
</el-tabs>
|
|
</el-tabs>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
<script>
|
|
<script>
|
|
import { Drawing } from "../canvas/mark_sign";
|
|
import { Drawing } from "../canvas/mark_sign";
|
|
-import { EVENTHUB, Q_API } from "../constants/constants";
|
|
|
|
|
|
+import { EVENTHUB, Q_API, UPAI_YUN } from "../constants/constants";
|
|
|
|
+import { Print } from "../store/Print";
|
|
export default {
|
|
export default {
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
@@ -157,9 +97,21 @@ export default {
|
|
"examType"
|
|
"examType"
|
|
],
|
|
],
|
|
methods: {
|
|
methods: {
|
|
|
|
+ getAnswerHtml() {
|
|
|
|
+ let content = "";
|
|
|
|
+ if (this.studentPaper.basePaperId) {
|
|
|
|
+ var paperId = this.studentPaper.basePaperId;
|
|
|
|
+ this.$http
|
|
|
|
+ .get(Q_API + "/extract/getAnswerHtml/" + paperId)
|
|
|
|
+ .then(response => {
|
|
|
|
+ console.log("html", response.data);
|
|
|
|
+ content = response.data;
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ return content;
|
|
|
|
+ },
|
|
getPdfUrl() {
|
|
getPdfUrl() {
|
|
var url = this.studentPaper.studentSubjectiveHtml;
|
|
var url = this.studentPaper.studentSubjectiveHtml;
|
|
- console.log("paperUrl", url);
|
|
|
|
var content = "";
|
|
var content = "";
|
|
if (url) {
|
|
if (url) {
|
|
if (url != "" && url.indexOf(".pdf") > -1) {
|
|
if (url != "" && url.indexOf(".pdf") > -1) {
|
|
@@ -234,6 +186,7 @@ export default {
|
|
let paperSigns = JSON.parse(signStorage);
|
|
let paperSigns = JSON.parse(signStorage);
|
|
if (paperSigns.length > 0) {
|
|
if (paperSigns.length > 0) {
|
|
for (let [index, paperSign] of paperSigns.entries()) {
|
|
for (let [index, paperSign] of paperSigns.entries()) {
|
|
|
|
+ console.log("score index:", index);
|
|
if (paperSign.itemId == this.signItem.id) {
|
|
if (paperSign.itemId == this.signItem.id) {
|
|
this.tmpSignScores.push(paperSign.score);
|
|
this.tmpSignScores.push(paperSign.score);
|
|
}
|
|
}
|
|
@@ -350,19 +303,6 @@ export default {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
- async getAnswerHtml() {
|
|
|
|
- var content = "";
|
|
|
|
- if (this.studentPaper.basePaperId) {
|
|
|
|
- var paperId = this.studentPaper.basePaperId;
|
|
|
|
- await this.$http
|
|
|
|
- .get(Q_API + "/extract/getAnswerHtml/" + paperId)
|
|
|
|
- .then(response => {
|
|
|
|
- console.log("html", response.data);
|
|
|
|
- content = response.data;
|
|
|
|
- });
|
|
|
|
- }
|
|
|
|
- return content;
|
|
|
|
- },
|
|
|
|
itemTitle() {
|
|
itemTitle() {
|
|
if (!this.markSign) return "无";
|
|
if (!this.markSign) return "无";
|
|
var title = "无";
|
|
var title = "无";
|
|
@@ -406,7 +346,7 @@ export default {
|
|
this.changeMarkSign();
|
|
this.changeMarkSign();
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- studentPaper(val) {
|
|
|
|
|
|
+ studentPaper() {
|
|
if (this.markSign) {
|
|
if (this.markSign) {
|
|
this.intMarkDraw();
|
|
this.intMarkDraw();
|
|
}
|
|
}
|
|
@@ -417,7 +357,7 @@ export default {
|
|
signScores(val) {
|
|
signScores(val) {
|
|
this.tmpSignScores = val;
|
|
this.tmpSignScores = val;
|
|
},
|
|
},
|
|
- markSign(val) {
|
|
|
|
|
|
+ markSign() {
|
|
this.intMarkDraw();
|
|
this.intMarkDraw();
|
|
},
|
|
},
|
|
paperSigns(val) {
|
|
paperSigns(val) {
|
|
@@ -430,11 +370,62 @@ export default {
|
|
},
|
|
},
|
|
created() {
|
|
created() {
|
|
EVENTHUB.$on("positionDiv", function(id) {
|
|
EVENTHUB.$on("positionDiv", function(id) {
|
|
- $("#student_paper").scrollTop(0);
|
|
|
|
- var height = $("#anchor-" + id).outerHeight(true);
|
|
|
|
- var y = $("#anchor-" + id).offset().top - height / 2;
|
|
|
|
- $("#student_paper").scrollTop(y - 5);
|
|
|
|
|
|
+ let o = document.getElementById("student_paper");
|
|
|
|
+ o.scrollTop = 0;
|
|
|
|
+ var height = 0;
|
|
|
|
+ let outObject = document.getElementById("anchor-" + id);
|
|
|
|
+ if (outObject) {
|
|
|
|
+ if (outObject.currentStyle) {
|
|
|
|
+ height = parseInt(outObject.currentStyle["marginTop"]);
|
|
|
|
+ } else {
|
|
|
|
+ height = parseInt(
|
|
|
|
+ document.defaultView.getComputedStyle(outObject, null)["marginTop"]
|
|
|
|
+ );
|
|
|
|
+ }
|
|
|
|
+ var y = document.getElementById("anchor-" + id).offsetTop - height / 2;
|
|
|
|
+ o.scrollTop = y - 5;
|
|
|
|
+ }
|
|
});
|
|
});
|
|
}
|
|
}
|
|
};
|
|
};
|
|
</script>
|
|
</script>
|
|
|
|
+<style scoped>
|
|
|
|
+.markmain {
|
|
|
|
+ width: 74%;
|
|
|
|
+}
|
|
|
|
+.scroll {
|
|
|
|
+ overflow: auto;
|
|
|
|
+ height: 600px;
|
|
|
|
+}
|
|
|
|
+.marktitle {
|
|
|
|
+ margin-right: 20px;
|
|
|
|
+ margin-bottom: 20px;
|
|
|
|
+}
|
|
|
|
+.signTitle {
|
|
|
|
+ margin-left: 35%;
|
|
|
|
+}
|
|
|
|
+.itemTitle {
|
|
|
|
+ margin-right: 10px;
|
|
|
|
+}
|
|
|
|
+.titlefont {
|
|
|
|
+ font-size: 15px;
|
|
|
|
+}
|
|
|
|
+li {
|
|
|
|
+ list-style-type: none;
|
|
|
|
+}
|
|
|
|
+.markbutton {
|
|
|
|
+ width: 40px;
|
|
|
|
+ height: 40px;
|
|
|
|
+}
|
|
|
|
+img {
|
|
|
|
+ width: 100%;
|
|
|
|
+ height: 100%;
|
|
|
|
+}
|
|
|
|
+.paper {
|
|
|
|
+ width: 90%;
|
|
|
|
+ min-height: 600px;
|
|
|
|
+}
|
|
|
|
+.fixed {
|
|
|
|
+ position: fixed;
|
|
|
|
+}
|
|
|
|
+</style>
|