Browse Source

1、新增功能-学习中心-阶段/任务/极简模式-修改在编辑界面修改时,不能实时显示批注情况
2、新增功能-学习中心-阶段/任务/极简模式-修改点击“取消编辑”后会恢复到未编辑情况,但确定上传后其实编辑成功了问题
3、新增功能-学习中心-阶段/任务/极简模式-修改显示编辑后的内容,仅会显示到编辑的最后一个字母,没有显示完整问题
4、新增功能-学习中心-阶段/任务/极简模式-修改删除后补充的内容标记错误问题

zengyicheng 1 year ago
parent
commit
d1b089b061

+ 65 - 32
src/components/easy2/studyStudent.vue

@@ -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;

+ 65 - 32
src/components/easy3/studyStudent.vue

@@ -11361,10 +11361,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>
@@ -11383,10 +11383,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">
@@ -11398,10 +11398,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">
@@ -11419,11 +11419,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>
@@ -11937,6 +11937,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;
     },
@@ -19098,13 +19115,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;
@@ -19292,31 +19309,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;

+ 67 - 32
src/components/studyStudent.vue

@@ -11346,10 +11346,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>
@@ -11368,10 +11368,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">
@@ -11383,10 +11383,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">
@@ -11395,7 +11395,7 @@
                   <div>标题:</div>
                   <div v-if="userMes[0].userid != newEnglishList1[newEngIndex].correct" v-html="newEnglishList1[newEngIndex].cWork.engTitle"></div>
                   <div v-else>
-                    <el-input v-if="greyType" v-model="newEnglishList1[newEngIndex].cWork.engTitle" @input="gx"/>
+                    <el-input v-if="greyType" v-model="newEnglishList1[newEngIndex].cWork.engTitle"/>
                     <div v-else v-html="newEnglishList1[newEngIndex].cWork.engTitle"></div>
                   </div>
                 </div>
@@ -11407,7 +11407,7 @@
                     <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>
@@ -11912,12 +11912,30 @@ export default {
       downLoading: false,
       greyType: false,
       correctWord: [],
+      isUpdateText: "",
     };
   },
   methods: {
     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;
     },
@@ -19073,13 +19091,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;
@@ -19264,31 +19282,48 @@ 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(a.length > 1){
+          //   if(w == ""){
+          //       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{
+          //     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>';
+          //       }
+          //     }
+          //   }
+          // }else{
+          //   w = c
+          // }
         }
         c = w;
         return c;