Bläddra i källkod

修改移动端反馈问题

natasha 6 månader sedan
förälder
incheckning
1e5109ef9c

+ 6 - 2
src/components/Adult/Preview.vue

@@ -221,7 +221,8 @@
         class="NNPE-title-bg"
         :style="{
           background: themeColorPhone[themeColorPhoneIndex],
-          position: 'initial'
+          position: 'initial',
+          opacity: 0
         }"
       >
         <div class="NNPE-title NNPE-title-top">
@@ -389,7 +390,10 @@
           </div>
         </div>
       </div>
-      <div class="operater-classTopic" :style="{ minHeight: '40px' }">
+      <div
+        class="operater-classTopic"
+        :style="{ minHeight: '40px', opacity: 0 }"
+      >
         <div
           v-if="isShowTitle && isPhone"
           class="NNPE-operate NNPE-operate-phone"

+ 0 - 2
src/components/Adult/phonePreview/ArticleViewChs/NormalModelChs.vue

@@ -677,7 +677,6 @@
                 :class="['enwords', sentIndex == index ? 'wordBlank' : '']"
                 :style="{
                   fontSize: baseSizePhone + 'px',
-                  height: baseSizePhone + 8 + 'px',
                   lineHeight: baseSizePhone + 8 + 'px'
                 }"
               >
@@ -1195,7 +1194,6 @@
                 "
                 :style="{
                   fontSize: baseSizePhone + 'px',
-                  height: baseSizePhone + 8 + 'px',
                   lineHeight: baseSizePhone + 8 + 'px'
                 }"
                 :class="['enwords', sentIndex == index ? 'wordBlank' : '']"

+ 0 - 2
src/components/Adult/phonePreview/ArticleViewChs/PhraseModelChs.vue

@@ -449,7 +449,6 @@
                 :class="['enwords', sentIndex == index ? 'wordBlank' : '']"
                 :style="{
                   fontSize: baseSizePhone + 'px',
-                  height: baseSizePhone + 8 + 'px',
                   lineHeight: baseSizePhone + 8 + 'px'
                 }"
               >
@@ -814,7 +813,6 @@
                 :class="['enwords', sentIndex == index ? 'wordBlank' : '']"
                 :style="{
                   fontSize: baseSizePhone + 'px',
-                  height: baseSizePhone + 8 + 'px',
                   lineHeight: baseSizePhone + 8 + 'px'
                 }"
               >

+ 0 - 2
src/components/Adult/phonePreview/ArticleViewChs/Practicechs.vue

@@ -80,7 +80,6 @@
               "
               :style="{
                 fontSize: baseSizePhone + 'px',
-                height: baseSizePhone + 8 + 'px',
                 lineHeight: baseSizePhone + 8 + 'px'
               }"
               :class="['enwords', sentIndex == index ? 'wordBlank' : '']"
@@ -440,7 +439,6 @@
               "
               :style="{
                 fontSize: baseSizePhone + 'px',
-                height: baseSizePhone + 8 + 'px',
                 lineHeight: baseSizePhone + 8 + 'px'
               }"
               :class="['enwords', sentIndex == index ? 'wordBlank' : '']"

+ 0 - 2
src/components/Adult/phonePreview/ArticleViewChs/WordModelChs.vue

@@ -418,7 +418,6 @@
                 :class="['enwords', sentIndex == index ? 'wordBlank' : '']"
                 :style="{
                   fontSize: baseSizePhone + 'px',
-                  height: baseSizePhone + 8 + 'px',
                   lineHeight: baseSizePhone + 8 + 'px'
                 }"
               >
@@ -742,7 +741,6 @@
                 :class="['enwords', sentIndex == index ? 'wordBlank' : '']"
                 :style="{
                   fontSize: baseSizePhone + 'px',
-                  height: baseSizePhone + 8 + 'px',
                   lineHeight: baseSizePhone + 8 + 'px'
                 }"
               >

+ 0 - 2
src/components/Adult/phonePreview/DialogueArticleViewChs/NormalModelChs.vue

