1

src/components/components/englishEva.vue

@@ -14,7 +14,7 @@
           <div>{{ evaEngJson.teacherJson.engTitle }}</div>
         </div>
         <div class="engText">
-          <div>作文题目：</div>
+          <div>作文内容：</div>
           <div
             class="cont"
             v-html="evaEngJson.teacherJson.englishText"
@@ -55,11 +55,7 @@
             </div>
           </div>
         </div>
-        <div
-          class="oldBox"
-          style="position: relative; overflow: hidden"
-          :style="{ height: `calc(100% - ${topHeight}px)` }"
-        >
+        <div class="oldBox" style="position: relative">
           <div
             class="oldMes"
             style="
@@ -134,22 +130,20 @@
               >AI评价</el-button
             >
           </div>
-          <div v-if="type == 1" style="margin: 10px 0 0 0">
-            <div class="oldText" style="margin-top: 10px">
-              <div class="detailBox" style="min-width: 300px">
-                <div class="oldDetail" style="min-width: 300px">
-                  <div>作业原文：</div>
-                  <div v-html="evaEngJson.studentJson.engText"></div>
-                </div>
-                <div class="oldDetail" style="min-width: 300px">
-                  <div>作业评价：</div>
-                  <el-input
-                    type="textarea"
-                    :rows="10"
-                    resize="none"
-                    v-model="teacherList.engText"
-                  />
-                </div>
+          <div v-if="type == 1" class="oldText" style="margin-top: 10px">
+            <div class="detailBox">
+              <div class="oldDetail">
+                <div>作业原文：</div>
+                <div v-html="evaEngJson.studentJson.engText"></div>
+              </div>
+              <div class="oldDetail">
+                <div>作业评价：</div>
+                <el-input
+                  type="textarea"
+                  :rows="10"
+                  resize="none"
+                  v-model="teacherList.engText"
+                />
               </div>
             </div>
           </div>
@@ -183,6 +177,7 @@ export default {
         engTitle: "",
         engText: "",
       },
+      time: null,
       md: new MarkdownIt(),
     };
   },
@@ -295,8 +290,17 @@ export default {
         if (newVal == true) {
           this.aiList.engText = this.evaEngJson.message.aiCode;
           this.teacherList.engText = this.evaEngJson.message.teacherCode;
-          this.topHeight =
-            document.querySelectorAll(".engUpTop")[0].offsetHeight;
+          this.$forceUpdate();
+          this.timer = setInterval(() => {
+            this.topHeight =
+              document.querySelectorAll(".engUpTop")[0].offsetHeight;
+          }, 1000);
+          // setTimeout(() => {
+          //   this.topHeight =
+          //     document.querySelectorAll(".engUpTop")[0].offsetHeight;
+          // }, 500);
+        }else{
+          clearInterval(this.timer);
         }
       },
       deep: true,
