Browse Source

Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-student-table into beta

lsc 5 days ago
parent
commit
b13798f1f2

+ 1 - 1
dist/index.html

@@ -32,7 +32,7 @@
     html,
     body{
       font-family: '黑体';
-    }</style><link href=./static/css/app.8a12cef0d20a6fea297811e1a53cbef6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.becc9317549795ada446.js></script><script type=text/javascript src=./static/js/app.4506381defb2b91ba682.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.45591e826a3b75e2c9c2b596a3cf4667.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.becc9317549795ada446.js></script><script type=text/javascript src=./static/js/app.db5fb8a0afd56a40cd91.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.45591e826a3b75e2c9c2b596a3cf4667.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.45591e826a3b75e2c9c2b596a3cf4667.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.db5fb8a0afd56a40cd91.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.db5fb8a0afd56a40cd91.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 46 - 13
src/components/easy2/studyStudent.vue

@@ -15131,18 +15131,24 @@
                 <div
                   class="oldDetail"
                   v-if="
-                    oldEnglishJson.imgList && oldEnglishJson.imgList.length > 0
+                    oldEnglishJson &&
+                      oldEnglishJson.imgList &&
+                      oldEnglishJson.imgList.length > 0 &&
+                      oldEnglishJson.imgList[0]
                   "
                 >
                   <div>{{lang.ssImageColon}}</div>
                   <div class="oldImg">
-                    <img :src="oldEnglishJson.imgList[0].url" alt="" />
+                    <img :src="oldEnglishJson.imgList[0].url || ''" alt="" />
                   </div>
                 </div>
               </div>
             </div>
           </div>
-          <div class="oldBox loadingText" v-if="userMes[0].type == 2">
+          <div
+            class="oldBox loadingText"
+            v-if="userMes && userMes[0] && userMes[0].type == 2"
+          >
             <div class="oldMes" style="background: #aacaff;">
               {{ userMes[0].username }}
             </div>
@@ -15193,7 +15199,10 @@
               </div>
             </div>
           </div>
-          <div class="oldBox loadingText" v-else-if="userMes[0].type == 1">
+          <div
+            class="oldBox loadingText"
+            v-else-if="userMes && userMes[0] && userMes[0].type == 1"
+          >
             <div
               class="oldMes"
               style="background: rgb(224 236 255);display: flex;flex-direction: row;flex-wrap: nowrap;align-items: center;overflow-x: auto;overflow-y: hidden;"
@@ -15338,7 +15347,10 @@
                   <div>{{lang.ssTitleColon}}</div>
                   <div
                     v-if="
-                      userMes[0].userid != newEnglishList1[newEngIndex].correct
+                      userMes &&
+                        userMes[0] &&
+                        userMes[0].userid !=
+                          newEnglishList1[newEngIndex].correct
                     "
                     v-html="newEnglishList1[newEngIndex].cWork.engTitle"
                   ></div>
@@ -15357,7 +15369,10 @@
                   <div>{{lang.ssContentColon}}</div>
                   <correctText
                     v-if="
-                      userMes[0].userid != newEnglishList1[newEngIndex].correct
+                      userMes &&
+                        userMes[0] &&
+                        userMes[0].userid !=
+                          newEnglishList1[newEngIndex].correct
                     "
                     :newText="newEnglishList1[newEngIndex].cWork.engText"
                     :oldData="oldEnglishJson.engText"
@@ -15392,6 +15407,8 @@
                   :style="{ right: greyType == false ? '0' : '80px' }"
                   v-if="
                     !greyType &&
+                      userMes &&
+                      userMes[0] &&
                       userMes[0].userid == newEnglishList1[newEngIndex].correct
                   "
                   >{{ greyType == false ? lang.ssAddAnnotation : lang.ssCancelAdd }}</el-button
@@ -15403,6 +15420,8 @@
                   style="position: absolute;bottom: -70px;right: 110px;background: #409eff;color: #fff;"
                   v-if="
                     !greyType &&
+                      userMes &&
+                      userMes[0] &&
                       userMes[0].userid == newEnglishList1[newEngIndex].correct
                   "
                   >{{lang.ssAIAnnotation}}</el-button