@@ -127,7 +127,6 @@
                   class="enwords"
                   :style="{
                     fontSize: baseSizePhone + 'px',
-                    height: baseSizePhone + 8 + 'px',
                     lineHeight: baseSizePhone + 8 + 'px'
                   }"
                 >
@@ -656,7 +655,6 @@
                   class="enwords"
                   :style="{
                     fontSize: baseSizePhone + 'px',
-                    height: baseSizePhone + 8 + 'px',
                     lineHeight: baseSizePhone + 8 + 'px'
                   }"
                 >

+ 0 - 2
src/components/Adult/phonePreview/DialogueArticleViewChs/PhraseModelChs.vue

@@ -109,7 +109,6 @@
                   class="enwords"
                   :style="{
                     fontSize: baseSizePhone + 'px',
-                    height: baseSizePhone + 8 + 'px',
                     lineHeight: baseSizePhone + 8 + 'px'
                   }"
                 >
@@ -496,7 +495,6 @@
                   class="enwords"
                   :style="{
                     fontSize: baseSizePhone + 'px',
-                    height: baseSizePhone + 8 + 'px',
                     lineHeight: baseSizePhone + 8 + 'px'
                   }"
                 >

+ 0 - 2
src/components/Adult/phonePreview/DialogueArticleViewChs/Practicechs.vue

@@ -159,7 +159,6 @@
                   :class="['enwords', sentIndex == index ? 'wordBlank' : '']"
                   :style="{
                     fontSize: baseSizePhone + 'px',
-                    height: baseSizePhone + 8 + 'px',
                     lineHeight: baseSizePhone + 8 + 'px'
                   }"
                 >
@@ -548,7 +547,6 @@
                   :class="['enwords', sentIndex == index ? 'wordBlank' : '']"
                   :style="{
                     fontSize: baseSizePhone + 'px',
-                    height: baseSizePhone + 8 + 'px',
                     lineHeight: baseSizePhone + 8 + 'px'
                   }"
                 >

+ 0 - 2
src/components/Adult/phonePreview/DialogueArticleViewChs/WordModelChs.vue

@@ -109,7 +109,6 @@
                   class="enwords"
                   :style="{
                     fontSize: baseSizePhone + 'px',
-                    height: baseSizePhone + 8 + 'px',
                     lineHeight: baseSizePhone + 8 + 'px'
                   }"
                 >
@@ -456,7 +455,6 @@
                   "
                   :style="{
                     fontSize: baseSizePhone + 'px',
-                    height: baseSizePhone + 8 + 'px',
                     lineHeight: baseSizePhone + 8 + 'px'
                   }"
                   class="enwords"

+ 4 - 2
src/components/Adult/phonePreview/Ligature.vue

@@ -968,13 +968,14 @@ export default {
             font-style: normal;
             font-weight: normal;
             font-size: 16px;
-            line-height: 150%;
+            line-height: 24px;
             text-align: center;
             color: #ffffff;
             background: #a7a7a7;
             border-radius: 50%;
             margin-left: 8px;
             margin-right: 12px;
+            flex-shrink: 0;
           }
           > img {
             cursor: pointer;
@@ -1011,13 +1012,14 @@ export default {
             font-style: normal;
             font-weight: normal;
             font-size: 16px;
-            line-height: 150%;
+            line-height: 24px;
             text-align: center;
             color: #ffffff;
             background: #a7a7a7;
             border-radius: 50%;
             margin-left: 12px;
             margin-right: 8px;
+            flex-shrink: 0;
           }
           div {
             font-size: 16px;

+ 4 - 0
src/components/Adult/phonePreview/SentenceModule.vue

@@ -1901,6 +1901,10 @@ export default {
       border: 1px solid rgba(0, 0, 0, 0.1);
     }
   }
+  ::v-deep .el-radio,
+  .el-radio__input {
+    white-space: normal;
+  }
 }
 </style>
 <style lang="scss">

+ 4 - 0
src/components/Adult/phonePreview/SentenceMulModule.vue

@@ -1721,6 +1721,10 @@ export default {
       border: 1px solid rgba(0, 0, 0, 0.1);
     }
   }
