|
@@ -1187,7 +1187,7 @@
|
|
|
</li>
|
|
|
</ul>
|
|
|
</div>
|
|
|
- <!-- <div style="width: 1px; background-color: #000; margin: 0px 14px"></div>
|
|
|
+ <div style="width: 1px; background-color: #000; margin: 0px 14px"></div>
|
|
|
<div>
|
|
|
<h4>课程章节-关联题卷-拍照</h4>
|
|
|
<div>
|
|
@@ -1196,9 +1196,6 @@
|
|
|
>
|
|
|
<el-radio
|
|
|
:label="1"
|
|
|
- @change="
|
|
|
- photoVideoList.goodsPhotographExamConfig.intervalTime = [0]
|
|
|
- "
|
|
|
>是</el-radio
|
|
|
>
|
|
|
<el-radio
|
|
@@ -1209,7 +1206,7 @@
|
|
|
>否</el-radio
|
|
|
>
|
|
|
</el-radio-group>
|
|
|
- <el-button
|
|
|
+ <!-- <el-button
|
|
|
size="mini"
|
|
|
style="margin-left: 10px"
|
|
|
v-if="photoVideoList.goodsPhotographExamConfig.photograph === 1"
|
|
@@ -1217,9 +1214,9 @@
|
|
|
photoVideoList.goodsPhotographExamConfig.intervalTime.push(0)
|
|
|
"
|
|
|
>添加</el-button
|
|
|
- >
|
|
|
+ > -->
|
|
|
</div>
|
|
|
- <ul v-if="photoVideoList.goodsPhotographExamConfig.photograph === 1">
|
|
|
+ <!-- <ul v-if="photoVideoList.goodsPhotographExamConfig.photograph === 1">
|
|
|
<li
|
|
|
v-for="(items, indexs) in photoVideoList.goodsPhotographExamConfig
|
|
|
.intervalTime"
|
|
@@ -1247,8 +1244,8 @@
|
|
|
>删除</el-button
|
|
|
>
|
|
|
</li>
|
|
|
- </ul>
|
|
|
- </div> -->
|
|
|
+ </ul> -->
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button @click="dialogPhoto = false">取消</el-button>
|
|
@@ -2147,37 +2144,37 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- // if (this.listData.playConfig) {
|
|
|
- // this.photoVideoList.playConfig = JSON.parse(
|
|
|
- // JSON.stringify(this.listData.playConfig)
|
|
|
- // );
|
|
|
- // } else {
|
|
|
- // this.photoVideoList.playConfig = {
|
|
|
- // autoPlay: 0,
|
|
|
- // drag: 0,
|
|
|
- // speed: 0,
|
|
|
- // };
|
|
|
- // }
|
|
|
- // if (this.listData.photographConfig) {
|
|
|
- // this.photoVideoList.photographConfig = JSON.parse(
|
|
|
- // JSON.stringify(this.listData.photographConfig)
|
|
|
- // );
|
|
|
- // } else {
|
|
|
- // this.photoVideoList.photographConfig = {
|
|
|
- // photograph: 0,
|
|
|
- // intervalTime: [],
|
|
|
- // };
|
|
|
- // }
|
|
|
- // if (this.listData.goodsPhotographExamConfig) {
|
|
|
- // this.photoVideoList.goodsPhotographExamConfig = JSON.parse(
|
|
|
- // JSON.stringify(this.listData.goodsPhotographExamConfig)
|
|
|
- // );
|
|
|
- // } else {
|
|
|
- // this.photoVideoList.goodsPhotographExamConfig = {
|
|
|
- // photograph: 0,
|
|
|
- // intervalTime: [],
|
|
|
- // };
|
|
|
- // }
|
|
|
+ if (this.listData.playConfig) {
|
|
|
+ this.photoVideoList.playConfig = JSON.parse(
|
|
|
+ JSON.stringify(this.listData.playConfig)
|
|
|
+ );
|
|
|
+ } else {
|
|
|
+ this.photoVideoList.playConfig = {
|
|
|
+ autoPlay: 0,
|
|
|
+ drag: 0,
|
|
|
+ speed: 0,
|
|
|
+ };
|
|
|
+ }
|
|
|
+ if (this.listData.photographConfig) {
|
|
|
+ this.photoVideoList.photographConfig = JSON.parse(
|
|
|
+ JSON.stringify(this.listData.photographConfig)
|
|
|
+ );
|
|
|
+ } else {
|
|
|
+ this.photoVideoList.photographConfig = {
|
|
|
+ photograph: 0,
|
|
|
+ intervalTime: [],
|
|
|
+ };
|
|
|
+ }
|
|
|
+ if (this.listData.goodsPhotographExamConfig) {
|
|
|
+ this.photoVideoList.goodsPhotographExamConfig = JSON.parse(
|
|
|
+ JSON.stringify(this.listData.goodsPhotographExamConfig)
|
|
|
+ );
|
|
|
+ } else {
|
|
|
+ this.photoVideoList.goodsPhotographExamConfig = {
|
|
|
+ photograph: 0,
|
|
|
+ intervalTime: [],
|
|
|
+ };
|
|
|
+ }
|
|
|
this.dialogPhoto = true;
|
|
|
},
|
|
|
//提交播放和拍照设置
|
|
@@ -2189,13 +2186,15 @@ export default {
|
|
|
this.$message.warning("至少添加一条“课程节-拍照”");
|
|
|
return;
|
|
|
}
|
|
|
- if (
|
|
|
+ /**
|
|
|
+ * if (
|
|
|
this.photoVideoList.goodsPhotographExamConfig.photograph === 1 &&
|
|
|
!this.photoVideoList.goodsPhotographExamConfig.intervalTime.length
|
|
|
) {
|
|
|
this.$message.warning("至少添加一条“课程章节-关联题卷-拍照”");
|
|
|
return;
|
|
|
}
|
|
|
+ */
|
|
|
if (
|
|
|
this.photoVideoList.photographConfig.photograph === 1 &&
|
|
|
this.photoVideoList.photographConfig.intervalTime.length
|
|
@@ -2213,22 +2212,22 @@ export default {
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
- if (
|
|
|
- this.photoVideoList.goodsPhotographExamConfig.photograph === 1 &&
|
|
|
- this.photoVideoList.goodsPhotographExamConfig.intervalTime.length
|
|
|
- ) {
|
|
|
- const idsSet = new Set(
|
|
|
- this.photoVideoList.goodsPhotographExamConfig.intervalTime
|
|
|
- );
|
|
|
- if (
|
|
|
- idsSet.size ==
|
|
|
- this.photoVideoList.goodsPhotographExamConfig.intervalTime.length
|
|
|
- ) {
|
|
|
- } else {
|
|
|
- this.$message.warning("关联题卷-拍照存在相同时间点,请重新设置");
|
|
|
- return;
|
|
|
- }
|
|
|
- }
|
|
|
+ // if (
|
|
|
+ // this.photoVideoList.goodsPhotographExamConfig.photograph === 1 &&
|
|
|
+ // this.photoVideoList.goodsPhotographExamConfig.intervalTime.length
|
|
|
+ // ) {
|
|
|
+ // const idsSet = new Set(
|
|
|
+ // this.photoVideoList.goodsPhotographExamConfig.intervalTime
|
|
|
+ // );
|
|
|
+ // if (
|
|
|
+ // idsSet.size ==
|
|
|
+ // this.photoVideoList.goodsPhotographExamConfig.intervalTime.length
|
|
|
+ // ) {
|
|
|
+ // } else {
|
|
|
+ // this.$message.warning("关联题卷-拍照存在相同时间点,请重新设置");
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
this.listData.playConfig = this.photoVideoList.playConfig;
|
|
|
this.listData.photographConfig = this.photoVideoList.photographConfig;
|
|
|
this.listData.goodsPhotographExamConfig =
|