zengyicheng 1 year ago
parent
commit
1442d67d7f

+ 7 - 1
src/components/components/englishEva.vue

@@ -65,7 +65,7 @@
             </div>
           </div>
         </div>
-        <div v-if="type == 1" class="halfOldBox">
+        <div v-if="type == 1" class="halfOldBox loadingText">
           <div
             class="oldMes"
             style="
@@ -435,6 +435,12 @@ export default {
               this.startList.scoreList.push(0);
             }
           }
+          this.type = 0;
+          const loading = this.$loading.service({
+            background: "rgba(255, 255, 255)",
+            target: document.querySelectorAll(".loadingText")[0],
+          });
+          loading.close();
           this.$forceUpdate();
           this.timer = setInterval(() => {
             this.topHeight = document.querySelectorAll(".engUpTop2")[0]

+ 30 - 20
src/components/easy2/studyStudent.vue

@@ -11328,17 +11328,18 @@
           <div class="oldBox" v-if="userMes[0].type == 2">
             <div class="oldMes" style="background: #aacaff;">{{ userMes[0].username }}</div>
             <div class="oldText">
-              <div class="detailBox">
+              <div class="detailBox" style="position: relative;">
                 <div class="oldDetail">
                   <div>标题:</div>
-                  <el-input v-model="newEnglishList.engTitle" />
+                  <el-input v-if="greyType" v-model="newEnglishList.engTitle" />
+                  <div v-else v-html="newEnglishList.engTitle"></div>
                 </div>
                 <div class="oldDetail">
                   <div>正文:</div>
-                  <el-input 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" />
+                  <div v-else v-html="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>
             </div>
           </div>
@@ -11349,47 +11350,54 @@
             </div>
             <div class="oldMes" style="background: #aacaff;" v-else>{{ userMes[0].username }}</div>
             <div class="oldText" v-if="newEngIndex == -1 && isNoUserid == true && newEnglishList1.length">
-              <div class="detailBox">
+              <div class="detailBox" style="position: relative;">
                 <div class="oldDetail">
                   <div>标题:</div>
-                  <el-input v-model="oldEnglishJson1.engTitle" />
+                  <el-input v-if="greyType" v-model="oldEnglishJson1.engTitle" />
+                  <div v-else v-html="oldEnglishJson1.engTitle"></div>
                 </div>
                 <div class="oldDetail">
                   <div>正文:</div>
-                  <el-input 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" />
+                  <div v-else v-html="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>
             </div>
             <div class="oldText" v-else-if="newEngIndex == -1">
-              <div class="detailBox">
+              <div class="detailBox" style="position: relative;">
                 <div class="oldDetail">
                   <div>标题:</div>
-                  <el-input v-model="newEnglishList.engTitle" />
+                  <el-input v-if="greyType" v-model="newEnglishList.engTitle" />
+                  <div v-else v-html="newEnglishList.engTitle"></div>
                 </div>
                 <div class="oldDetail">
                   <div>正文:</div>
-                  <el-input 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" />
+                  <div v-else v-html="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>
             </div>
             <div class="oldText" v-else-if="newEngIndex > -1 && newEnglishList1.length > 0">
-              <div class="detailBox">
+              <div class="detailBox" style="position: relative;">
                 <div class="oldDetail">
                   <div>标题:</div>
                   <div v-if="userMes[0].userid != newEnglishList1[newEngIndex].correct" v-html="JSON.parse(newEnglishList1[newEngIndex].cWork).engTitle"></div>
-                  <el-input v-else v-model="JSON.parse(newEnglishList1[newEngIndex].cWork).engTitle" />
+                  <div v-else>
+                    <el-input v-if="greyType" v-model="JSON.parse(newEnglishList1[newEngIndex].cWork).engTitle" />
+                    <div v-else v-html="JSON.parse(newEnglishList1[newEngIndex].cWork).engTitle"></div>
+                  </div>
                 </div>
                 <div class="oldDetail">
                   <div>正文:</div>
                   <div v-if="userMes[0].userid != newEnglishList1[newEngIndex].correct" v-html="JSON.parse(newEnglishList1[newEngIndex].cWork).engText"></div>
-                  <el-input v-else type="textarea"
-                  :rows="10"
-                  resize="none" v-model="JSON.parse(newEnglishList1[newEngIndex].cWork).engText" />
+                  <div v-else>
+                    <el-input v-if="greyType" type="textarea" :rows="10" resize="none" v-model="JSON.parse(newEnglishList1[newEngIndex].cWork).engText" />
+                    <div v-else v-html="JSON.parse(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>
               </div>
             </div>
           </div>
@@ -11893,6 +11901,7 @@ export default {
       isPickStudent: [],
       pzStype: 1,
       downLoading: false,
+      greyType: false,
     };
   },
   methods: {
@@ -19014,6 +19023,7 @@ export default {
               this.newEnglishList1 = b;
             }
           }
+          this.greyType = false;
           this.engUpdateDialogVisible = true;
           this.$forceUpdate();
           setTimeout(() => {

+ 30 - 20
src/components/easy3/studyStudent.vue

@@ -11315,17 +11315,18 @@
           <div class="oldBox" v-if="userMes[0].type == 2">
             <div class="oldMes" style="background: #aacaff;">{{ userMes[0].username }}</div>
             <div class="oldText">
-              <div class="detailBox">
+              <div class="detailBox" style="position: relative;">
                 <div class="oldDetail">
                   <div>标题:</div>
-                  <el-input v-model="newEnglishList.engTitle" />
+                  <el-input v-if="greyType" v-model="newEnglishList.engTitle" />
+                  <div v-else v-html="newEnglishList.engTitle"></div>
                 </div>
                 <div class="oldDetail">
                   <div>正文:</div>
-                  <el-input 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" />
+                  <div v-else v-html="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>
             </div>
           </div>
@@ -11336,47 +11337,54 @@
             </div>
             <div class="oldMes" style="background: #aacaff;" v-else>{{ userMes[0].username }}</div>
             <div class="oldText" v-if="newEngIndex == -1 && isNoUserid == true && newEnglishList1.length">
-              <div class="detailBox">
+              <div class="detailBox" style="position: relative;">
                 <div class="oldDetail">
                   <div>标题:</div>
-                  <el-input v-model="oldEnglishJson1.engTitle" />
+                  <el-input v-if="greyType" v-model="oldEnglishJson1.engTitle" />
+                  <div v-else v-html="oldEnglishJson1.engTitle"></div>
                 </div>
                 <div class="oldDetail">
                   <div>正文:</div>
-                  <el-input 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" />
+                  <div v-else v-html="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>
             </div>
             <div class="oldText" v-else-if="newEngIndex == -1">
-              <div class="detailBox">
+              <div class="detailBox" style="position: relative;">
                 <div class="oldDetail">
                   <div>标题:</div>
-                  <el-input v-model="newEnglishList.engTitle" />
+                  <el-input v-if="greyType" v-model="newEnglishList.engTitle" />
+                  <div v-else v-html="newEnglishList.engTitle"></div>
                 </div>
                 <div class="oldDetail">
                   <div>正文:</div>
-                  <el-input 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" />
+                  <div v-else v-html="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>
             </div>
             <div class="oldText" v-else-if="newEngIndex > -1 && newEnglishList1.length > 0">
-              <div class="detailBox">
+              <div class="detailBox" style="position: relative;">
                 <div class="oldDetail">
                   <div>标题:</div>
                   <div v-if="userMes[0].userid != newEnglishList1[newEngIndex].correct" v-html="JSON.parse(newEnglishList1[newEngIndex].cWork).engTitle"></div>
-                  <el-input v-else v-model="JSON.parse(newEnglishList1[newEngIndex].cWork).engTitle" />
+                  <div v-else>
+                    <el-input v-if="greyType" v-model="JSON.parse(newEnglishList1[newEngIndex].cWork).engTitle" />
+                    <div v-else v-html="JSON.parse(newEnglishList1[newEngIndex].cWork).engTitle"></div>
+                  </div>
                 </div>
                 <div class="oldDetail">
                   <div>正文:</div>
                   <div v-if="userMes[0].userid != newEnglishList1[newEngIndex].correct" v-html="JSON.parse(newEnglishList1[newEngIndex].cWork).engText"></div>
-                  <el-input v-else type="textarea"
-                  :rows="10"
-                  resize="none" v-model="JSON.parse(newEnglishList1[newEngIndex].cWork).engText" />
+                  <div v-else>
+                    <el-input v-if="greyType" type="textarea" :rows="10" resize="none" v-model="JSON.parse(newEnglishList1[newEngIndex].cWork).engText" />
+                    <div v-else v-html="JSON.parse(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>
               </div>
             </div>
           </div>
@@ -11881,6 +11889,7 @@ export default {
       pzStype: 1,
       myAnList: {},
       downLoading: false,
+      greyType: false,
     };
   },
   methods: {
@@ -19005,6 +19014,7 @@ export default {
               this.newEnglishList1 = b;
             }
           }
+          this.greyType = false;
           this.engUpdateDialogVisible = true;
           this.$forceUpdate();
           setTimeout(() => {

+ 30 - 20
src/components/studyStudent.vue

@@ -11300,17 +11300,18 @@
           <div class="oldBox" v-if="userMes[0].type == 2">
             <div class="oldMes" style="background: #aacaff;">{{ userMes[0].username }}</div>
             <div class="oldText">
-              <div class="detailBox">
+              <div class="detailBox" style="position: relative;">
                 <div class="oldDetail">
                   <div>标题:</div>
-                  <el-input v-model="newEnglishList.engTitle" />
+                  <el-input v-if="greyType" v-model="newEnglishList.engTitle" />
+                  <div v-else v-html="newEnglishList.engTitle"></div>
                 </div>
                 <div class="oldDetail">
                   <div>正文:</div>
-                  <el-input 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" />
+                  <div v-else v-html="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>
             </div>
           </div>
@@ -11321,47 +11322,54 @@
             </div>
             <div class="oldMes" style="background: #aacaff;" v-else>{{ userMes[0].username }}</div>
             <div class="oldText" v-if="newEngIndex == -1 && isNoUserid == true && newEnglishList1.length">
-              <div class="detailBox">
+              <div class="detailBox" style="position: relative;">
                 <div class="oldDetail">
                   <div>标题:</div>
-                  <el-input v-model="oldEnglishJson1.engTitle" />
+                  <el-input v-if="greyType" v-model="oldEnglishJson1.engTitle" />
+                  <div v-else v-html="oldEnglishJson1.engTitle"></div>
                 </div>
                 <div class="oldDetail">
                   <div>正文:</div>
-                  <el-input 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" />
+                  <div v-else v-html="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>
             </div>
             <div class="oldText" v-else-if="newEngIndex == -1">
-              <div class="detailBox">
+              <div class="detailBox" style="position: relative;">
                 <div class="oldDetail">
                   <div>标题:</div>
-                  <el-input v-model="newEnglishList.engTitle" />
+                  <el-input v-if="greyType" v-model="newEnglishList.engTitle" />
+                  <div v-else v-html="newEnglishList.engTitle"></div>
                 </div>
                 <div class="oldDetail">
                   <div>正文:</div>
-                  <el-input 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" />
+                  <div v-else v-html="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>
             </div>
             <div class="oldText" v-else-if="newEngIndex > -1 && newEnglishList1.length > 0">
-              <div class="detailBox">
+              <div class="detailBox" style="position: relative;">
                 <div class="oldDetail">
                   <div>标题:</div>
                   <div v-if="userMes[0].userid != newEnglishList1[newEngIndex].correct" v-html="JSON.parse(newEnglishList1[newEngIndex].cWork).engTitle"></div>
-                  <el-input v-else v-model="JSON.parse(newEnglishList1[newEngIndex].cWork).engTitle" />
+                  <div v-else>
+                    <el-input v-if="greyType" v-model="JSON.parse(newEnglishList1[newEngIndex].cWork).engTitle" />
+                    <div v-else v-html="JSON.parse(newEnglishList1[newEngIndex].cWork).engTitle"></div>
+                  </div>
                 </div>
                 <div class="oldDetail">
                   <div>正文:</div>
                   <div v-if="userMes[0].userid != newEnglishList1[newEngIndex].correct" v-html="JSON.parse(newEnglishList1[newEngIndex].cWork).engText"></div>
-                  <el-input v-else type="textarea"
-                  :rows="10"
-                  resize="none" v-model="JSON.parse(newEnglishList1[newEngIndex].cWork).engText" />
+                  <div v-else>
+                    <el-input v-if="greyType" type="textarea" :rows="10" resize="none" v-model="JSON.parse(newEnglishList1[newEngIndex].cWork).engText" />
+                    <div v-else v-html="JSON.parse(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>
               </div>
             </div>
           </div>
@@ -11863,6 +11871,7 @@ export default {
       myAnList: {},
       userMes:{},
       downLoading: false,
+      greyType: false,
     };
   },
   methods: {
@@ -18981,6 +18990,7 @@ export default {
               this.newEnglishList1 = b;
             }
           }
+          this.greyType = false;
           this.engUpdateDialogVisible = true;
           this.$forceUpdate();
           setTimeout(() => {