+  ::v-deep .el-radio,
+  .el-radio__input {
+    white-space: normal;
+  }
 }
 </style>
 <style lang="scss">

+ 68 - 56
src/components/Adult/phonePreview/VoiceMatrixFullscreen.vue

@@ -3,7 +3,7 @@
     :class="[
       'voicefull',
       bgIndex === 0 ? 'bg1' : 'bg2',
-      isLandscape ? 'voicefull-scape' : '',
+      isLandscape ? 'voicefull-scape' : ''
     ]"
   >
     <div class="voicefull-top">
@@ -30,7 +30,7 @@
               <span
                 :class="[
                   'font-jian-black',
-                  bgIndex === 1 ? 'font-jian-yellow' : '',
+                  bgIndex === 1 ? 'font-jian-yellow' : ''
                 ]"
                 @click="setFontSize('-')"
               />
@@ -41,21 +41,21 @@
                   'font-jian-black',
                   bgIndex === 1
                     ? 'font-jian-yellow-disabled'
-                    : 'font-jian-white-disabled',
+                    : 'font-jian-white-disabled'
                 ]"
               />
             </template>
             <span
               :class="[
                 'font-img-black',
-                bgIndex === 1 ? 'font-img-yellow' : '',
+                bgIndex === 1 ? 'font-img-yellow' : ''
               ]"
             />
             <template v-if="hzSize <= 76">
               <span
                 :class="[
                   'font-jia-black',
-                  bgIndex === 1 ? 'font-jia-yellow' : '',
+                  bgIndex === 1 ? 'font-jia-yellow' : ''
                 ]"
                 @click="setFontSize('+')"
               />
@@ -66,7 +66,7 @@
                   'font-jia-black',
                   bgIndex === 1
                     ? 'font-jia-yellow-disabled'
-                    : 'font-jia-white-disabled',
+                    : 'font-jia-white-disabled'
                 ]"
               />
             </template>
@@ -96,7 +96,7 @@
               :class="[
                 'repeat-icon',
                 !isRepeat ? 'disabled' : 'auto-icon',
-                isRepeat && bgIndex === 1 ? 'auto-icon-yellow' : '',
+                isRepeat && bgIndex === 1 ? 'auto-icon-yellow' : ''
               ]"
             />
           </div>
@@ -108,9 +108,7 @@
               :class="[
                 'pinyin-icon',
                 !isShowPY || !isHasPY ? 'disabled' : '',
-                isShowPY && isHasPY && bgIndex === 1
-                  ? 'pinyin-icon-yellow'
-                  : '',
+                isShowPY && isHasPY && bgIndex === 1 ? 'pinyin-icon-yellow' : ''
               ]"
             />
           </div>
@@ -122,7 +120,7 @@
               :class="[
                 'en-icon',
                 !isShowEN || !isHasEN ? 'disabled' : '',
-                isShowEN && bgIndex === 1 && isHasEN ? 'en-icon-yellow' : '',
+                isShowEN && bgIndex === 1 && isHasEN ? 'en-icon-yellow' : ''
               ]"
             />
           </div>
@@ -143,7 +141,7 @@
         class="matrix"
         :style="{
           'grid-template': `96px repeat(${curQue.voiceMatrix.matrix.length}, auto) minmax(1.5em, 1fr) / 112px repeat(${curQue.voiceMatrix.matrix[0].length}, auto) minmax(124px, 1fr)`,
-          'font-size': `${hzSize}px`,
+          'font-size': `${hzSize}px`
         }"
         @mouseleave="clearSelectCell"
       >
@@ -163,7 +161,7 @@
                 `matrix-checkbox-row-${themeColor}`,
                 selectedLine.type === 'column' && selectedLine.index === i
                   ? 'active'
-                  : '',
+                  : ''
               ]"
               @click="selectRowOrColumn(i, 'column')"
             />
@@ -183,7 +181,7 @@
                 `matrix-checkbox-column-${themeColor}`,
                 selectedLine.type === 'row' && selectedLine.index === i
                   ? 'active'
-                  : '',
+                  : ''
               ]"
               @click="selectRowOrColumn(i, 'row')"
             />
