|
@@ -25,7 +25,12 @@
|
|
|
>
|
|
|
<div
|
|
|
class="vedioNav"
|
|
|
- style="margin: 0; background: #aee3d2; color: #32a77a"
|
|
|
+ style="
|
|
|
+ margin: 0;
|
|
|
+ background: #aee3d2;
|
|
|
+ color: #32a77a;
|
|
|
+ width: 85px;
|
|
|
+ "
|
|
|
>
|
|
|
任务{{ navIndex + 1 }}
|
|
|
</div>
|
|
@@ -120,7 +125,7 @@
|
|
|
:playsinline="true"
|
|
|
:options="playerO[index]"
|
|
|
@play="onPlayerPlay($event)"
|
|
|
- style="width: 90%; height: 100%; margin: 20px auto"
|
|
|
+ style="width: 90%; height: 100%; margin: 0 auto"
|
|
|
></video-player>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -368,7 +373,14 @@
|
|
|
</div>
|
|
|
<div class="upFile" v-if="type == 3">提交</div>
|
|
|
</div>
|
|
|
- <div class="project_box">
|
|
|
+ <div
|
|
|
+ class="project_box"
|
|
|
+ v-if="
|
|
|
+ task.toolChoose[0].tool &&
|
|
|
+ task.toolChoose[0].tool.length &&
|
|
|
+ task.toolChoose[0].tool.length > 0
|
|
|
+ "
|
|
|
+ >
|
|
|
<div class="queTop">
|
|
|
<div class="question" style="width: 30px">
|
|
|
<img src="../assets/icon/toolIcon.png" alt />
|
|
@@ -386,7 +398,7 @@
|
|
|
>
|
|
|
<div class="tooldetail" v-if="tool.toolDetail != ''">
|
|
|
<div class="toolTitle">工具描述</div>
|
|
|
- <div>
|
|
|
+ <div style="line-height: 35px">
|
|
|
{{ tool.toolDetail }}
|
|
|
</div>
|
|
|
</div>
|
|
@@ -771,14 +783,15 @@
|
|
|
<div class="a_add_head">
|
|
|
<div style="display: flex">
|
|
|
{{ index1 + 1 + "、" }}
|
|
|
- <div>问卷题目:{{ askJson.askJson.askstitle }}</div>
|
|
|
+ <div>问卷题目:{{ askJson.askJson[index1].askstitle }}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="a_add_body">
|
|
|
- <div class="a_add_input" v-if="!isAsk">
|
|
|
- <el-radio-group v-model="radio[taskCount]">
|
|
|
+ <div class="a_add_input">
|
|
|
+ <el-radio-group v-model="radio[index1]">
|
|
|
<el-radio
|
|
|
- v-for="(item2, checkIndex) in askJson.askJson.checkList"
|
|
|
+ v-for="(item2, checkIndex) in askJson.askJson[index1]
|
|
|
+ .checkList"
|
|
|
:key="checkIndex"
|
|
|
:label="checkIndex"
|
|
|
class="redioStyle"
|
|
@@ -786,10 +799,11 @@
|
|
|
>
|
|
|
</el-radio-group>
|
|
|
</div>
|
|
|
- <div class="a_add_input" v-else>
|
|
|
+ <!-- <div class="a_add_input" v-else>
|
|
|
<el-radio-group v-model="radio[taskCount]">
|
|
|
<el-radio
|
|
|
- v-for="(item3, checkIndex1) in askJson.askJson.checkList"
|
|
|
+ v-for="(item3, checkIndex1) in askJson.askJson[index1]
|
|
|
+ .checkList"
|
|
|
:key="checkIndex1"
|
|
|
:label="checkIndex1"
|
|
|
class="redioStyle"
|
|
@@ -797,7 +811,7 @@
|
|
|
>{{ item3 }}</el-radio
|
|
|
>
|
|
|
</el-radio-group>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -1402,6 +1416,7 @@ export default {
|
|
|
message: "提交成功",
|
|
|
type: "success",
|
|
|
});
|
|
|
+ this.answerList = [];
|
|
|
this.answerDialogVisible = false;
|
|
|
})
|
|
|
.catch((err) => {
|
|
@@ -1714,6 +1729,7 @@ export default {
|
|
|
message: "提交成功",
|
|
|
type: "success",
|
|
|
});
|
|
|
+ this.askList = [];
|
|
|
this.dialogVisible5 = false;
|
|
|
// this.radio = [];
|
|
|
// this.getStudentAsk();
|
|
@@ -1870,6 +1886,8 @@ export default {
|
|
|
this.timeCount = res.data[0][i].count;
|
|
|
} else if (res.data[0][i].tools == 15) {
|
|
|
this.answerCount = res.data[0][i].count;
|
|
|
+ } else if (res.data[0][i].tools == 18) {
|
|
|
+ this.trainCount = res.data[0][i].count;
|
|
|
}
|
|
|
}
|
|
|
})
|
|
@@ -1939,15 +1957,13 @@ export default {
|
|
|
}
|
|
|
if (!this.dialogVisible2) {
|
|
|
this.askJson.askJson =
|
|
|
- this.chapInfo.chapterInfo[0].taskJson[index].toolChoose[
|
|
|
- i
|
|
|
- ].askJson[0];
|
|
|
+ this.chapInfo.chapterInfo[0].taskJson[index].toolChoose[i].askJson;
|
|
|
this.askJson.askTitle =
|
|
|
this.chapInfo.chapterInfo[0].taskJson[index].toolChoose[i].askTitle;
|
|
|
this.askJson.askCount =
|
|
|
this.chapInfo.chapterInfo[0].taskJson[index].toolChoose[i].askCount;
|
|
|
} else {
|
|
|
- this.askJson.askJson = this.chapTools.askJson.askJson[0];
|
|
|
+ this.askJson.askJson = this.chapTools.askJson.askJson;
|
|
|
this.askJson.askTitle = this.chapTools.askJson.askTitle;
|
|
|
this.askJson.askCount = this.chapTools.askJson.askCount;
|
|
|
}
|