添加换行符显示功能

src/components/easy2/studyStudent.vue

@@ -11375,7 +11375,7 @@
                 <div class="oldDetail">
                   <div>正文：</div>
                   <el-input v-if="greyType" type="textarea" :rows="10" resize="none" v-model="newEnglishList.engText" />
-                  <div v-else v-html="Correct(newEnglishList.engText)"></div>
+                  <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>
               </div>
@@ -11397,7 +11397,7 @@
                 <div class="oldDetail">
                   <div>正文：</div>
                   <el-input v-if="greyType" type="textarea" :rows="10" resize="none" v-model="oldEnglishJson1.engText" />
-                  <div v-else v-html="Correct(oldEnglishJson1.engText)"></div>
+                  <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>
               </div>
@@ -11412,7 +11412,7 @@
                 <div class="oldDetail">
                   <div>正文：</div>
                   <el-input v-if="greyType" type="textarea" :rows="10" resize="none" v-model="newEnglishList.engText" />
-                  <div v-else v-html="Correct(newEnglishList.engText)"></div>
+                  <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>
               </div>
@@ -11432,7 +11432,7 @@
                   <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" />
-                    <div v-else v-html="newEnglishList1[newEngIndex].cWork.engTitle"></div>
+                    <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>
@@ -19044,6 +19044,7 @@ export default {
             this.newEnglishList.engText = z.engText;
           }else{
             var a = res.data[0];
+            var ppp = JSON.parse(JSON.stringify(res.data[0])); 
             if(this.userMes[0].type == 2){
               var snum = 0;
               for(var i = 0;i<a.length;i++){
@@ -19072,6 +19073,7 @@ export default {
                 this.isNoUserid = false;
               }
               var b = a.sort((item, index) => {
+                console.log(item)
                 if (item.correct === this.userMes[0].userid) {
                   return -1; // 将a移到前面
                 } else if (index.correct === this.userMes[0].userid) {
@@ -19081,7 +19083,12 @@ export default {
                 }
               });
               for(var p = 0;p<b.length;p++){
-                b[p].cWork = JSON.parse(b[p].cWork)
+                for(var y = 0;y<ppp.length;y++){
+                  if(b[p].id == ppp[y].id){
+                    b[p].cWork = JSON.parse(ppp[y].cWork);
+                    break
+                  }
+                }
               }
               this.newEnglishList1 = b;
             }
@@ -19298,7 +19305,7 @@ export default {
               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;">' + a[k].value + '</span>';
+                w = '<span>' + a[k - 1].value + '</span>' + '<span style="text-decoration: line-through;color:red">' + a[k].value + '</span>';
               }
             }else{
               w = c
@@ -19308,13 +19315,13 @@ export default {
               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;">' + a[k].value + '</span>';
+                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;">' + a[k].value + '</span>';
+                w += '<span>' + a[k - 1].value + '</span>' + '<span style="text-decoration: line-through;color:red">' + a[k].value + '</span>';
               }
             }
           }

src/components/easy3/studyStudent.vue

@@ -11362,7 +11362,7 @@
                 <div class="oldDetail">
                   <div>正文：</div>
                   <el-input v-if="greyType" type="textarea" :rows="10" resize="none" v-model="newEnglishList.engText" />
-                  <div v-else v-html="Correct(newEnglishList.engText)"></div>
+                  <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>
               </div>
@@ -11384,7 +11384,7 @@
                 <div class="oldDetail">
                   <div>正文：</div>
                   <el-input v-if="greyType" type="textarea" :rows="10" resize="none" v-model="oldEnglishJson1.engText" />
-                  <div v-else v-html="Correct(oldEnglishJson1.engText)"></div>
+                  <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>
               </div>
@@ -11399,7 +11399,7 @@
                 <div class="oldDetail">
                   <div>正文：</div>
                   <el-input v-if="greyType" type="textarea" :rows="10" resize="none" v-model="newEnglishList.engText" />
-                  <div v-else v-html="Correct(newEnglishList.engText)"></div>
+                  <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>
               </div>
@@ -11420,7 +11420,7 @@
                   <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" />
-                    <div v-else v-html="newEnglishList1[newEngIndex].cWork.engTitle"></div>
+                    <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>
@@ -19036,6 +19036,7 @@ export default {
             this.newEnglishList.engText = z.engText;
           }else{
             var a = res.data[0];
+            var ppp = JSON.parse(JSON.stringify(res.data[0])); 
             if(this.userMes[0].type == 2){
               var snum = 0;
               for(var i = 0;i<a.length;i++){
@@ -19064,6 +19065,7 @@ export default {
                 this.isNoUserid = false;
               }
               var b = a.sort((item, index) => {
+                console.log(item)
                 if (item.correct === this.userMes[0].userid) {
                   return -1; // 将a移到前面
                 } else if (index.correct === this.userMes[0].userid) {
@@ -19073,7 +19075,12 @@ export default {
                 }
               });
               for(var p = 0;p<b.length;p++){
-                b[p].cWork = JSON.parse(b[p].cWork)
+                for(var y = 0;y<ppp.length;y++){
+                  if(b[p].id == ppp[y].id){
+                    b[p].cWork = JSON.parse(ppp[y].cWork);
+                    break
+                  }
+                }
               }
               this.newEnglishList1 = b;
             }
@@ -19290,7 +19297,7 @@ export default {
               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;">' + a[k].value + '</span>';
+                w = '<span>' + a[k - 1].value + '</span>' + '<span style="text-decoration: line-through;color:red">' + a[k].value + '</span>';
               }
             }else{
               w = c
@@ -19300,13 +19307,13 @@ export default {
               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;">' + a[k].value + '</span>';
+                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;">' + a[k].value + '</span>';
+                w += '<span>' + a[k - 1].value + '</span>' + '<span style="text-decoration: line-through;color:red">' + a[k].value + '</span>';
               }
             }
           }

src/components/studyStudent.vue

@@ -11347,7 +11347,7 @@
                 <div class="oldDetail">
                   <div>正文：</div>
                   <el-input v-if="greyType" type="textarea" :rows="10" resize="none" v-model="newEnglishList.engText" />
-                  <div v-else v-html="Correct(newEnglishList.engText)"></div>
+                  <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>
               </div>
@@ -11369,7 +11369,7 @@
                 <div class="oldDetail">
                   <div>正文：</div>
                   <el-input v-if="greyType" type="textarea" :rows="10" resize="none" v-model="oldEnglishJson1.engText" />
-                  <div v-else v-html="Correct(oldEnglishJson1.engText)"></div>
+                  <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>
               </div>
@@ -11384,7 +11384,7 @@
                 <div class="oldDetail">
                   <div>正文：</div>
                   <el-input v-if="greyType" type="textarea" :rows="10" resize="none" v-model="newEnglishList.engText" />
-                  <div v-else v-html="Correct(newEnglishList.engText)"></div>
+                  <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>
               </div>
@@ -11404,7 +11404,7 @@
                   <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" @input="gx"/>
-                    <div v-else v-html="Correct(newEnglishList1[newEngIndex].cWork.engText)"></div>
+                    <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>
@@ -19011,6 +19011,7 @@ export default {
             this.newEnglishList.engText = z.engText;
           }else{
             var a = res.data[0];
+            var ppp = JSON.parse(JSON.stringify(res.data[0])); 
             if(this.userMes[0].type == 2){
               var snum = 0;
               for(var i = 0;i<a.length;i++){
@@ -19039,6 +19040,7 @@ export default {
                 this.isNoUserid = false;
               }
               var b = a.sort((item, index) => {
+                console.log(item)
                 if (item.correct === this.userMes[0].userid) {
                   return -1; // 将a移到前面
                 } else if (index.correct === this.userMes[0].userid) {
@@ -19048,7 +19050,12 @@ export default {
                 }
               });
               for(var p = 0;p<b.length;p++){
-                b[p].cWork = JSON.parse(b[p].cWork)
+                for(var y = 0;y<ppp.length;y++){
+                  if(b[p].id == ppp[y].id){
+                    b[p].cWork = JSON.parse(ppp[y].cWork);
+                    break
+                  }
+                }
               }
               this.newEnglishList1 = b;
             }
@@ -19262,7 +19269,7 @@ export default {
               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;">' + a[k].value + '</span>';
+                w = '<span>' + a[k - 1].value + '</span>' + '<span style="text-decoration: line-through;color:red">' + a[k].value + '</span>';
               }
             }else{
               w = c
@@ -19272,13 +19279,13 @@ export default {
               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;">' + a[k].value + '</span>';
+                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;">' + a[k].value + '</span>';
+                w += '<span>' + a[k - 1].value + '</span>' + '<span style="text-decoration: line-through;color:red">' + a[k].value + '</span>';
               }
             }
           }