|
@@ -124,7 +124,7 @@
|
|
|
<div class="merge" v-loading="loading3">
|
|
|
<div class="topTitle">
|
|
|
<div class="left">
|
|
|
- <div
|
|
|
+ <!-- <div
|
|
|
@click="cutLiju(0)"
|
|
|
:class="[lijuIndex == 0 ? 'sele' : '']"
|
|
|
>
|
|
@@ -142,7 +142,7 @@
|
|
|
list3.sentence_list.length
|
|
|
}}
|
|
|
</span>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
<div
|
|
|
@click="cutLiju(1)"
|
|
|
v-if="list1.sentence_list && list1.sentence_list.length > 0"
|
|
@@ -431,7 +431,7 @@ export default {
|
|
|
loading2: false,
|
|
|
loading3: false,
|
|
|
dataDetail: null,
|
|
|
- lijuIndex: 0,
|
|
|
+ lijuIndex: 1,
|
|
|
lijuPatternIndex: 0,
|
|
|
CurrentList: [],
|
|
|
sortIndex: 0,
|
|
@@ -627,7 +627,8 @@ export default {
|
|
|
courseware_id: this.currentTreeID, // 课件id
|
|
|
word: this.data.new_word, //生词
|
|
|
search_scope: 1, //检索范围0 本课件 1本教材 2本套
|
|
|
- is_contain_word_variants: false
|
|
|
+ is_contain_word_variants: false,
|
|
|
+ is_filter_repetitive_sentence: "true"
|
|
|
})
|
|
|
.then(res => {
|
|
|
this.loading2 = false;
|
|
@@ -648,17 +649,17 @@ export default {
|
|
|
res.sentence_list_sort_right,
|
|
|
"right"
|
|
|
);
|
|
|
- this.allList.sentence_list = this.allList.sentence_list.concat(
|
|
|
- this.list2.sentence_list
|
|
|
+ this.list2.sentence_list = this.list2.sentence_list.concat(
|
|
|
+ this.list1.sentence_list
|
|
|
);
|
|
|
- this.allList.sentence_list_sort_left = this.allList.sentence_list_sort_left.concat(
|
|
|
- this.list2.sentence_list_sort_left
|
|
|
+ this.list2.sentence_list_sort_left = this.list2.sentence_list_sort_left.concat(
|
|
|
+ this.list1.sentence_list_sort_left
|
|
|
);
|
|
|
- this.allList.sentence_list_sort_mid = this.allList.sentence_list_sort_mid.concat(
|
|
|
- this.list2.sentence_list_sort_mid
|
|
|
+ this.list2.sentence_list_sort_mid = this.list2.sentence_list_sort_mid.concat(
|
|
|
+ this.list1.sentence_list_sort_mid
|
|
|
);
|
|
|
- this.allList.sentence_list_sort_right = this.allList.sentence_list_sort_right.concat(
|
|
|
- this.list2.sentence_list_sort_right
|
|
|
+ this.list2.sentence_list_sort_right = this.list2.sentence_list_sort_right.concat(
|
|
|
+ this.list1.sentence_list_sort_right
|
|
|
);
|
|
|
}
|
|
|
|
|
@@ -666,7 +667,8 @@ export default {
|
|
|
courseware_id: this.currentTreeID, // 课件id
|
|
|
word: this.data.new_word, //生词
|
|
|
search_scope: 2, //检索范围0 本课件 1本教材 2本套
|
|
|
- is_contain_word_variants: false
|
|
|
+ is_contain_word_variants: false,
|
|
|
+ is_filter_repetitive_sentence: "true"
|
|
|
})
|
|
|
.then(res => {
|
|
|
this.list3 = res;
|
|
@@ -687,17 +689,17 @@ export default {
|
|
|
"right"
|
|
|
);
|
|
|
|
|
|
- this.allList.sentence_list = this.allList.sentence_list.concat(
|
|
|
- this.list3.sentence_list
|
|
|
+ this.list3.sentence_list = this.list3.sentence_list.concat(
|
|
|
+ this.list2.sentence_list
|
|
|
);
|
|
|
- this.allList.sentence_list_sort_left = this.allList.sentence_list_sort_left.concat(
|
|
|
- this.list3.sentence_list_sort_left
|
|
|
+ this.list3.sentence_list_sort_left = this.list3.sentence_list_sort_left.concat(
|
|
|
+ this.list2.sentence_list_sort_left
|
|
|
);
|
|
|
- this.allList.sentence_list_sort_mid = this.allList.sentence_list_sort_mid.concat(
|
|
|
- this.list3.sentence_list_sort_mid
|
|
|
+ this.list3.sentence_list_sort_mid = this.list3.sentence_list_sort_mid.concat(
|
|
|
+ this.list2.sentence_list_sort_mid
|
|
|
);
|
|
|
- this.allList.sentence_list_sort_right = this.allList.sentence_list_sort_right.concat(
|
|
|
- this.list3.sentence_list_sort_right
|
|
|
+ this.list3.sentence_list_sort_right = this.list3.sentence_list_sort_right.concat(
|
|
|
+ this.list2.sentence_list_sort_right
|
|
|
);
|
|
|
}
|
|
|
this.CurrentList = JSON.parse(
|