@@ -197,7 +195,7 @@
                 (i === 0 && curQue.voiceMatrix.firstLineHighlight) ||
                 (j === row.length - 1 && curQue.voiceMatrix.lastColumnHighlight)
                   ? `highlight-${themeColor}`
-                  : '',
+                  : ''
               ]"
               @mouseenter="matrixCellMouseenter(i, j, column.type)"
             >
@@ -219,7 +217,7 @@
                     column.lrc_data.end_time === -1)
                     ? 'playing'
                     : '',
-                  column.isTitle ? 'title' : '',
+                  column.isTitle ? 'title' : ''
                 ]"
                 @click="matrixCellClick(i, j)"
               >
@@ -233,7 +231,7 @@
                   'connection',
                   i === 0 && curQue.voiceMatrix.firstLineHighlight
                     ? `highlight-bc-${themeColor}`
-                    : '',
+                    : ''
                 ]"
               />
               <!-- 分词 -->
@@ -254,10 +252,10 @@
                     column.lrc_data.end_time === -1)
                     ? 'playing'
                     : '',
-                  column.isTitle ? 'title' : '',
+                  column.isTitle ? 'title' : ''
                 ]"
                 :style="{
-                  'grid-template-columns': `repeat(${column.sentence_data.wordsList.length}, auto)`,
+                  'grid-template-columns': `repeat(${column.sentence_data.wordsList.length}, auto)`
                 }"
                 @click="matrixCellClick(i, j)"
               >
@@ -265,16 +263,18 @@
                   v-for="({ chs, pinyin }, w) in column.sentence_data.wordsList"
                 >
                   <span
