|
@@ -11374,10 +11374,10 @@
|
|
|
</div>
|
|
|
<div class="oldDetail">
|
|
|
<div>正文:</div>
|
|
|
- <el-input v-if="greyType" type="textarea" :rows="10" resize="none" v-model="newEnglishList.engText" />
|
|
|
+ <el-input v-if="greyType" type="textarea" :rows="10" resize="none" v-model="newEnglishList.engText" @input="gx"/>
|
|
|
<div v-else style="white-space: pre-line;" v-html="Correct(newEnglishList.engText)"></div>
|
|
|
</div>
|
|
|
- <el-button @click="greyType = !greyType" style="position: absolute;bottom: -50px;right: 0;background: #409eff;color: #fff;">{{ greyType == false ? '修改批注' : '取消修改' }}</el-button>
|
|
|
+ <el-button @click="isUpdateCorrect(newEnglishList.engText,1)" style="position: absolute;bottom: -50px;right: 0;background: #409eff;color: #fff;">{{ greyType == false ? '修改批注' : '取消修改' }}</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -11396,10 +11396,10 @@
|
|
|
</div>
|
|
|
<div class="oldDetail">
|
|
|
<div>正文:</div>
|
|
|
- <el-input v-if="greyType" type="textarea" :rows="10" resize="none" v-model="oldEnglishJson1.engText" />
|
|
|
+ <el-input v-if="greyType" type="textarea" :rows="10" resize="none" v-model="oldEnglishJson1.engText" @input="gx"/>
|
|
|
<div v-else style="white-space: pre-line;" v-html="Correct(oldEnglishJson1.engText)"></div>
|
|
|
</div>
|
|
|
- <el-button @click="greyType = !greyType" style="position: absolute;bottom: -50px;right: 0;background: #409eff;color: #fff;">{{ greyType == false ? '修改批注' : '取消修改' }}</el-button>
|
|
|
+ <el-button @click="isUpdateCorrect(oldEnglishJson1.engText,2)" style="position: absolute;bottom: -50px;right: 0;background: #409eff;color: #fff;">{{ greyType == false ? '修改批注' : '取消修改' }}</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="oldText" v-else-if="newEngIndex == -1">
|
|
@@ -11411,10 +11411,10 @@
|
|
|
</div>
|
|
|
<div class="oldDetail">
|
|
|
<div>正文:</div>
|
|
|
- <el-input v-if="greyType" type="textarea" :rows="10" resize="none" v-model="newEnglishList.engText" />
|
|
|
+ <el-input v-if="greyType" type="textarea" :rows="10" resize="none" v-model="newEnglishList.engText" @input="gx"/>
|
|
|
<div v-else style="white-space: pre-line;" v-html="Correct(newEnglishList.engText)"></div>
|
|
|
</div>
|
|
|
- <el-button @click="greyType = !greyType" style="position: absolute;bottom: -50px;right: 0;background: #409eff;color: #fff;">{{ greyType == false ? '修改批注' : '取消修改' }}</el-button>
|
|
|
+ <el-button @click="isUpdateCorrect(newEnglishList.engText,3)" style="position: absolute;bottom: -50px;right: 0;background: #409eff;color: #fff;">{{ greyType == false ? '修改批注' : '取消修改' }}</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="oldText" v-else-if="newEngIndex > -1 && newEnglishList1.length > 0">
|
|
@@ -11431,11 +11431,11 @@
|
|
|
<div>正文:</div>
|
|
|
<div v-if="userMes[0].userid != newEnglishList1[newEngIndex].correct" v-html="newEnglishList1[newEngIndex].cWork.engText"></div>
|
|
|
<div v-else>
|
|
|
- <el-input v-if="greyType" type="textarea" :rows="10" resize="none" v-model="newEnglishList1[newEngIndex].cWork.engText" />
|
|
|
+ <el-input v-if="greyType" type="textarea" :rows="10" resize="none" v-model="newEnglishList1[newEngIndex].cWork.engText" @input="gx"/>
|
|
|
<div v-else style="white-space: pre-line;" v-html="Correct(newEnglishList1[newEngIndex].cWork.engText)"></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-button @click="greyType = !greyType" style="position: absolute;bottom: -50px;right: 0;background: #409eff;color: #fff;">{{ greyType == false ? '修改批注' : '取消修改' }}</el-button>
|
|
|
+ <el-button @click="isUpdateCorrect(newEnglishList1[newEngIndex].cWork.engText,4)" style="position: absolute;bottom: -50px;right: 0;background: #409eff;color: #fff;">{{ greyType == false ? '修改批注' : '取消修改' }}</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -11948,6 +11948,23 @@ export default {
|
|
|
gx(){
|
|
|
this.$forceUpdate();
|
|
|
},
|
|
|
+ isUpdateCorrect(t,p){
|
|
|
+ if(this.greyType == false){
|
|
|
+ this.isUpdateText = t;
|
|
|
+ this.greyType = true;
|
|
|
+ }else{
|
|
|
+ if(p == 1){
|
|
|
+ this.newEnglishList.engText = this.isUpdateText;
|
|
|
+ }else if(p == 2){
|
|
|
+ this.oldEnglishJson1.engText = this.isUpdateText;
|
|
|
+ }else if(p == 3){
|
|
|
+ this.newEnglishList.engText = this.isUpdateText;
|
|
|
+ }else{
|
|
|
+ this.newEnglishList1[this.newEngIndex].cWork.engText = this.isUpdateText;
|
|
|
+ }
|
|
|
+ this.greyType = false
|
|
|
+ }
|
|
|
+ },
|
|
|
setEnglishList(engList) {
|
|
|
this.myAnList = engList;
|
|
|
},
|
|
@@ -19106,13 +19123,13 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
if(this.userMes[0].type == 2){
|
|
|
- this.correctWord = Diff.diffChars(this.oldEnglishJson.engText,this.newEnglishList.engText);
|
|
|
+ this.correctWord = Diff.diffWordsWithSpace(this.oldEnglishJson.engText,this.newEnglishList.engText);
|
|
|
}else if(this.newEngIndex == -1 && this.isNoUserid == true && this.newEnglishList1.length){
|
|
|
- this.correctWord = Diff.diffChars(this.oldEnglishJson.engText,this.oldEnglishJson1.engText);
|
|
|
+ this.correctWord = Diff.diffWordsWithSpace(this.oldEnglishJson.engText,this.oldEnglishJson1.engText);
|
|
|
}else if(this.newEngIndex == -1){
|
|
|
- this.correctWord = Diff.diffChars(this.oldEnglishJson.engText,this.newEnglishList.engText);
|
|
|
+ this.correctWord = Diff.diffWordsWithSpace(this.oldEnglishJson.engText,this.newEnglishList.engText);
|
|
|
}else if(this.newEngIndex > -1 && this.newEnglishList1.length > 0){
|
|
|
- this.correctWord = Diff.diffChars(this.oldEnglishJson.engText,this.newEnglishList1[this.newEngIndex].cWork.engText);
|
|
|
+ this.correctWord = Diff.diffWordsWithSpace(this.oldEnglishJson.engText,this.newEnglishList1[this.newEngIndex].cWork.engText);
|
|
|
}
|
|
|
}, 500);
|
|
|
this.engUpdateDialogVisible = true;
|
|
@@ -19300,31 +19317,47 @@ export default {
|
|
|
let w = "";
|
|
|
let a = this.correctWord;
|
|
|
for(var k = 0;k<a.length;k++){
|
|
|
+ //diffWordsWithSpace
|
|
|
if(w == ""){
|
|
|
- if(a.length > 1){
|
|
|
- if(a[k].added == true){
|
|
|
- w = '<span>' + a[k - 1].value + '</span>' + '<span style="background-color: green;color:#fff">' + a[k].value + '</span>';
|
|
|
- }else if(a[k].removed == true){
|
|
|
- w = '<span>' + a[k - 1].value + '</span>' + '<span style="text-decoration: line-through;color:red">' + a[k].value + '</span>';
|
|
|
- }
|
|
|
- }else{
|
|
|
- w = c
|
|
|
+ if(a[k].added == true){
|
|
|
+ w = '<span style="background-color: green;color:#fff">' + a[k].value + '</span>';
|
|
|
+ }else if(a[k].removed == true){
|
|
|
+ w = '<span style="text-decoration: line-through;color:red">' + a[k].value + '</span>';
|
|
|
}
|
|
|
}else{
|
|
|
- if(k == a.length - 1){
|
|
|
- if(a[k].added == true){
|
|
|
- w += '<span style="background-color: green;color:#fff">' + a[k].value + '</span>';
|
|
|
- }else if(a[k].removed == true){
|
|
|
- w += '<span style="text-decoration: line-through;color:red">' + a[k].value + '</span>';
|
|
|
- }
|
|
|
- }else{
|
|
|
- if(a[k].added == true){
|
|
|
- w += '<span>' + a[k - 1].value + '</span>' + '<span style="background-color: green;color:#fff">' + a[k].value + '</span>';
|
|
|
- }else if(a[k].removed == true){
|
|
|
- w += '<span>' + a[k - 1].value + '</span>' + '<span style="text-decoration: line-through;color:red">' + a[k].value + '</span>';
|
|
|
- }
|
|
|
+ if(a[k].added == true){
|
|
|
+ w += '<span style="background-color: green;color:#fff">' + a[k].value + '</span>';
|
|
|
+ }else if(a[k].removed == true){
|
|
|
+ w += '<span style="text-decoration: line-through;color:red">' + a[k].value + '</span>';
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ //diffChars方法
|
|
|
+ // if(w == ""){
|
|
|
+ // if(a.length > 1){
|
|
|
+ // if(a[k].added == true){
|
|
|
+ // w = '<span>' + a[k - 1].value + '</span>' + '<span style="background-color: green;color:#fff">' + a[k].value + '</span>';
|
|
|
+ // }else if(a[k].removed == true){
|
|
|
+ // w = '<span>' + a[k - 1].value + '</span>' + '<span style="text-decoration: line-through;color:red">' + a[k].value + '</span>';
|
|
|
+ // }
|
|
|
+ // }else{
|
|
|
+ // w = c
|
|
|
+ // }
|
|
|
+ // }else{
|
|
|
+ // if(k == a.length - 1){
|
|
|
+ // if(a[k].added == true){
|
|
|
+ // w += '<span style="background-color: green;color:#fff">' + a[k].value + '</span>';
|
|
|
+ // }else if(a[k].removed == true){
|
|
|
+ // w += '<span style="text-decoration: line-through;color:red">' + a[k].value + '</span>';
|
|
|
+ // }
|
|
|
+ // }else{
|
|
|
+ // if(a[k].added == true){
|
|
|
+ // w += '<span>' + a[k - 1].value + '</span>' + '<span style="background-color: green;color:#fff">' + a[k].value + '</span>';
|
|
|
+ // }else if(a[k].removed == true){
|
|
|
+ // w += '<span>' + a[k - 1].value + '</span>' + '<span style="text-decoration: line-through;color:red">' + a[k].value + '</span>';
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
}
|
|
|
c = w;
|
|
|
return c;
|