|
@@ -27,6 +27,8 @@
|
|
|
:isTeacher="isTeacher"></timeV>
|
|
|
<courseV2 :tindex="index" :cJson.sync="item.json" :checktype="checktype" v-else-if="item.type == 11"
|
|
|
:see="see" :isTeacher="isTeacher" @getTestWorkByCid="getTestWorkByCid" @publish2="publish2" :issetPage.sync="issetPage" :tid="tid"></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> -->
|
|
|
</div>
|
|
|
<div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
|
|
@@ -45,6 +47,8 @@
|
|
|
:see="see" :isTeacher="isTeacher"></evaV>
|
|
|
<timeV :tindex="index2" :cJson.sync="item2.json" :checktype="checktype" v-else-if="item2.type == 8"
|
|
|
:see="see" :isTeacher="isTeacher"></timeV>
|
|
|
+ <sweep :tindex="index2" :cJson.sync="item2.json" :checktype="checktype" v-else-if="item2.type == 12"
|
|
|
+ :see="see" :isTeacher="isTeacher"></sweep>
|
|
|
<!-- <span v-else>暂未设置题目</span> -->
|
|
|
</div>
|
|
|
</div>
|
|
@@ -69,6 +73,8 @@
|
|
|
:isTeacher="isTeacher"></timeV>
|
|
|
<courseV2 :tindex="index" :cJson.sync="item.json" :checktype="checktype" v-else-if="item.type == 11"
|
|
|
:see="see" :isTeacher="isTeacher" @getTestWorkByCid="getTestWorkByCid" @publish2="publish2" :issetPage.sync="issetPage" :tid="tid"></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> -->
|
|
|
</div>
|
|
|
<div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
|
|
@@ -89,6 +95,8 @@
|
|
|
:see="see" :isTeacher="isTeacher"></timeV>
|
|
|
<courseV2 :tindex="index2" :cJson.sync="item2.json" :checktype="checktype" v-else-if="item2.type == 11"
|
|
|
:see="see" :isTeacher="isTeacher" @getTestWorkByCid="getTestWorkByCid" @publish2="publish2" :issetPage.sync="issetPage" :tid="tid"></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> -->
|
|
|
</div>
|
|
|
</div>
|
|
@@ -115,6 +123,7 @@ import courseV from './course.vue';
|
|
|
import evaV from './eva.vue';
|
|
|
import timeV from './time.vue';
|
|
|
import courseV2 from './course2.vue';
|
|
|
+import sweep from './sweep'
|
|
|
export default {
|
|
|
props: {
|
|
|
cJson: {
|
|
@@ -159,6 +168,7 @@ export default {
|
|
|
evaV,
|
|
|
timeV,
|
|
|
courseV2,
|
|
|
+ sweep,
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
@@ -270,18 +280,20 @@ export default {
|
|
|
let checkArray = _json.filter((item) => {
|
|
|
if (item.array) {
|
|
|
item.array = item.array.filter((item2) => {
|
|
|
- if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.type != 6 && item2.type != 7 && item2.type != 8) {
|
|
|
+ if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.type != 6 && item2.type != 7 && item2.type != 8 && item2.type != 12) {
|
|
|
item2.json.answer2 = [];
|
|
|
} else if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.type == 6) {
|
|
|
item2.json.answer2 = this.gcourseid ? this.gcourseid : item2.json.courses[0];
|
|
|
} else if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.json.answer2 !== 0 && item2.type == 7) {
|
|
|
item2.json.answer2 = '';
|
|
|
- } else if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.json.answer2 !== 0 && item2.type == 8) {
|
|
|
+ } else if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.json.answer2 !== 0 && item2.type == 8 ) {
|
|
|
+ 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) {
|
|
|
item2.array = item2.array.filter((item3) => {
|
|
|
- if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.type != 6 && item3.type != 7 && item3.type != 8) {
|
|
|
+ if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.type != 6 && item3.type != 7 && item3.type != 8 && item3.type != 12) {
|
|
|
item3.json.answer2 = [];
|
|
|
} else if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.type == 6) {
|
|
|
item3.json.answer2 = this.gcourseid ? this.gcourseid : item3.json.courses[0];
|
|
@@ -289,7 +301,10 @@ export default {
|
|
|
item3.json.answer2 = '';
|
|
|
} else if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.json.answer2 !== 0 && item3.type == 8) {
|
|
|
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;
|
|
|
});
|
|
|
}
|
|
@@ -298,7 +313,7 @@ export default {
|
|
|
);
|
|
|
});
|
|
|
}
|
|
|
- if (item.ttype == 1 && item.json && !item.json.answer2 && item.type != 6 && item.type != 7 && item.type != 8) {
|
|
|
+ if (item.ttype == 1 && item.json && !item.json.answer2 && item.type != 6 && item.type != 7 && item.type != 8 && item.type != 12) {
|
|
|
item.json.answer2 = [];
|
|
|
} else if (item.ttype == 1 && item.json && !item.json.answer2 && item.type == 6) {
|
|
|
item.json.answer2 = this.gcourseid ? this.gcourseid : item.json.courses[0];
|
|
@@ -306,6 +321,8 @@ export default {
|
|
|
item.json.answer2 = '';
|
|
|
} else if (item.ttype == 1 && item.json && !item.json.answer2 && item.json.answer2 !== 0 && item.type == 8) {
|
|
|
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);
|
|
|
return (item.ttype != 1 && item.array.length > 0) || item.ttype == 1;
|