-                    :key="`${
-                      column.sentence_data.pyPosition === 'top'
-                        ? 'pinyin'
-                        : 'chs'
-                    }-${w}`"
+                    :key="
+                      `${
+                        column.sentence_data.pyPosition === 'top'
+                          ? 'pinyin'
+                          : 'chs'
+                      }-${w}`
+                    "
                     :style="{
                       visibility:
                         column.sentence_data.pyPosition === 'top' && isShowPY
                           ? 'visible'
-                          : 'hidden',
+                          : 'hidden'
                     }"
                     :class="
                       column.sentence_data.pyPosition === 'top'
@@ -291,16 +291,18 @@
                   v-for="({ chs, pinyin }, w) in column.sentence_data.wordsList"
                 >
                   <span
-                    :key="`${
-                      column.sentence_data.pyPosition === 'top'
-                        ? 'chs'
-                        : 'pinyin'
-                    }-${w}`"
+                    :key="
+                      `${
+                        column.sentence_data.pyPosition === 'top'
+                          ? 'chs'
+                          : 'pinyin'
+                      }-${w}`
+                    "
                     :style="{
                       visibility:
                         column.sentence_data.pyPosition !== 'top' && isShowPY
                           ? 'hidden'
-                          : 'visible',
+                          : 'visible'
                     }"
                     :class="
                       column.sentence_data.pyPosition === 'top'
@@ -332,7 +334,7 @@
                     column.lrc_data.end_time === -1)
                     ? 'playing'
                     : '',
-                  column.isTitle ? 'title' : '',
+                  column.isTitle ? 'title' : ''
                 ]"
                 @click="matrixCellClick(i, j)"
               >
@@ -366,7 +368,7 @@
                     column.lrc_data.end_time === -1)
                     ? 'playing'
                     : '',
-                  column.isTitle ? 'title' : '',
+                  column.isTitle ? 'title' : ''
                 ]"
                 @click="matrixCellClick(i, j)"
               >
@@ -408,7 +410,7 @@ export default {
     VoiceMatrixFullscreenAudio,
     Soundrecorddiff,
     AudioCompare,
-    Wordcard,
+    Wordcard
   },
   props: ["mp3", "curQue", "themeColor", "recordList"],
   data() {
@@ -438,12 +440,12 @@ export default {
       // 行、列选中
       selectedLine: {
         type: "",
-        index: 0,
+        index: 0
       },
       // 点击选中
       selectCell: {
         row: -1,
-        column: -1,
+        column: -1
       },
       isRepeat: false,
       // 跟读所需属性
@@ -456,7 +458,7 @@ export default {
       // 拼音、英文显隐判断
       isShowPY: true,
       isShowEN: true,
-      isLandscape: window.innerWidth < window.innerHeight, // 手机是否为竖屏
+      isLandscape: window.innerWidth < window.innerHeight // 手机是否为竖屏
     };
   },
   computed: {
@@ -488,7 +490,7 @@ export default {
         type: type.length > 0 && index >= 0 ? type : "cell",
         index,
         row,
-        column,
+        column
       };
     },
     // 矩阵的行、列数从 0 开始
@@ -496,9 +498,9 @@ export default {
       const matrixArr = this.curQue.voiceMatrix.matrix;
       return {
         rows: matrixArr.length - 1,
-        columns: matrixArr.length > 0 ? matrixArr[0].length - 1 : -1,
+        columns: matrixArr.length > 0 ? matrixArr[0].length - 1 : -1
       };
-    },
+    }
   },
   watch: {
     isRecording(newVal) {
@@ -522,7 +524,7 @@ export default {
           }
         }, 50);
       }
-    },
+    }
   },
   created() {
     document.addEventListener("keyup", this.handleKeyup);
@@ -531,10 +533,11 @@ export default {
       "fullscreenchange",
       "mozfullscreenchange",
       "webkitfullscreenchange",
-      "msfullscreenchange",
-    ].forEach((event) => {
+      "msfullscreenchange"
+    ].forEach(event => {
       document.addEventListener(event, this.handleFullscreen);
     });
+    window.addEventListener("resize", this.handleResize);
   },
   beforeDestroy() {
     document.removeEventListener("keyup", this.handleKeyup);
@@ -542,10 +545,11 @@ export default {
       "fullscreenchange",
       "mozfullscreenchange",
       "webkitfullscreenchange",
-      "msfullscreenchange",
-    ].forEach((event) => {
+      "msfullscreenchange"
+    ].forEach(event => {
       document.removeEventListener(event, this.handleFullscreen);
     });
+    window.removeEventListener("resize", this.handleResize);
   },
   // 方法集合
   methods: {
@@ -586,8 +590,13 @@ export default {
     },
 
     setRecordingFileName(row, column) {
-      let { type, text, sentence_data, pinyin_english_data, text_brackets } =
-        this.curQue.voiceMatrix.matrix[row][column];
+      let {
+        type,
+        text,
+        sentence_data,
+        pinyin_english_data,
+        text_brackets
+      } = this.curQue.voiceMatrix.matrix[row][column];
       if (type === "text") this.fileName = text;
       if (type === "SentenceSegwordChs") this.fileName = sentence_data.sentence;
       if (type === "PinyinEnglish") this.fileName = pinyin_english_data.pinyin;
@@ -636,7 +645,7 @@ export default {
       this.lrcArray = [];
       let { type, index } = this.selectedLine;
       if (type.length > 0 && index >= 0 && type === "row") {
-        this.curQue.voiceMatrix.matrix[index].forEach((item) => {
+        this.curQue.voiceMatrix.matrix[index].forEach(item => {
           let data = this.getLrcData(item);
           if (data) this.lrcArray.push(data);
         });
@@ -645,7 +654,7 @@ export default {
       }
 
       if (type.length > 0 && index >= 0 && type === "column") {
-        this.curQue.voiceMatrix.matrix.forEach((item) => {
+        this.curQue.voiceMatrix.matrix.forEach(item => {
           let data = this.getLrcData(item[index]);
           if (data) this.lrcArray.push(data);
         });
@@ -668,7 +677,7 @@ export default {
         this.$refs.audioLine.PlayAudio();
         if (end_time === -1) return;
         let end = end_time / 1000 - 0.01;
-        this.unWatch = this.$watch("curTime", (val) => {
+        this.unWatch = this.$watch("curTime", val => {
           if (val >= end) {
             if (!this.hasSelectedCell) return this.unWatch();
             this.handleParentPlay();
@@ -718,7 +727,7 @@ export default {
       }
       let arr = [];
       if (type.length > 0 && index >= 0 && type === "row") {
-        this.curQue.voiceMatrix.matrix[index].forEach((item) => {
+        this.curQue.voiceMatrix.matrix[index].forEach(item => {
           let data = this.getLrcData(item);
           if (data) arr.push(data);
         });
@@ -727,7 +736,7 @@ export default {
       }
 
       if (type.length > 0 && index >= 0 && type === "column") {
-        this.curQue.voiceMatrix.matrix.forEach((item) => {
+        this.curQue.voiceMatrix.matrix.forEach(item => {
           let data = this.getLrcData(item[index]);
           if (data) arr.push(data);
         });
@@ -753,7 +762,7 @@ export default {
           return {
             begin_time: lrc_data.begin_time,
             end_time: this.mp3Duration,
-            text: lrc_data.text,
+            text: lrc_data.text
           };
         }
         return lrc_data;
@@ -774,7 +783,7 @@ export default {
         // 监听是否已到结束时间,为了选中效果 - 0.01
         if (end_time === -1) return;
         let end = end_time / 1000 - 0.01;
-        this.unWatch = this.$watch("curTime", (val) => {
+        this.unWatch = this.$watch("curTime", val => {
           if (val >= end) {
             this.handleParentPlay();
             this.$refs.audioLine.onTimeupdateTime(end);
@@ -908,7 +917,7 @@ export default {
         audio.length > 0 &&
         window.location.href.indexOf("GCLS-Learn") == -1
       ) {
-        audio.forEach((item) => {
+        audio.forEach(item => {
           item.pause();
         });
       }
@@ -921,7 +930,10 @@ export default {
       this.pauseAudio();
       this.$emit("changeIsFull");
     },
-  },
+    handleResize() {
+      this.isLandscape = window.innerWidth < window.innerHeight;
+    }
+  }
 };
 </script>
 

+ 12 - 1
src/components/Adult/phonePreview/Voicefullscreen.vue

@@ -7,6 +7,9 @@
       isLandscape ? 'voicefull-scape' : ''
     ]"
     v-if="sentList"
+    :style="{
+      paddingRight: isLandscape ? '100px' : ''
+    }"
   >
     <div class="voicefull-top ">
       <div :class="['voicefull-top-show']">
@@ -1532,6 +1535,9 @@ export default {
     },
     getScreenHeight() {
       this.screenHeight = window.innerHeight;
+    },
+    handleResize() {
+      this.isLandscape = window.innerWidth < window.innerHeight;
     }
   },
   //生命周期 - 创建完成(可以访问当前this实例)
@@ -1620,12 +1626,15 @@ export default {
         _this.changeFullScreen();
       }
     });
+    window.addEventListener("resize", this.handleResize);
   },
   beforeCreate() {}, //生命周期 - 创建之前
   beforeMount() {}, //生命周期 - 挂载之前
   beforeUpdate() {}, //生命周期 - 更新之前
   updated() {}, //生命周期 - 更新之后
-  beforeDestroy() {}, //生命周期 - 销毁之前
+  beforeDestroy() {
+    window.removeEventListener("resize", this.handleResize);
+  }, //生命周期 - 销毁之前
   destroyed() {}, //生命周期 - 销毁完成
   activated() {} //如果页面有keep-alive缓存功能,这个函数会触发
 };
@@ -1640,6 +1649,8 @@ export default {
   left: 0;
   top: 0;
   z-index: 99999;
+  padding-top: env(safe-area-inset-top);
+  padding-bottom: env(safe-area-inset-bottom);
   &-scape {
     width: 100vh;
     height: 100vw;

+ 6 - 2
src/components/Adult/phonePreview/components/Freewrite.vue

@@ -1,6 +1,6 @@
 <!--  -->
 <template>
-  <div class="freewrite">
+  <div class="freewrite" :class="[isRealFull ? 'freewrite-full' : '']">
     <div class="strockred" :class="wordNum ? '' : 'strockred_single'">
       <div
         :class="
@@ -67,7 +67,8 @@ export default {
     "wordNum",
     "currentTreeID",
     "TaskModel",
-    "writeList"
+    "writeList",
+    "isRealFull"
   ],
   data() {
     return {
@@ -269,6 +270,9 @@ export default {
 .freewrite {
   position: relative;
   width: 100%;
+  &-full {
+    transform: rotate(-90deg);
+  }
   .record-notice {
     position: absolute;
     top: 106px;

+ 12 - 3
src/components/Adult/phonePreview/components/Practice.vue

@@ -21,6 +21,7 @@
               : require('../../../../assets/icon/Cross-16-normal-red.png')
             : require('../../../../assets/icon/Cross-16-normal-red.png')
         "
+        :style="{ right: pageFrom === 'fullscreen' ? '100px' : '' }"
       />
       <el-tabs type="border-card" @tab-click="handleClick">
         <el-tab-pane label="简体"> </el-tab-pane>
@@ -124,13 +125,14 @@
                     :tabIndex="0"
                     :TaskModel="TaskModel"
                     :writeList="writeList"
+                    :isRealFull="isRealFull"
                     ref="freewrite"
                     @saveWriteAnswer="saveWriteAnswer"
                   />
                   <div class="footer">
                     <div class="pen-colors"></div>
                   </div>
-                  <a @click="resetHuahua(index)" class="clean-btn"></a>
+                  <!-- <a @click="resetHuahua(index)" class="clean-btn"></a> -->
                 </template>
               </div>
 
@@ -241,13 +243,14 @@
                     :tabIndex="1"
                     :TaskModel="TaskModel"
                     :writeList="writeList"
+                    :isRealFull="isRealFull"
                     ref="freewrite"
                     @saveWriteAnswer="saveWriteAnswer"
                   />
                   <div class="footer">
                     <div class="pen-colors"></div>
                   </div>
-                  <a @click="resetHuahua(index)" class="clean-btn"></a>
+                  <!-- <a @click="resetHuahua(index)" class="clean-btn"></a> -->
                 </template>
               </div>
 
@@ -319,7 +322,8 @@ export default {
       isShow: "0",
       collFlag: false,
       isPhone: false,
-      fullWidth: 0 // 手机全屏模式下临摹宽度
+      fullWidth: 0, // 手机全屏模式下临摹宽度
+      isRealFull: false
     };
   },
   computed: {},
@@ -485,10 +489,12 @@ export default {
 
     if (this.pageFrom && this.pageFrom === "fullscreen") {
       this.fullWidth = window.innerWidth - 160;
+      this.isRealFull = true;
       this.$forceUpdate();
     } else if (window.innerWidth > window.innerHeight) {
       this.pageFrom = "fullscreen";
       this.fullWidth = window.innerHeight - 160;
+      this.isRealFull = false;
       this.$forceUpdate();
     }
   },
@@ -527,6 +533,9 @@ export default {
   background: #f3f3f3;
   box-shadow: 0px 4px 16px rgba(0, 0, 0, 0.15);
   border-radius: 8px;
+  &-full {
+    transform: rotate(-90deg);
+  }
   .clean-btn {
     width: 16px;
     height: 16px;

+ 1 - 0
src/components/Adult/phonePreview/components/SentenceTemp.vue

@@ -447,6 +447,7 @@ export default {
     max-width: 100%;
     &-option {
       padding: 8px 0;
+      display: flex; // 解决句子拆分组件 选项不折行问题
     }
     &-hasPY {
       padding: 3px 0;

+ 8 - 1
src/components/TreeView.vue

@@ -24,7 +24,9 @@
               : ''
           ]"
         >
-          <span style="margin-right: 10px">{{ node.label }}</span>
+          <div class="tree_box_item_node" style="margin-right: 10px">
+            {{ node.label }}
+          </div>
         </div>
       </div></el-tree
     >
@@ -326,6 +328,11 @@ export default {
   text-overflow: ellipsis;
   font-weight: bold;
 }
+.tree_box_item_node {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
 .el-tree-node__expand-icon.is-leaf {
   opacity: 0;
 }