@@ -405,7 +409,9 @@ export default {
 
 .oldText {
   width: 100%;
-  height: 100%;
+  height: calc(100% - 35px);
+  overflow: auto;
+  margin: 10px 0;
   display: flex;
   flex-direction: column;
   flex-wrap: nowrap;
@@ -425,11 +431,6 @@ export default {
   padding-bottom: 30px;
 }
 
-.oldDetail1 > div:last-child {
-  max-height: 200px;
-  overflow: auto;
-}
-
 .oldImg {
   width: 30px;
   height: 30px;
@@ -451,4 +452,66 @@ export default {
   border: 1px solid #bcc2cc;
   box-sizing: border-box;
 }
+
+/* table 样式 */
+.cont >>> table {
+  border-top: 1px solid #ccc;
+  border-left: 1px solid #ccc;
+}
+
+.cont >>> table td,
+.cont >>> table th {
+  border-bottom: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+  /* padding: 20px 5px; */
+  padding: 5px 10px;
+  max-width: 0px;
+  height: 30px;
+  vertical-align: baseline;
+  box-sizing: border-box;
+}
+
+.cont >>> table th {
+  border-bottom: 2px solid #ccc;
+  text-align: center;
+}
+
+/* blockquote 样式 */
+.cont >>> blockquote {
+  display: block;
+  border-left: 8px solid #d0e5f2;
+  padding: 5px 10px;
+  margin: 10px 0;
+  line-height: 1.4;
+  font-size: 100%;
+  background-color: #f1f1f1;
+}
+
+/* code 样式 */
+.cont >>> code {
+  display: inline-block;
+  /* *display: inline; */
+  zoom: 1;
+  background-color: #f1f1f1;
+  border-radius: 3px;
+  padding: 3px 5px;
+  margin: 0 3px;
+}
+
+.cont >>> pre code {
+  display: block;
+}
+
+/* ul ol 样式 */
+.cont >>> ul,
+ol {
+  margin: 10px 0 10px 20px;
+}
+
+/* code 样式 */
+.cont {
+  /* -webkit-user-modify: read-write; */
+  overflow-wrap: break-word;
+  -webkit-line-break: after-white-space;
+}
 </style>

src/components/components/onlineWrite.vue

@@ -5,8 +5,8 @@
       <div>{{ englishList.engTitle }}</div>
     </div>
     <div class="engText">
-      <div>作文题目：</div>
-      <div v-html="englishList.englishText"></div>
+      <div>作文内容：</div>
+      <div class="cont" v-html="englishList.englishText"></div>
     </div>
 
     <div
@@ -417,4 +417,66 @@ export default {
   top: -5px;
   right: -5px;
 }
+
+/* table 样式 */
+.cont >>> table {
+  border-top: 1px solid #ccc;
+  border-left: 1px solid #ccc;
+}
+
+.cont >>> table td,
+.cont >>> table th {
+  border-bottom: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+  /* padding: 20px 5px; */
+  padding: 5px 10px;
+  max-width: 0px;
+  height: 30px;
+  vertical-align: baseline;
+  box-sizing: border-box;
+}
+
+.cont >>> table th {
+  border-bottom: 2px solid #ccc;
+  text-align: center;
+}
+
+/* blockquote 样式 */
+.cont >>> blockquote {
+  display: block;
+  border-left: 8px solid #d0e5f2;
+  padding: 5px 10px;
+  margin: 10px 0;
+  line-height: 1.4;
+  font-size: 100%;
+  background-color: #f1f1f1;
+}
+
+/* code 样式 */
+.cont >>> code {
+  display: inline-block;
+  /* *display: inline; */
+  zoom: 1;
+  background-color: #f1f1f1;
+  border-radius: 3px;
+  padding: 3px 5px;
+  margin: 0 3px;
+}
+
+.cont >>> pre code {
+  display: block;
+}
+
+/* ul ol 样式 */
+.cont >>> ul,
+ol {
+  margin: 10px 0 10px 20px;
+}
+
+/* code 样式 */
+.cont {
+  /* -webkit-user-modify: read-write; */
+  overflow-wrap: break-word;
+  -webkit-line-break: after-white-space;
+}
 </style>

src/components/easy2/commpont/onlineWrite.vue

@@ -5,8 +5,8 @@
       <div>{{ englishList.engTitle }}</div>
     </div>
     <div class="engText">
-      <div>作文题目：</div>
-      <div v-html="englishList.englishText"></div>
+      <div>作文内容：</div>
+      <div class="cont" v-html="englishList.englishText"></div>
     </div>
 
     <div
@@ -417,4 +417,66 @@ export default {
   top: -5px;
   right: -5px;
 }
+
+/* table 样式 */
+.cont >>> table {
+  border-top: 1px solid #ccc;
+  border-left: 1px solid #ccc;
+}
+
+.cont >>> table td,
+.cont >>> table th {
+  border-bottom: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+  /* padding: 20px 5px; */
+  padding: 5px 10px;
+  max-width: 0px;
+  height: 30px;
+  vertical-align: baseline;
+  box-sizing: border-box;
+}
+
+.cont >>> table th {
+  border-bottom: 2px solid #ccc;
+  text-align: center;
+}
+
+/* blockquote 样式 */
+.cont >>> blockquote {
+  display: block;
+  border-left: 8px solid #d0e5f2;
+  padding: 5px 10px;
+  margin: 10px 0;
+  line-height: 1.4;
+  font-size: 100%;
+  background-color: #f1f1f1;
+}
+
+/* code 样式 */
+.cont >>> code {
+  display: inline-block;
+  /* *display: inline; */
+  zoom: 1;
+  background-color: #f1f1f1;
+  border-radius: 3px;
+  padding: 3px 5px;
+  margin: 0 3px;
+}
+
+.cont >>> pre code {
+  display: block;
+}
+
+/* ul ol 样式 */
+.cont >>> ul,
+ol {
+  margin: 10px 0 10px 20px;
+}
+
+/* code 样式 */
+.cont {
+  /* -webkit-user-modify: read-write; */
+  overflow-wrap: break-word;
+  -webkit-line-break: after-white-space;
+}
 </style>

src/components/easy2/studyStudent.vue

@@ -3826,7 +3826,7 @@
                             : worksStudent[toolIndex].slice(0, 6)"
                           :key="wIndex"
                           class="isWorksName2"
-                          style="width: 150px;height: 50px;line-height: 50px;"
+                          style="width: 160px;height: 65px;line-height: 65px;"
                           @click="
                             openTools(
                               69,
@@ -11307,7 +11307,7 @@
             <div>{{ englishList1.engTitle }}</div>
           </div>
           <div class="engText">
-            <div>作文题目：</div>
+            <div>作文内容：</div>
             <div class="cont" v-html="englishList1.englishText" @click="checkImg(getImgList(englishList1.englishText))"></div>
           </div>
         </div>

src/components/easy3/commpont/onlineWrite.vue

@@ -5,8 +5,8 @@
       <div>{{ englishList.engTitle }}</div>
     </div>
     <div class="engText">
-      <div>作文题目：</div>
-      <div v-html="englishList.englishText"></div>
+      <div>作文内容：</div>
+      <div class="cont" v-html="englishList.englishText"></div>
     </div>
 
     <div
@@ -417,4 +417,66 @@ export default {
   top: -5px;
   right: -5px;
 }
+
+/* table 样式 */
+.cont >>> table {
+  border-top: 1px solid #ccc;
+  border-left: 1px solid #ccc;
+}
+
+.cont >>> table td,
+.cont >>> table th {
+  border-bottom: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+  /* padding: 20px 5px; */
+  padding: 5px 10px;
+  max-width: 0px;
+  height: 30px;
+  vertical-align: baseline;
+  box-sizing: border-box;
+}
+
+.cont >>> table th {
+  border-bottom: 2px solid #ccc;
+  text-align: center;
+}
+
+/* blockquote 样式 */
+.cont >>> blockquote {
+  display: block;
+  border-left: 8px solid #d0e5f2;
+  padding: 5px 10px;
+  margin: 10px 0;
+  line-height: 1.4;
+  font-size: 100%;
+  background-color: #f1f1f1;
+}
+
+/* code 样式 */
+.cont >>> code {
+  display: inline-block;
+  /* *display: inline; */
+  zoom: 1;
+  background-color: #f1f1f1;
+  border-radius: 3px;
+  padding: 3px 5px;
+  margin: 0 3px;
+}
+
+.cont >>> pre code {
+  display: block;
+}
+
+/* ul ol 样式 */
+.cont >>> ul,
+ol {
+  margin: 10px 0 10px 20px;
+}
+
+/* code 样式 */
+.cont {
+  /* -webkit-user-modify: read-write; */
+  overflow-wrap: break-word;
+  -webkit-line-break: after-white-space;
+}
 </style>

src/components/easy3/studyStudent.vue

@@ -3813,7 +3813,7 @@
                             : worksStudent[toolIndex].slice(0, 6)"
                           :key="wIndex"
                           class="isWorksName2"
-                          style="width: 150px;height: 50px;line-height: 50px;"
+                          style="width: 160px;height: 65px;line-height: 65px;"
                           @click="
                             openTools(
                               69,
@@ -11294,7 +11294,7 @@
             <div>{{ englishList1.engTitle }}</div>
           </div>
           <div class="engText">
-            <div>作文题目：</div>
+            <div>作文内容：</div>
             <div class="cont" v-html="englishList1.englishText" @click="checkImg(getImgList(englishList1.englishText))"></div>
           </div>
         </div>

src/components/studyStudent.vue

@@ -3820,7 +3820,7 @@
                             : worksStudent[toolIndex].slice(0, 6)"
                           :key="wIndex"
                           class="isWorksName2"
-                          style="width: 150px;height: 50px;line-height: 50px;"
+                          style="width: 160px;height: 65px;line-height: 65px;"
                           @click="
                             openTools(
                               69,
@@ -11276,7 +11276,7 @@
             <div>{{ englishList1.engTitle }}</div>
           </div>
           <div class="engText">
-            <div>作文题目：</div>
+            <div>作文内容：</div>
             <div class="cont" v-html="englishList1.englishText" @click="checkImg(getImgList(englishList1.englishText))"></div>
           </div>
         </div>