|
@@ -124,7 +124,7 @@
|
|
|
tools[steps].tools.indexOf(27) != -1
|
|
|
"
|
|
|
>
|
|
|
- 查看所有学生答题情况
|
|
|
+ 查看数据统计
|
|
|
</div>
|
|
|
<span
|
|
|
slot="footer"
|
|
@@ -168,7 +168,11 @@
|
|
|
<span>{{ answerJson.D }}票</span>
|
|
|
</div>
|
|
|
<div class="szt">
|
|
|
- <AnswerData :problemJson="answerJson"></AnswerData>
|
|
|
+ <AnswerData
|
|
|
+ :problemJson="answerJson"
|
|
|
+ :answer="answerA"
|
|
|
+ :people="peopleA"
|
|
|
+ ></AnswerData>
|
|
|
</div>
|
|
|
<span slot="footer" class="dialog-footer sztFooter">
|
|
|
<!-- <el-button type="primary" @click="isBlock = 0">关闭</el-button> -->
|
|
@@ -691,7 +695,7 @@
|
|
|
tools[steps].tools && tools[steps].tools.indexOf(27) != -1
|
|
|
"
|
|
|
>
|
|
|
- <div v-for="(tk, tIndex) in 7" :key="tIndex" class="tkCss">
|
|
|
+ <div v-for="(tk, tIndex) in tools[steps].choice" :key="tIndex" class="tkCss">
|
|
|
<div style="margin-right: 10px; font-size: 18px">
|
|
|
{{ tIndex + 1 }}、
|
|
|
</div>
|
|
@@ -701,7 +705,7 @@
|
|
|
disabled
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="(tkA, tkAIndex) in tkAnswerBox"
|
|
|
+ v-for="(tkA, tkAIndex) in tools[steps].tkAnswerBox"
|
|
|
:key="tkAIndex"
|
|
|
:label="tkA"
|
|
|
:value="tkA"
|
|
@@ -754,9 +758,16 @@
|
|
|
</div>
|
|
|
<div class="answerBox tools_box" v-if="isBlock == 14">
|
|
|
<div style="height: 100%; width: 100%">
|
|
|
- <div class="wheel" style="height: 80%; width: 100%">
|
|
|
+ <div class="wheel" style="height: 90%; width: 100%">
|
|
|
<div style="height: 100%; overflow: auto">
|
|
|
- <div
|
|
|
+ <div class="szt">
|
|
|
+ <AnswerData2
|
|
|
+ :problemJson="tools[steps].choice"
|
|
|
+ :answer="answerA"
|
|
|
+ :people="worksList"
|
|
|
+ ></AnswerData2>
|
|
|
+ </div>
|
|
|
+ <!-- <div
|
|
|
v-for="(item, index) in worksList"
|
|
|
:key="index"
|
|
|
class="fill_box"
|
|
@@ -767,10 +778,10 @@
|
|
|
:key="index"
|
|
|
>{{ index + 1 }}、{{ item }}</span
|
|
|
>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="nextStepBox" style="margin-top: 5%">
|
|
|
+ <div class="nextStepBox" style="margin-top: 10px">
|
|
|
<div class="nextStepOne" @click="selectStudentByScoolPPt(1)">
|
|
|
返回
|
|
|
</div>
|
|
@@ -1041,11 +1052,12 @@
|
|
|
import "../../common/aws-sdk-2.235.1.min";
|
|
|
import EditorBar from "../../components/tools/wangEnduit";
|
|
|
import AnswerData from "./components/answerData";
|
|
|
+import AnswerData2 from "./components/answerData2";
|
|
|
import pdf from "./components/pdf";
|
|
|
import ImgDraw from "./components/imgDraw/imgDraw";
|
|
|
import Time from "../tools/time.vue";
|
|
|
export default {
|
|
|
- components: { EditorBar, AnswerData, pdf, ImgDraw, Time },
|
|
|
+ components: { EditorBar, AnswerData, AnswerData2, pdf, ImgDraw, Time },
|
|
|
data() {
|
|
|
return {
|
|
|
pdfUrl:
|
|
@@ -1087,6 +1099,8 @@ export default {
|
|
|
C: 0,
|
|
|
D: 0,
|
|
|
},
|
|
|
+ answerA: [],
|
|
|
+ peopleA: [],
|
|
|
answerStudent: "",
|
|
|
// {
|
|
|
// file: [
|
|
@@ -1116,11 +1130,11 @@ export default {
|
|
|
],
|
|
|
},
|
|
|
"", //问答题
|
|
|
- { tools: [9], choice: 3 },
|
|
|
- { tools: [9], choice: 3 }, //协同文档
|
|
|
- { tools: [9], choice: 3 }, //思维导图
|
|
|
- { tools: [9], choice: 3 },
|
|
|
- { tools: [9], choice: 3 },
|
|
|
+ { tools: [9], choice: 3, answer: [2, 3] },
|
|
|
+ { tools: [9], choice: 3, answer: [2] }, //协同文档
|
|
|
+ { tools: [9], choice: 3, answer: [3] }, //思维导图
|
|
|
+ { tools: [9], choice: 3, answer: [1] },
|
|
|
+ { tools: [9], choice: 3, answer: [2] },
|
|
|
{ tools: [12] },
|
|
|
{
|
|
|
tools: [27],
|
|
@@ -1133,6 +1147,17 @@ export default {
|
|
|
"Reason",
|
|
|
"Feelings",
|
|
|
],
|
|
|
+ choice:7,
|
|
|
+ tkAnswerBox: [
|
|
|
+ "Feelings",
|
|
|
+ "Weather",
|
|
|
+ "Activities before the festival",
|
|
|
+ "Origin",
|
|
|
+ "Food",
|
|
|
+ "Time",
|
|
|
+ "Activities during the festival",
|
|
|
+ "Reason",
|
|
|
+ ],
|
|
|
},
|
|
|
{
|
|
|
file: [
|
|
@@ -1199,16 +1224,7 @@ export default {
|
|
|
playerO: {},
|
|
|
videoindex: 0,
|
|
|
rate: [],
|
|
|
- tkAnswerBox: [
|
|
|
- "Feelings",
|
|
|
- "Weather",
|
|
|
- "Activities before the festival",
|
|
|
- "Origin",
|
|
|
- "Food",
|
|
|
- "Time",
|
|
|
- "Activities during the festival",
|
|
|
- "Reason",
|
|
|
- ],
|
|
|
+ tkAnswerBox: [],
|
|
|
tkAnswer: [],
|
|
|
Sname: "",
|
|
|
audioUrl: "",
|
|
@@ -1290,7 +1306,7 @@ export default {
|
|
|
this.tools[this.steps].tools &&
|
|
|
this.tools[this.steps].tools.indexOf(10) != -1
|
|
|
) {
|
|
|
- this.timeDialogVisible = true
|
|
|
+ this.timeDialogVisible = true;
|
|
|
}
|
|
|
this.isBlock = 5;
|
|
|
},
|
|
@@ -1407,6 +1423,8 @@ export default {
|
|
|
_this.answerJson.D++;
|
|
|
}
|
|
|
}
|
|
|
+ this.answerA = this.tools[this.steps].answer;
|
|
|
+ this.peopleA = _res;
|
|
|
}
|
|
|
if (
|
|
|
this.tools[this.steps].tools &&
|
|
@@ -1420,6 +1438,7 @@ export default {
|
|
|
time: _res[i].time,
|
|
|
});
|
|
|
}
|
|
|
+ this.answerA = this.tools[this.steps].answer;
|
|
|
}
|
|
|
})
|
|
|
.catch((err) => {
|