@@ -15838,7 +15857,7 @@ export default {
       topHeight: 0,
       newEngIndex: -1,
       englishToolIndex: 0,
-      userMes: {},
+      userMes: [],
       englishToolIndex: 0,
       worksSName: "",
       classJuri: [],
@@ -25073,7 +25092,7 @@ export default {
       this.ajax
         .get(this.$store.state.api + "selectUser", params)
         .then(res => {
-          this.userMes = res.data[0];
+          this.userMes = res.data && res.data[0] ? res.data[0] : [];
         })
         .catch(err => {
           console.error(err);
@@ -25099,6 +25118,8 @@ export default {
             wid: this.engWid,
             c: this.userid,
             w:
+              this.userMes &&
+              this.userMes[0] &&
               this.userMes[0].type == 2
                 ? JSON.parse(this.newEnglishList)
                 : this.newEngIndex == -1 &&
@@ -25136,7 +25157,7 @@ export default {
           } else {
             var a = res.data[0];
             var ppp = JSON.parse(JSON.stringify(res.data[0]));
-            if (this.userMes[0].type == 2) {
+            if (this.userMes && this.userMes[0] && this.userMes[0].type == 2) {
               var snum = 0;
               for (var i = 0; i < a.length; i++) {
                 if (this.userMes[0].userid == a[i].correct) {
@@ -25149,7 +25170,11 @@ export default {
                 this.newEnglishList.engTitle = z.engTitle;
                 this.newEnglishList.engText = z.engText;
               }
-            } else if (this.userMes[0].type == 1) {
+            } else if (
+              this.userMes &&
+              this.userMes[0] &&
+              this.userMes[0].type == 1
+            ) {
               var num = 0;
               for (var w = 0; w < a.length; w++) {
                 if (this.userMes[0].userid == a[w].correct) {
@@ -25165,9 +25190,17 @@ export default {
               }
               var b = a.sort((item, index) => {
                 console.log(item);
-                if (item.correct === this.userMes[0].userid) {
+                if (
+                  this.userMes &&
+                  this.userMes[0] &&
+                  item.correct === this.userMes[0].userid
+                ) {
                   return -1; // 将a移到前面
-                } else if (index.correct === this.userMes[0].userid) {
+                } else if (
+                  this.userMes &&
+                  this.userMes[0] &&
+                  index.correct === this.userMes[0].userid
+                ) {
                   return 1; // 将b移到前面
                 } else {
                   return 0; // 保持默认顺序
@@ -25198,7 +25231,7 @@ export default {
                 this.newEngIndex = 0;
               }
             }
-            if (this.userMes[0].type == 2) {
+            if (this.userMes && this.userMes[0] && this.userMes[0].type == 2) {
               this.correctWord = Diff.diffWordsWithSpace(
                 this.oldEnglishJson.engText,
                 this.newEnglishList.engText

+ 16 - 16
src/components/easy3/studyStudent.vue

@@ -11755,14 +11755,14 @@
                   <div>{{lang.ssContentColon}}</div>
                   <div v-html="oldEnglishJson.engText" style="white-space: pre-line;"></div>
                 </div>
-                <div class="oldDetail" v-if="oldEnglishJson.imgList && oldEnglishJson.imgList.length > 0">
+                <div class="oldDetail" v-if="oldEnglishJson && oldEnglishJson.imgList && oldEnglishJson.imgList.length > 0 && oldEnglishJson.imgList[0]">
                   <div>{{lang.ssImageColon}}</div>
-                  <div class="oldImg"><img :src="oldEnglishJson.imgList[0].url" alt="" /></div>
+                  <div class="oldImg"><img :src="oldEnglishJson.imgList[0].url || ''" alt="" /></div>
                 </div>
               </div>
             </div>
           </div>
-          <div class="oldBox loadingText" v-if="userMes[0].type == 2">
+          <div class="oldBox loadingText" v-if="userMes && userMes[0] && userMes[0].type == 2">
             <div class="oldMes" style="background: #aacaff;">{{ userMes[0].username }}</div>
             <div class="oldText">
               <div class="detailBox" style="position: relative;">
@@ -11784,7 +11784,7 @@
               </div>
             </div>
           </div>
-          <div class="oldBox loadingText" v-else-if="userMes[0].type == 1">
+          <div class="oldBox loadingText" v-else-if="userMes && userMes[0] && userMes[0].type == 1">
             <div class="oldMes" style="background: rgb(224 236 255);display: flex;flex-direction: row;flex-wrap: nowrap;align-items: center;overflow-x: auto;overflow-y: hidden;" v-if="newEnglishList1.length > 0">
               <div v-if="isNoUserid" class="allName" :style="{minWidth: `calc(100% / ${engListLength})`,background: newEngIndex == -1 ? '#aacaff' : ''}" @click="setEngText(-1)" style="background: #aacaff;">{{ userMes[0].username }}</div>
               <div v-for="(item,index) in newEnglishList1" :key="index" class="allName" :style="{minWidth: `calc(100% / ${engListLength})`,background: index == newEngIndex ? '#aacaff' : ''}" @click="setEngText(index)">{{ item.username }}</div>
@@ -11832,7 +11832,7 @@
               <div class="detailBox" style="position: relative;">
                 <div class="oldDetail">
                   <div>{{lang.ssTitleColon}}</div>
-                  <div v-if="userMes[0].userid != newEnglishList1[newEngIndex].correct" v-html="newEnglishList1[newEngIndex].cWork.engTitle"></div>
+                  <div v-if="userMes && userMes[0] && 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" />
                     <div v-else v-html="newEnglishList1[newEngIndex].cWork.engTitle"></div>
@@ -11841,7 +11841,7 @@
                 <div class="oldDetail">
                   <div>{{lang.ssContentColon}}</div>
                   <!-- <div v-if="userMes[0].userid != newEnglishList1[newEngIndex].correct" v-html="newEnglishList1[newEngIndex].cWork.engText"></div> -->
-									<correctText v-if="userMes[0].userid != newEnglishList1[newEngIndex].correct" :newText="newEnglishList1[newEngIndex].cWork.engText" :oldData="oldEnglishJson.engText"/>
+									<correctText v-if="userMes && userMes[0] && userMes[0].userid != newEnglishList1[newEngIndex].correct" :newText="newEnglishList1[newEngIndex].cWork.engText" :oldData="oldEnglishJson.engText"/>
                   <div v-else>
                     <el-input v-if="greyType" type="textarea" :rows="10" resize="none" v-model="newEnglishList1[newEngIndex].cWork.engText" @input="gx"/>
 										<correctText v-else :newText="newEnglishList1[newEngIndex].cWork.engText" :oldData="oldEnglishJson.engText"/>
@@ -11849,8 +11849,8 @@
                   </div>
                 </div>
                 <div style="position: absolute;bottom: -25px;">{{lang.ssNoteRedDeleteGreenAdd}}</div>
-                <el-button @click="isUpdateCorrect(newEnglishList1[newEngIndex].cWork.engText,4)" class="correctCss" :style="{right: greyType == false ? '0' : '80px' }" v-if="!greyType && userMes[0].userid == newEnglishList1[newEngIndex].correct">{{ greyType == false ? lang.ssAddAnnotation : lang.ssCancelAdd }}</el-button>
-                <el-button @click="aiCorrect(newEnglishList1[newEngIndex].cWork.engText,4)" style="position: absolute;bottom: -70px;right: 110px;background: #409eff;color: #fff;" v-if="!greyType && userMes[0].userid == newEnglishList1[newEngIndex].correct">{{lang.ssAIAnnotation}}</el-button>
+                <el-button @click="isUpdateCorrect(newEnglishList1[newEngIndex].cWork.engText,4)" class="correctCss" :style="{right: greyType == false ? '0' : '80px' }" v-if="!greyType && userMes && userMes[0] && userMes[0].userid == newEnglishList1[newEngIndex].correct">{{ greyType == false ? lang.ssAddAnnotation : lang.ssCancelAdd }}</el-button>
+                <el-button @click="aiCorrect(newEnglishList1[newEngIndex].cWork.engText,4)" style="position: absolute;bottom: -70px;right: 110px;background: #409eff;color: #fff;" v-if="!greyType && userMes && userMes[0] && userMes[0].userid == newEnglishList1[newEngIndex].correct">{{lang.ssAIAnnotation}}</el-button>
                 <el-button @click="addCorrect" style="position: absolute;bottom: -70px;right: 0;background: #409eff;color: #fff;" v-if="greyType">{{lang.ssConfirm}}</el-button>
               </div>
             </div>
@@ -12379,7 +12379,7 @@ export default {
       topHeight:0,
       newEngIndex:-1,
       englishToolIndex:0,
-      userMes:{},
+      userMes:[],
       englishToolIndex:0,
       replyIndex: 0,
       replyPid: "",
@@ -20451,7 +20451,7 @@ export default {
       this.ajax
         .get(this.$store.state.api + "selectUser", params)
         .then((res) => {
-          this.userMes = res.data[0];
+          this.userMes = (res.data && res.data[0]) ? res.data[0] : [];
         })
         .catch((err) => {
           console.error(err);
@@ -20476,7 +20476,7 @@ export default {
             tool: this.toolindex,
             wid: this.engWid,
             c: this.userid,
-            w: this.userMes[0].type == 2 ? JSON.parse(this.newEnglishList) : (this.newEngIndex == -1 && this.isNoUserid == true && this.newEnglishList1.length) ? JSON.stringify(this.oldEnglishJson1) : this.newEngIndex == -1 ? JSON.stringify(this.newEnglishList) : (this.newEngIndex > -1 && this.newEnglishList1.length > 0) ? JSON.stringify(this.newEnglishList1[this.newEngIndex].cWork) : "",
+            w: this.userMes && this.userMes[0] && this.userMes[0].type == 2 ? JSON.parse(this.newEnglishList) : (this.newEngIndex == -1 && this.isNoUserid == true && this.newEnglishList1.length) ? JSON.stringify(this.oldEnglishJson1) : this.newEngIndex == -1 ? JSON.stringify(this.newEnglishList) : (this.newEngIndex > -1 && this.newEnglishList1.length > 0) ? JSON.stringify(this.newEnglishList1[this.newEngIndex].cWork) : "",
           };
           this.ajax
             .get(this.$store.state.api + "addEngC", params)
@@ -20503,7 +20503,7 @@ export default {
           }else{
             var a = res.data[0];
             var ppp = JSON.parse(JSON.stringify(res.data[0]));
-            if(this.userMes[0].type == 2){
+            if(this.userMes && this.userMes[0] && this.userMes[0].type == 2){
               var snum = 0;
               for(var i = 0;i<a.length;i++){
                 if(this.userMes[0].userid == a[i].correct){
@@ -20516,7 +20516,7 @@ export default {
                 this.newEnglishList.engTitle = z.engTitle;
                 this.newEnglishList.engText = z.engText;
               }
-            }else if(this.userMes[0].type == 1){
+            }else if(this.userMes && this.userMes[0] && this.userMes[0].type == 1){
               var num = 0;
               for(var w= 0;w<a.length;w++){
                 if(this.userMes[0].userid == a[w].correct){
@@ -20532,9 +20532,9 @@ export default {
               }
               var b = a.sort((item, index) => {
                 console.log(item)
-                if (item.correct === this.userMes[0].userid) {
+                if (this.userMes && this.userMes[0] && item.correct === this.userMes[0].userid) {
                   return -1; // 将a移到前面
-                } else if (index.correct === this.userMes[0].userid) {
+                } else if (this.userMes && this.userMes[0] && index.correct === this.userMes[0].userid) {
                   return 1; // 将b移到前面
                 } else {
                   return 0; // 保持默认顺序
@@ -20563,7 +20563,7 @@ export default {
                 this.newEngIndex = 0;
               }
             }
-            if(this.userMes[0].type == 2){
+            if(this.userMes && this.userMes[0] && this.userMes[0].type == 2){
               this.correctWord = Diff.diffWordsWithSpace(this.oldEnglishJson.engText,this.newEnglishList.engText);
             }else if(this.newEngIndex == -1 && this.isNoUserid == true && this.newEnglishList1.length){
               this.correctWord = Diff.diffWordsWithSpace(this.oldEnglishJson.engText,this.oldEnglishJson1.engText);

+ 1 - 1
src/components/studyStudent.vue

@@ -11691,7 +11691,7 @@
                 </div>
                 <div class="oldDetail" v-if="oldEnglishJson.imgList && oldEnglishJson.imgList.length > 0 && oldEnglishJson.imgList[0]">
                   <div>{{ lang.ssImageColon }}</div>
-                  <div class="oldImg"><img :src="oldEnglishJson.imgList[0].url" alt="" /></div>
+                  <div class="oldImg"><img :src="oldEnglishJson.imgList[0].url || ''" alt="" /></div>
                 </div>
               </div>
             </div>

+ 16 - 16
src/components/studySutdentClass/studyStudent.vue

@@ -14927,14 +14927,14 @@
                   <div>{{ lang.ssContentColon }}</div>
                   <div v-html="oldEnglishJson.engText" style="white-space: pre-line;"></div>
                 </div>
-                <div class="oldDetail" v-if="oldEnglishJson.imgList && oldEnglishJson.imgList.length > 0">
+                <div class="oldDetail" v-if="oldEnglishJson && oldEnglishJson.imgList && oldEnglishJson.imgList.length > 0 && oldEnglishJson.imgList[0]">
                   <div>{{ lang.ssImageColon }}</div>
-                  <div class="oldImg"><img :src="oldEnglishJson.imgList[0].url" alt="" /></div>
+                  <div class="oldImg"><img :src="oldEnglishJson.imgList[0].url || ''" alt="" /></div>
                 </div>
               </div>
             </div>
           </div>
-          <div class="oldBox loadingText" v-if="userMes[0].type == 2">
+          <div class="oldBox loadingText" v-if="userMes && userMes[0] && userMes[0].type == 2">
             <div class="oldMes" style="background: #aacaff;">{{ userMes[0].username }}</div>
             <div class="oldText">
               <div class="detailBox" style="position: relative;">
@@ -14956,7 +14956,7 @@
               </div>
             </div>
           </div>
-          <div class="oldBox loadingText" v-else-if="userMes[0].type == 1">
+          <div class="oldBox loadingText" v-else-if="userMes && userMes[0] && userMes[0].type == 1">
             <div class="oldMes" style="background: rgb(224 236 255);display: flex;flex-direction: row;flex-wrap: nowrap;align-items: center;overflow-x: auto;overflow-y: hidden;" v-if="newEnglishList1.length > 0">
               <div v-if="isNoUserid" class="allName" :style="{minWidth: `calc(100% / ${engListLength})`,background: newEngIndex == -1 ? '#aacaff' : ''}" @click="setEngText(-1)" style="background: #aacaff;">{{ userMes[0].username }}</div>
               <div v-for="(item,index) in newEnglishList1" :key="index" class="allName" :style="{minWidth: `calc(100% / ${engListLength})`,background: index == newEngIndex ? '#aacaff' : ''}" @click="setEngText(index)">{{ item.username }}</div>
@@ -15004,7 +15004,7 @@
               <div class="detailBox" style="position: relative;">
                 <div class="oldDetail">
                   <div>{{ lang.ssTitleColon }}</div>
-                  <div v-if="userMes[0].userid != newEnglishList1[newEngIndex].correct" v-html="newEnglishList1[newEngIndex].cWork.engTitle"></div>
+                  <div v-if="userMes && userMes[0] && 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" />
                     <div v-else v-html="newEnglishList1[newEngIndex].cWork.engTitle"></div>
@@ -15013,7 +15013,7 @@
                 <div class="oldDetail">
                   <div>{{ lang.ssContentColon }}</div>
                   <!-- <div v-if="userMes[0].userid != newEnglishList1[newEngIndex].correct" v-html="newEnglishList1[newEngIndex].cWork.engText"></div> -->
-									<correctText v-if="userMes[0].userid != newEnglishList1[newEngIndex].correct" :newText="newEnglishList1[newEngIndex].cWork.engText" :oldData="oldEnglishJson.engText"/>
+									<correctText v-if="userMes && userMes[0] && userMes[0].userid != newEnglishList1[newEngIndex].correct" :newText="newEnglishList1[newEngIndex].cWork.engText" :oldData="oldEnglishJson.engText"/>
                   <div v-else>
                     <el-input v-if="greyType" type="textarea" :rows="10" resize="none" v-model="newEnglishList1[newEngIndex].cWork.engText" @input="gx"/>
 										<correctText v-else :newText="newEnglishList1[newEngIndex].cWork.engText" :oldData="oldEnglishJson.engText"/>
@@ -15021,8 +15021,8 @@
                   </div>
                 </div>
                 <div style="position: absolute;bottom: -25px;">{{ lang.ssNoteRedDeleteGreenAdd }}</div>
-                <el-button @click="isUpdateCorrect(newEnglishList1[newEngIndex].cWork.engText,4)" class="correctCss" :style="{right: greyType == false ? '0' : '80px' }" v-if="!greyType && userMes[0].userid == newEnglishList1[newEngIndex].correct">{{ greyType == false ? lang.ssAddAnnotation : lang.ssCancelAdd }}</el-button>
-                <el-button @click="aiCorrect(newEnglishList1[newEngIndex].cWork.engText,4)" style="position: absolute;bottom: -70px;right: 110px;background: #409eff;color: #fff;" v-if="!greyType && userMes[0].userid == newEnglishList1[newEngIndex].correct">{{ lang.ssAIAnnotation }}</el-button>
+                <el-button @click="isUpdateCorrect(newEnglishList1[newEngIndex].cWork.engText,4)" class="correctCss" :style="{right: greyType == false ? '0' : '80px' }" v-if="!greyType && userMes && userMes[0] && userMes[0].userid == newEnglishList1[newEngIndex].correct">{{ greyType == false ? lang.ssAddAnnotation : lang.ssCancelAdd }}</el-button>
+                <el-button @click="aiCorrect(newEnglishList1[newEngIndex].cWork.engText,4)" style="position: absolute;bottom: -70px;right: 110px;background: #409eff;color: #fff;" v-if="!greyType && userMes && userMes[0] && userMes[0].userid == newEnglishList1[newEngIndex].correct">{{ lang.ssAIAnnotation }}</el-button>
                 <el-button @click="addCorrect" style="position: absolute;bottom: -70px;right: 0;background: #409eff;color: #fff;" v-if="greyType">{{ lang.ssConfirm }}</el-button>
               </div>
             </div>
@@ -15620,7 +15620,7 @@ export default {
       topHeight:0,
       newEngIndex:-1,
       englishToolIndex:0,
-      userMes:{},
+      userMes:[],
       englishToolIndex:0,
       replyIndex: 0,
       replyPid: "",
@@ -24503,7 +24503,7 @@ export default {
       this.ajax
         .get(this.$store.state.api + "selectUser", params)
         .then((res) => {
-          this.userMes = res.data[0];
+          this.userMes = (res.data && res.data[0]) ? res.data[0] : [];
         })
         .catch((err) => {
           console.error(err);
@@ -24528,7 +24528,7 @@ export default {
             tool: this.toolindex,
             wid: this.engWid,
             c: this.userid,
-            w: this.userMes[0].type == 2 ? JSON.parse(this.newEnglishList) : (this.newEngIndex == -1 && this.isNoUserid == true && this.newEnglishList1.length) ? JSON.stringify(this.oldEnglishJson1) : this.newEngIndex == -1 ? JSON.stringify(this.newEnglishList) : (this.newEngIndex > -1 && this.newEnglishList1.length > 0) ? JSON.stringify(this.newEnglishList1[this.newEngIndex].cWork) : "",
+            w: this.userMes && this.userMes[0] && this.userMes[0].type == 2 ? JSON.parse(this.newEnglishList) : (this.newEngIndex == -1 && this.isNoUserid == true && this.newEnglishList1.length) ? JSON.stringify(this.oldEnglishJson1) : this.newEngIndex == -1 ? JSON.stringify(this.newEnglishList) : (this.newEngIndex > -1 && this.newEnglishList1.length > 0) ? JSON.stringify(this.newEnglishList1[this.newEngIndex].cWork) : "",
           };
           this.ajax
             .get(this.$store.state.api + "addEngC", params)
@@ -24555,7 +24555,7 @@ export default {
           }else{
             var a = res.data[0];
             var ppp = JSON.parse(JSON.stringify(res.data[0]));
-            if(this.userMes[0].type == 2){
+            if(this.userMes && this.userMes[0] && this.userMes[0].type == 2){
               var snum = 0;
               for(var i = 0;i<a.length;i++){
                 if(this.userMes[0].userid == a[i].correct){
@@ -24568,7 +24568,7 @@ export default {
                 this.newEnglishList.engTitle = z.engTitle;
                 this.newEnglishList.engText = z.engText;
               }
-            }else if(this.userMes[0].type == 1){
+            }else if(this.userMes && this.userMes[0] && this.userMes[0].type == 1){
               var num = 0;
               for(var w= 0;w<a.length;w++){
                 if(this.userMes[0].userid == a[w].correct){
@@ -24584,9 +24584,9 @@ export default {
               }
               var b = a.sort((item, index) => {
                 console.log(item)
-                if (item.correct === this.userMes[0].userid) {
+                if (this.userMes && this.userMes[0] && item.correct === this.userMes[0].userid) {
                   return -1; // 将a移到前面
-                } else if (index.correct === this.userMes[0].userid) {
+                } else if (this.userMes && this.userMes[0] && index.correct === this.userMes[0].userid) {
                   return 1; // 将b移到前面
                 } else {
                   return 0; // 保持默认顺序
@@ -24615,7 +24615,7 @@ export default {
                 this.newEngIndex = 0;
               }
             }
-            if(this.userMes[0].type == 2){
+            if(this.userMes && this.userMes[0] && this.userMes[0].type == 2){
               this.correctWord = Diff.diffWordsWithSpace(this.oldEnglishJson.engText,this.newEnglishList.engText);
             }else if(this.newEngIndex == -1 && this.isNoUserid == true && this.newEnglishList1.length){
               this.correctWord = Diff.diffWordsWithSpace(this.oldEnglishJson.engText,this.oldEnglishJson1.engText);

Some files were not shown because too many files changed in this diff