|
@@ -95,6 +95,13 @@
|
|
v-else-if="item.type == 13"
|
|
v-else-if="item.type == 13"
|
|
:see="see"
|
|
:see="see"
|
|
:isTeacher="isTeacher"></number>
|
|
:isTeacher="isTeacher"></number>
|
|
|
|
+
|
|
|
|
+ <punchQRcode :tindex="index"
|
|
|
|
+ :cJson.sync="item.json"
|
|
|
|
+ :checktype="checktype"
|
|
|
|
+ v-else-if="item.type == 14"
|
|
|
|
+ :see="see"
|
|
|
|
+ :isTeacher="isTeacher"></punchQRcode>
|
|
<!-- <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">
|
|
@@ -184,7 +191,12 @@
|
|
:see="see"
|
|
:see="see"
|
|
:isTeacher="isTeacher"></number>
|
|
:isTeacher="isTeacher"></number>
|
|
|
|
|
|
-
|
|
|
|
|
|
+ <punchQRcode :tindex="index2"
|
|
|
|
+ :cJson.sync="item2.json"
|
|
|
|
+ :checktype="checktype"
|
|
|
|
+ v-else-if="item2.type == 14"
|
|
|
|
+ :see="see"
|
|
|
|
+ :isTeacher="isTeacher"></punchQRcode>
|
|
<!-- <span v-else>暂未设置题目</span> -->
|
|
<!-- <span v-else>暂未设置题目</span> -->
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -276,6 +288,12 @@
|
|
v-else-if="item.type == 13"
|
|
v-else-if="item.type == 13"
|
|
:see="see"
|
|
:see="see"
|
|
:isTeacher="isTeacher"></number>
|
|
:isTeacher="isTeacher"></number>
|
|
|
|
+ <punchQRcode :tindex="index"
|
|
|
|
+ :cJson.sync="item.json"
|
|
|
|
+ :checktype="checktype"
|
|
|
|
+ v-else-if="item.type == 14"
|
|
|
|
+ :see="see"
|
|
|
|
+ :isTeacher="isTeacher"></punchQRcode>
|
|
<!-- <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">
|
|
@@ -363,6 +381,12 @@
|
|
v-else-if="item2.type == 13"
|
|
v-else-if="item2.type == 13"
|
|
:see="see"
|
|
:see="see"
|
|
:isTeacher="isTeacher"></number>
|
|
:isTeacher="isTeacher"></number>
|
|
|
|
+ <punchQRcode :tindex="index2"
|
|
|
|
+ :cJson.sync="item2.json"
|
|
|
|
+ :checktype="checktype"
|
|
|
|
+ v-else-if="item2.type == 14"
|
|
|
|
+ :see="see"
|
|
|
|
+ :isTeacher="isTeacher"></punchQRcode>
|
|
<!-- <span v-else>暂未设置题目</span> -->
|
|
<!-- <span v-else>暂未设置题目</span> -->
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -394,6 +418,7 @@ import timeV from './time.vue'
|
|
import courseV2 from './course2.vue'
|
|
import courseV2 from './course2.vue'
|
|
import sweep from './sweep.vue'
|
|
import sweep from './sweep.vue'
|
|
import number from './number'
|
|
import number from './number'
|
|
|
|
+import punchQRcode from './punchQRcode'
|
|
export default {
|
|
export default {
|
|
props: {
|
|
props: {
|
|
cJson: {
|
|
cJson: {
|
|
@@ -429,6 +454,7 @@ export default {
|
|
type: String,
|
|
type: String,
|
|
default: ''
|
|
default: ''
|
|
}
|
|
}
|
|
|
|
+
|
|
},
|
|
},
|
|
components: {
|
|
components: {
|
|
choiceV,
|
|
choiceV,
|
|
@@ -439,7 +465,8 @@ export default {
|
|
timeV,
|
|
timeV,
|
|
courseV2,
|
|
courseV2,
|
|
sweep,
|
|
sweep,
|
|
- number
|
|
|
|
|
|
+ number,
|
|
|
|
+ punchQRcode
|
|
},
|
|
},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
@@ -551,7 +578,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 && item.type != 12) {
|
|
|
|
|
|
+ if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.type != 6 && item.type != 7 && item.type != 12 && item.type != 14) {
|
|
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]
|
|
@@ -576,13 +603,14 @@ export default {
|
|
item2.json &&
|
|
item2.json &&
|
|
!item2.json.answer2 &&
|
|
!item2.json.answer2 &&
|
|
item2.json.answer2 !== 0 &&
|
|
item2.json.answer2 !== 0 &&
|
|
- item2.type == 12
|
|
|
|
|
|
+ item2.type == 12 &&
|
|
|
|
+ item2.type == 14
|
|
) {
|
|
) {
|
|
item2.json.answer2 = ''
|
|
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 && item3.type != 12) {
|
|
|
|
|
|
+ if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.type != 6 && item3.type != 7 && item3.type != 12 && item3.type != 14) {
|
|
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]
|
|
@@ -617,7 +645,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 && item.type != 12) {
|
|
|
|
|
|
+ if (item.ttype == 1 && item.json && !item.json.answer2 && item.type != 6 && item.type != 7 && item.type != 12 && item.type != 14) {
|
|
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]
|
|
@@ -625,7 +653,7 @@ 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) {
|
|
|
|
|
|
+ } else if (item.ttype == 1 && item.json && !item.json.answer2 && item.json.answer2 !== 0 && item.type == 12 && item.type == 14) {
|
|
item.json.answer2 = ''
|
|
item.json.answer2 = ''
|
|
}
|
|
}
|
|
console.log(item.array)
|
|
console.log(item.array)
|