|
@@ -82,6 +82,12 @@
|
|
:issetPage.sync="issetPage"
|
|
:issetPage.sync="issetPage"
|
|
:tid="tid"
|
|
:tid="tid"
|
|
></courseV2>
|
|
></courseV2>
|
|
|
|
+ <sweep :tindex="index"
|
|
|
|
+ :cJson.sync="item.json"
|
|
|
|
+ :checktype="checktype"
|
|
|
|
+ v-else-if="item.type == 12"
|
|
|
|
+ :see="see"
|
|
|
|
+ :isTeacher="isTeacher"></sweep>
|
|
<!-- <span v-else>暂未设置题目</span> -->
|
|
<!-- <span v-else>暂未设置题目</span> -->
|
|
</div>
|
|
</div>
|
|
<div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
|
|
<div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
|
|
@@ -157,6 +163,12 @@
|
|
:issetPage.sync="issetPage"
|
|
:issetPage.sync="issetPage"
|
|
:tid="tid"
|
|
:tid="tid"
|
|
></courseV2>
|
|
></courseV2>
|
|
|
|
+ <sweep :tindex="index2"
|
|
|
|
+ :cJson.sync="item2.json"
|
|
|
|
+ :checktype="checktype"
|
|
|
|
+ v-else-if="item2.type == 12"
|
|
|
|
+ :see="see"
|
|
|
|
+ :isTeacher="isTeacher"></sweep>
|
|
<!-- <span v-else>暂未设置题目</span> -->
|
|
<!-- <span v-else>暂未设置题目</span> -->
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -236,6 +248,12 @@
|
|
:issetPage.sync="issetPage"
|
|
:issetPage.sync="issetPage"
|
|
:tid="tid"
|
|
:tid="tid"
|
|
></courseV2>
|
|
></courseV2>
|
|
|
|
+ <sweep :tindex="index"
|
|
|
|
+ :cJson.sync="item.json"
|
|
|
|
+ :checktype="checktype"
|
|
|
|
+ v-else-if="item.type == 12"
|
|
|
|
+ :see="see"
|
|
|
|
+ :isTeacher="isTeacher"></sweep>
|
|
<!-- <span v-else>暂未设置题目</span> -->
|
|
<!-- <span v-else>暂未设置题目</span> -->
|
|
</div>
|
|
</div>
|
|
<div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
|
|
<div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
|
|
@@ -311,6 +329,12 @@
|
|
:issetPage.sync="issetPage"
|
|
:issetPage.sync="issetPage"
|
|
:tid="tid"
|
|
:tid="tid"
|
|
></coursev2>
|
|
></coursev2>
|
|
|
|
+ <sweep :tindex="index2"
|
|
|
|
+ :cJson.sync="item2.json"
|
|
|
|
+ :checktype="checktype"
|
|
|
|
+ v-else-if="item2.type == 12"
|
|
|
|
+ :see="see"
|
|
|
|
+ :isTeacher="isTeacher"></sweep>
|
|
<!-- <span v-else>暂未设置题目</span> -->
|
|
<!-- <span v-else>暂未设置题目</span> -->
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -340,7 +364,7 @@ import courseV from './course.vue'
|
|
import evaV from './eva.vue'
|
|
import evaV from './eva.vue'
|
|
import timeV from './time.vue'
|
|
import timeV from './time.vue'
|
|
import courseV2 from './course2.vue'
|
|
import courseV2 from './course2.vue'
|
|
-
|
|
|
|
|
|
+import sweep from './sweep.vue'
|
|
export default {
|
|
export default {
|
|
props: {
|
|
props: {
|
|
cJson: {
|
|
cJson: {
|
|
@@ -384,7 +408,8 @@ export default {
|
|
courseV,
|
|
courseV,
|
|
evaV,
|
|
evaV,
|
|
timeV,
|
|
timeV,
|
|
- courseV2
|
|
|
|
|
|
+ courseV2,
|
|
|
|
+ sweep
|
|
},
|
|
},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
@@ -496,7 +521,7 @@ export default {
|
|
const checkArray = _json.filter(item => {
|
|
const checkArray = _json.filter(item => {
|
|
if (item.array) {
|
|
if (item.array) {
|
|
item.array = item.array.filter(item2 => {
|
|
item.array = item.array.filter(item2 => {
|
|
- if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.type != 6 && item.type != 7) {
|
|
|
|
|
|
+ if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.type != 6 && item.type != 7 && item.type != 12) {
|
|
item2.json.answer2 = []
|
|
item2.json.answer2 = []
|
|
} else if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.type == 6) {
|
|
} else if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.type == 6) {
|
|
item2.json.answer2 = this.gcourseid ? this.gcourseid : item2.json.courses[0]
|
|
item2.json.answer2 = this.gcourseid ? this.gcourseid : item2.json.courses[0]
|
|
@@ -516,10 +541,18 @@ export default {
|
|
item2.type == 8
|
|
item2.type == 8
|
|
) {
|
|
) {
|
|
item2.json.answer2 = ''
|
|
item2.json.answer2 = ''
|
|
|
|
+ }else if (
|
|
|
|
+ item2.ttype == 1 &&
|
|
|
|
+ item2.json &&
|
|
|
|
+ !item2.json.answer2 &&
|
|
|
|
+ item2.json.answer2 !== 0 &&
|
|
|
|
+ item2.type == 12
|
|
|
|
+ ) {
|
|
|
|
+ item2.json.answer2 = ''
|
|
}
|
|
}
|
|
if (item2.array) {
|
|
if (item2.array) {
|
|
item2.array = item2.array.filter(item3 => {
|
|
item2.array = item2.array.filter(item3 => {
|
|
- if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.type != 6 && item3.type != 7) {
|
|
|
|
|
|
+ if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.type != 6 && item3.type != 7 && item3.type != 12) {
|
|
item3.json.answer2 = []
|
|
item3.json.answer2 = []
|
|
} else if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.type == 6) {
|
|
} else if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.type == 6) {
|
|
item3.json.answer2 = this.gcourseid ? this.gcourseid : item3.json.courses[0]
|
|
item3.json.answer2 = this.gcourseid ? this.gcourseid : item3.json.courses[0]
|
|
@@ -539,6 +572,14 @@ export default {
|
|
item3.type == 8
|
|
item3.type == 8
|
|
) {
|
|
) {
|
|
item3.json.answer2 = ''
|
|
item3.json.answer2 = ''
|
|
|
|
+ }else if (
|
|
|
|
+ item3.ttype == 1 &&
|
|
|
|
+ item3.json &&
|
|
|
|
+ !item3.json.answer2 &&
|
|
|
|
+ item3.json.answer2 !== 0 &&
|
|
|
|
+ item3.type == 12
|
|
|
|
+ ) {
|
|
|
|
+ item3.json.answer2 = ''
|
|
}
|
|
}
|
|
return item3
|
|
return item3
|
|
})
|
|
})
|
|
@@ -546,7 +587,7 @@ export default {
|
|
return (item2.ttype != 1 && item2.array.length > 0) || item2.ttype == 1
|
|
return (item2.ttype != 1 && item2.array.length > 0) || item2.ttype == 1
|
|
})
|
|
})
|
|
}
|
|
}
|
|
- if (item.ttype == 1 && item.json && !item.json.answer2 && item.type != 6 && item.type != 7) {
|
|
|
|
|
|
+ if (item.ttype == 1 && item.json && !item.json.answer2 && item.type != 6 && item.type != 7 && item.type != 12) {
|
|
item.json.answer2 = []
|
|
item.json.answer2 = []
|
|
} else if (item.ttype == 1 && item.json && !item.json.answer2 && item.type == 6) {
|
|
} else if (item.ttype == 1 && item.json && !item.json.answer2 && item.type == 6) {
|
|
item.json.answer2 = this.gcourseid ? this.gcourseid : item.json.courses[0]
|
|
item.json.answer2 = this.gcourseid ? this.gcourseid : item.json.courses[0]
|
|
@@ -554,6 +595,8 @@ export default {
|
|
item.json.answer2 = ''
|
|
item.json.answer2 = ''
|
|
} else if (item.ttype == 1 && item.json && !item.json.answer2 && item.json.answer2 !== 0 && item.type == 8) {
|
|
} else if (item.ttype == 1 && item.json && !item.json.answer2 && item.json.answer2 !== 0 && item.type == 8) {
|
|
item.json.answer2 = ''
|
|
item.json.answer2 = ''
|
|
|
|
+ } else if (item.ttype == 1 && item.json && !item.json.answer2 && item.json.answer2 !== 0 && item.type == 12) {
|
|
|
|
+ item.json.answer2 = ''
|
|
}
|
|
}
|
|
console.log(item.array)
|
|
console.log(item.array)
|
|
return (item.ttype != 1 && item.array.length > 0) || item.ttype == 1
|
|
return (item.ttype != 1 && item.array.length > 0) || item.ttype == 1
|