生词显示序号 分词没有拼音去掉间隙 去掉输入

src/components/Adult/common/NewordPhraseModule.vue

@@ -17,6 +17,20 @@
           <el-button type="danger" size="small" @click="deleteGroup2"
             >删除</el-button
           >
+          <el-button
+                type="primary"
+                size="small"
+                icon="el-icon-top"
+                @click="moveElement(curQueItem, 'up')"
+                >上移</el-button
+            >
+            <el-button
+                type="primary"
+                size="small"
+                icon="el-icon-bottom"
+                @click="moveElement(curQueItem, 'down')"
+                >下移</el-button
+            >
         </div>
 
         <div
@@ -140,7 +154,7 @@ export default {
   components: {
     Upload,
   },
-  props: ["curQue", "curQueItem", "index", "sIndex", "type", "deleteGroup"],
+  props: ["curQue", "curQueItem", "index", "sIndex", "type", "deleteGroup", "moveElement2"],
   data() {
     return {
       mp3Number: 1,
@@ -216,6 +230,9 @@ export default {
     deleteGroup2() {
       this.deleteGroup(this.index, this.sIndex);
     },
+    moveElement(dItem, type) {
+      this.moveElement2(dItem, type, this.index, this.sIndex)
+    },
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {},

src/components/Adult/inputModules/Neword.vue

@@ -96,6 +96,26 @@
         :key="'newWord' + index"
         style="border-bottom: 1px #ccc solid; margin-bottom: 20px"
       >
+        <div class="Big-Book-mian-op">
+            <span>{{'第'+(index+1)+'组'}}   </span>
+            <el-button
+                type="primary"
+                size="small"
+                icon="el-icon-top"
+                @click="moveElement(item, index, 'up')"
+                >上移</el-button
+            >
+            <el-button
+                type="primary"
+                size="small"
+                icon="el-icon-bottom"
+                @click="moveElement(item, index, 'down')"
+                >下移</el-button
+            >
+            <el-button size="mini" type="danger" @click="delsItem(index)">
+            删除本组
+            </el-button>
+        </div>
         <div
           class="Big-Book-main-inner"
           v-for="(sItem, sIndex) in item"
@@ -108,14 +128,12 @@
             :sIndex="sIndex"
             :type="curQue.type"
             :deleteGroup="deleteGroup"
+            :moveElement2="moveElement2"
           />
         </div>
         <div class="addoption addoption2" @click="saddoption(item)">
           添加字词
         </div>
-        <el-button size="mini" type="danger" @click="delsItem(index)">
-          删除本组
-        </el-button>
       </div>
       <div class="addoption" @click="addoption">添加一组</div>
     </div>
@@ -344,6 +362,26 @@ export default {
       });
       this.curQue.lrc_list = lrc_list;
     },
+    moveElement(dItem, index, type) {
+      let obj = JSON.parse(JSON.stringify(dItem));
+      if (type == "up" && index > 0) {
+        this.curQue.option.splice(index - 1, 0, obj);
+        this.curQue.option.splice(index + 1, 1);
+      }
+      if (type == "down" && index < this.curQue.option.length - 1) {
+        this.curQue.option[index] = this.curQue.option.splice(index + 1, 1, this.curQue.option[index])[0]
+      }
+    },
+    moveElement2(dItem, type, index, index2) {
+      let obj = JSON.parse(JSON.stringify(dItem));
+      if (type == "up" && index2 > 0) {
+        this.curQue.option[index].splice(index2 - 1, 0, obj);
+        this.curQue.option[index].splice(index2 + 1, 1);
+      }
+      if (type == "down" && index2 < this.curQue.option[index].length - 1) {
+        this.curQue.option[index][index2] = this.curQue.option[index].splice(index2 + 1, 1, this.curQue.option[index][index2])[0]
+      }
+    },
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {},

src/components/Adult/preview/ArticleViewChs/NormalModelChs.vue

@@ -4,7 +4,7 @@
     <div class="aduioLine-box aduioLine-practice-npc" v-if="
             curQue.mp3_list &&
             curQue.mp3_list.length > 0 &&
-            curQue.mp3_list[0].id
+            curQue.mp3_list[0].id || config.isHasPY || config.isHasEN
           ">
       <div class="aduioLine-content">
         <template
@@ -32,10 +32,12 @@
         <span
           :class="['pinyin-16', config.isShowPY ? '' : 'disabled']"
           @click="changePinyin"
+          v-if="config.isHasPY"
         ></span>
         <span
           :class="['EN-16', config.isShowEN ? '' : 'disabled']"
           @click="changeEN"
+          v-if="config.isHasEN"
         ></span>
       </div>
     </div>
@@ -91,7 +93,6 @@
                             pItem.className ? pItem.className : '',
                             noFont.indexOf(pItem.pinyin) > -1 ? 'noFont' : '',
                           ]"
-                          @click.stop="viewNotes($event, pItem.pinyin)"
                           >{{ pItem.pinyin }}</span
                         >
                         <span
@@ -122,7 +123,6 @@
                                   ? 'wordActive'
                                   : '',
                               ]"
-                              @click.stop="viewNotes($event, pItem.chs[wIndex])"
                               >{{
                                   NumberList.indexOf(pItem.pinyin) == -1
                                     ? pItem.chs[wIndex]
@@ -140,7 +140,6 @@
                             pItem.className ? pItem.className : '',
                             noFont.indexOf(pItem.pinyin) > -1 ? 'noFont' : '',
                           ]"
-                          @click.stop="viewNotes($event, pItem.pinyin)"
                           >{{ pItem.pinyin }}</span
                         >
                       </span>
@@ -155,7 +154,6 @@
                               : '',
                           ]"
                           style="text-align: left"
-                          @click.stop="viewNotes($event, item.wordsList[pIndex + 1].pinyin)"
                           >{{ item.wordsList[pIndex + 1].pinyin }}</span
                         >
                         <span
@@ -182,7 +180,6 @@
                               ? 'wordActive'
                               : '',
                           ]"
-                          @click.stop="viewNotes($event, item.wordsList[pIndex + 1].chs)"
                           >{{ NumberList.indexOf(
                                 item.wordsList[pIndex + 1].pinyin
                               ) == -1
@@ -201,7 +198,6 @@
                               : '',
                           ]"
                           style="text-align: left"
-                          @click.stop="viewNotes($event, item.wordsList[pIndex + 1].pinyin)"
                           >{{ item.wordsList[pIndex + 1].pinyin }}</span
                         >
                       </span>
@@ -227,12 +223,6 @@
                               : '',
                           ]"
                           style="text-align: left"
-                          @click.stop="
-                              viewNotes(
-                                $event,
-                                item.wordsList[pIndex + 2].pinyin
-                              )
-                            "
                           >{{ item.wordsList[pIndex + 2].pinyin }}</span
                         >
                         <span
@@ -259,12 +249,6 @@
                               ? 'wordActive'
                               : '',
                           ]"
-                          @click.stop="
-                              viewNotes(
-                                $event,
-                                item.wordsList[pIndex + 2].chs
-                              )
-                            "
                           >{{ NumberList.indexOf(
                                 item.wordsList[pIndex + 2].pinyin
                               ) == -1
@@ -283,12 +267,6 @@
                               : '',
                           ]"
                           style="text-align: left"
-                          @click.stop="
-                              viewNotes(
-                                $event,
-                                item.wordsList[pIndex + 2].pinyin
-                              )
-                            "
                           >{{ item.wordsList[pIndex + 2].pinyin }}</span
                         >
                       </span>
@@ -302,7 +280,6 @@
                           pItem.className ? pItem.className : '',
                           noFont.indexOf(pItem.pinyin) > -1 ? 'noFont' : '',
                         ]"
-                        @click.stop="viewNotes($event, pItem.pinyin)"
                         >{{ pItem.pinyin }}</span
                       >
                       <span
@@ -314,7 +291,7 @@
                           curTime <= item.timeList[pItem.sentIndex].ed
                             ? 'active'
                             : '',
-                          pItem.chs != '“' && pItem.padding ? 'padding' : '',
+                          pItem.chs != '“' && pItem.padding && config.isShowPY ? 'padding' : '',
                           pItem.paraIndex == paraIndex &&
                           pItem.sentIndex == sentIndex
                             ? 'overActive'
@@ -334,7 +311,6 @@
                                 ? 'wordActive'
                                 : '',
                             ]"
-                            @click.stop="viewNotes($event, pItem.chs[wIndex])"
                             >{{  NumberList.indexOf(pItem.pinyin) == -1
                                   ? pItem.chs[wIndex]
                                   : "" }}</span
@@ -349,7 +325,6 @@
                           pItem.className ? pItem.className : '',
                           noFont.indexOf(pItem.pinyin) > -1 ? 'noFont' : '',
                         ]"
-                        @click.stop="viewNotes($event, pItem.pinyin)"
                         >{{ pItem.pinyin }}</span
                       >
                     </template>
@@ -501,20 +476,23 @@ export default {
       let dhaspinyin = false; // 每段是否有拼音
       curQue.detail.forEach((dItem, dIndex) => {
         dhaspinyin = false
-        let paraArr = [
-          {
-            pinyin: "",
-            chs: "",
-            width: 20,
-            height: 20,
-          },
-          {
-            width: 20,
-            height: 20,
-            pinyin: "",
-            chs: "",
-          },
-        ];
+        let paraArr = []
+        if(!dItem.isTitle){
+           paraArr = [
+            {
+                pinyin: "",
+                chs: "",
+                width: 20,
+                height: 20,
+            },
+            {
+                width: 20,
+                height: 20,
+                pinyin: "",
+                chs: "",
+            },
+          ]; 
+        }
         dItem.wordsList.forEach((sItem, sIndex) => {
           let sentArr = [];
           sItem.forEach((wItem, wIndex) => {
@@ -636,37 +614,6 @@ export default {
       this.paraIndex = -1;
       this.sentIndex = -1;
     },
-    viewNotes(e, noteNum) {
-      let _this = this;
-      let noteIndex = "";
-      if (_this.NumberList.indexOf(noteNum) > -1) {
-        for (let i = 0; i < _this.NumberList.length; i++) {
-          if (_this.NumberList[i] == noteNum) {
-            noteIndex = "" + i + "";
-            break;
-          }
-        }
-      }
-      this.showNoteDetail(e, noteIndex);
-    },
-    showNoteDetail(e, noteNum) {
-      let _this = this;
-      if (_this.oldNoteNum != noteNum) {
-        this.isNoteShow = false;
-        setTimeout(() => {
-          _this.noteNum = noteNum;
-        }, 50);
-      }
-      _this.clientY = e.clientY;
-      let left = e.clientX;
-      let width = 642;
-
-      if (left - this.bodyLeft > this.contentWidth / 2) {
-        _this.left = left - width + 10;
-      } else {
-        _this.left = left - 200;
-      }
-    },
     // 处理分词数据
     handleNote(val) {
       let _this = this;
@@ -865,7 +812,7 @@ export default {
 
     .wordsList-box {
       width: 100%;
-      padding: 6px 24px 6px 24px;
+      padding: 6px 24px 12px 24px;
       > div {
         clear: both;
         overflow: hidden;

src/components/Adult/preview/ArticleViewChs/PhraseModelChs.vue

@@ -4,7 +4,7 @@
     <div class="aduioLine-box aduioLine-practice-npc" v-if="
             curQue.mp3_list &&
             curQue.mp3_list.length > 0 &&
-            curQue.mp3_list[0].id
+            curQue.mp3_list[0].id || config.isHasPY || config.isHasEN
           ">
       <div class="aduioLine-content">
         <template
@@ -28,10 +28,12 @@
         <span
           :class="['pinyin-16', config.isShowPY ? '' : 'disabled']"
           @click="changePinyin"
+          v-if="config.isHasPY"
         ></span>
         <span
           :class="['EN-16', config.isShowEN ? '' : 'disabled']"
           @click="changeEN"
+          v-if="config.isHasEN"
         ></span>
       </div>
     </div>
@@ -235,7 +237,7 @@
                       <span
                         class="NNPE-chs"
                         :class="[
-                          pItem.chs != '“' && pItem.padding ? 'padding' : '',
+                          pItem.chs != '“' && pItem.padding && config.isShowPY ? 'padding' : '',
                           newWordList.indexOf(pItem.chs) > -1 ? 'active' : '',
                         ]"
                         @click.stop="viewNotes($event, pItem.chs)"

src/components/Adult/preview/ArticleViewChs/WordModelChs.vue

@@ -207,7 +207,7 @@
                           curTime <= item.timeList[pItem.sentIndex].ed
                             ? 'active'
                             : '',
-                          pItem.chs != '“' && pItem.padding ? 'padding' : '',
+                          pItem.chs != '“' && pItem.padding && config.isShowPY ? 'padding' : '',
                         ]"
                         >{{ pItem.chs }}</span
                       >

src/components/Adult/preview/DialogueArticleViewChs/NormalModelChs.vue

@@ -135,7 +135,6 @@
                               pItem.className ? pItem.className : '',
                               noFont.indexOf(pItem.pinyin) > -1 ? 'noFont' : '',
                             ]"
-                            @click.stop="viewNotes($event, pItem.pinyin)"
                             >{{ pItem.pinyin }}</span
                           >
                           <span class="NNPE-chs">
@@ -152,9 +151,6 @@
                                     ? 'wordActive'
                                     : '',
                                 ]"
-                                @click.stop="
-                                  viewNotes($event, pItem.chs[wIndex])
-                                "
                                 >{{
                                   NumberList.indexOf(pItem.pinyin) == -1
                                     ? pItem.chs[wIndex]
@@ -174,7 +170,6 @@
                               pItem.className ? pItem.className : '',
                               noFont.indexOf(pItem.pinyin) > -1 ? 'noFont' : '',
                             ]"
-                            @click.stop="viewNotes($event, pItem.pinyin)"
                             >{{ pItem.pinyin }}</span
                           >
                         </span>
@@ -193,12 +188,6 @@
                                 ? 'noFont'
                                 : '',
                             ]"
-                            @click.stop="
-                              viewNotes(
-                                $event,
-                                item.wordsList[pIndex + 1].pinyin
-                              )
-                            "
                             style="text-align: left"
                             >{{ item.wordsList[pIndex + 1].pinyin }}</span
                           >
@@ -216,9 +205,6 @@
                                 ? 'wordActive'
                                 : '',
                             ]"
-                            @click.stop="
-                              viewNotes($event, item.wordsList[pIndex + 1].chs)
-                            "
                             >{{
                               NumberList.indexOf(
                                 item.wordsList[pIndex + 1].pinyin
@@ -241,12 +227,6 @@
                                 ? 'noFont'
                                 : '',
                             ]"
-                            @click.stop="
-                              viewNotes(
-                                $event,
-                                item.wordsList[pIndex + 1].pinyin
-                              )
-                            "
                             style="text-align: left"
                             >{{ item.wordsList[pIndex + 1].pinyin }}</span
                           >
@@ -277,12 +257,6 @@
                                 ? 'noFont'
                                 : '',
                             ]"
-                            @click.stop="
-                              viewNotes(
-                                $event,
-                                item.wordsList[pIndex + 2].pinyin
-                              )
-                            "
                             style="text-align: left"
                             >{{ item.wordsList[pIndex + 2].pinyin }}</span
                           >
@@ -299,9 +273,6 @@
                                 ? 'wordActive'
                                 : '',
                             ]"
-                            @click.stop="
-                              viewNotes($event, item.wordsList[pIndex + 2].chs)
-                            "
                             >{{
                               NumberList.indexOf(
                                 item.wordsList[pIndex + 2].pinyin
@@ -324,12 +295,6 @@
                                 ? 'noFont'
                                 : '',
                             ]"
-                            @click.stop="
-                              viewNotes(
-                                $event,
-                                item.wordsList[pIndex + 2].pinyin
-                              )
-                            "
                             style="text-align: left"
                             >{{ item.wordsList[pIndex + 2].pinyin }}</span
                           >
@@ -348,7 +313,6 @@
                             pItem.className ? pItem.className : '',
                             noFont.indexOf(pItem.pinyin) > -1 ? 'noFont' : '',
                           ]"
-                          @click.stop="viewNotes($event, pItem.pinyin)"
                           >{{ pItem.pinyin }}</span
                         >
 
@@ -356,7 +320,7 @@
                           v-if="pItem.chs != '#'"
                           class="NNPE-chs"
                           :class="[
-                            pItem.chs != '“' && pItem.padding ? 'padding' : '',
+                            pItem.chs != '“' && pItem.padding && config.isShowPY ? 'padding' : '',
                           ]"
                         >
                           <template>
@@ -372,7 +336,6 @@
                                   ? 'wordActive'
                                   : '',
                               ]"
-                              @click.stop="viewNotes($event, pItem.chs[wIndex])"
                               >{{
                                 NumberList.indexOf(pItem.pinyin) == -1
                                   ? pItem.chs[wIndex]
@@ -393,7 +356,6 @@
                             pItem.className ? pItem.className : '',
                             noFont.indexOf(pItem.pinyin) > -1 ? 'noFont' : '',
                           ]"
-                          @click.stop="viewNotes($event, pItem.pinyin)"
                           >{{ pItem.pinyin }}</span
                         >
                       </template>
@@ -776,37 +738,6 @@ export default {
     emptyEd() {
       this.ed = undefined;
     },
-    viewNotes(e, noteNum) {
-      let _this = this;
-      let noteIndex = "";
-      if (_this.NumberList.indexOf(noteNum) > -1) {
-        for (let i = 0; i < _this.NumberList.length; i++) {
-          if (_this.NumberList[i] == noteNum) {
-            noteIndex = "" + i + "";
-            break;
-          }
-        }
-      }
-      this.showNoteDetail(e, noteIndex);
-    },
-    showNoteDetail(e, noteNum) {
-      let _this = this;
-      if (_this.oldNoteNum != noteNum) {
-        this.isNoteShow = false;
-        setTimeout(() => {
-          _this.noteNum = noteNum;
-        }, 50);
-      }
-      _this.clientY = e.clientY;
-      let left = e.clientX;
-      let width = 642;
-
-      if (left - this.bodyLeft > this.contentWidth / 2) {
-        _this.left = left - width + 10;
-      } else {
-        _this.left = left - 200;
-      }
-    },
     // 处理分词数据
     handleNote(val) {
       let _this = this;

src/components/Adult/preview/DialogueArticleViewChs/PhraseModelChs.vue

@@ -310,7 +310,7 @@
                             newWordList.indexOf(pItem.chs) > -1
                               ? 'newActive'
                               : '',
-                            pItem.chs != '“' && pItem.padding ? 'padding' : '',
+                            pItem.chs != '“' && pItem.padding && config.isShowPY ? 'padding' : '',
                           ]"
                           @click.stop="viewNotes($event, pItem.chs)"
                           >{{

src/components/Adult/preview/DialogueArticleViewChs/WordModelChs.vue

@@ -232,7 +232,7 @@
                           v-if="pItem.chs != '#'"
                           class="NNPE-chs"
                           :class="[
-                            pItem.chs != '“' && pItem.padding ? 'padding' : '',
+                            pItem.chs != '“' && pItem.padding && config.isShowPY ? 'padding' : '',
                             paraIndex == pItem.paraIndex &&
                             sentIndex == pItem.sentIndex &&
                             wordIndex == pItem.wordIndex

src/components/Adult/preview/HeaderSparate/index.vue

@@ -77,7 +77,7 @@
                               curQue.Bookanswer[i].content[j].answer.trim())
                       "
                       type="textarea"
-                      :placeholder="`${isAnswerMode ? '' : '输入'}`"
+                      :placeholder="`${isAnswerMode ? '' : ''}`"
                       :disabled="isAnswerMode"
                       :autosize="{ minRows: 1, maxRows: 6 }"
                       @input="enterAnswer(i, j, 'input')"

src/components/Adult/preview/InputHasRecord.vue

@@ -124,7 +124,7 @@
             type="textarea"
             v-model="items.answer"
             @blur="items.answer = items.answer.trim()"
-            placeholder="输入"
+            placeholder=""
             maxlength="200"
             :readonly="TaskModel == 'ANSWER'"
             @input="forupdata"
@@ -305,7 +305,7 @@
                     curQue.Bookanswer[indexs].answer =
                       curQue.Bookanswer[indexs].answer.trim()
                   "
-                  placeholder="输入"
+                  placeholder=""
                   maxlength="200"
                   :readonly="TaskModel == 'ANSWER'"
                   @input="forupdata"
@@ -460,7 +460,7 @@
                 curQue.Bookanswer[indexs].answer =
                   curQue.Bookanswer[indexs].answer.trim()
               "
-              placeholder="输入"
+              placeholder=""
               maxlength="200"
               :readonly="TaskModel == 'ANSWER'"
               @input="forupdata"

src/components/Adult/preview/Picture.vue

@@ -65,7 +65,7 @@
         <template v-if="judgeAnswer == 'standardAnswer'">
           <input
             v-model="curQue.correct[0].input[0]"
-            placeholder="输入"
+            placeholder=""
             @blur="handleInput('input', 0)"
             :readonly="TaskModel == 'ANSWER'"
             maxlength="200"
@@ -75,7 +75,7 @@
         <template v-else>
           <input
             v-model="curQue.Bookanswer[0].input.input[0].value"
-            placeholder="输入"
+            placeholder=""
             @blur="handleInput('input', 0)"
             :readonly="TaskModel == 'ANSWER'"
             maxlength="200"
@@ -91,7 +91,7 @@
           <template v-if="judgeAnswer == 'standardAnswer'">
             <input
               v-model="curQue.correct[0].input[0]"
-              placeholder="输入"
+              placeholder=""
               @blur="handleInput('input', 0)"
               :readonly="true"
               maxlength="200"
@@ -101,7 +101,7 @@
           <template v-else>
             <input
               v-model="curQue.Bookanswer[0].input.input[0].value"
-              placeholder="输入"
+              placeholder=""
               @blur="handleInput('input', 0)"
               :readonly="TaskModel == 'ANSWER'"
               maxlength="200"
@@ -115,14 +115,14 @@
         <div class="DoubleInput-box">
           <template v-if="judgeAnswer == 'standardAnswer'">
             <input
-              placeholder="输入"
+              placeholder=""
               v-model="curQue.correct[0].input[0]"
               :readonly="true"
               maxlength="200"
               :class="inputAnswerClass('input', 0)"
             />
             <input
-              placeholder="输入"
+              placeholder=""
               v-model="curQue.correct[0].input[1]"
               :readonly="true"
               maxlength="200"
@@ -131,7 +131,7 @@
           </template>
           <template v-else>
             <input
-              placeholder="输入"
+              placeholder=""
               @blur="handleInput('input', 0)"
               v-model="curQue.Bookanswer[0].input.input[0].value"
               :readonly="TaskModel == 'ANSWER'"
@@ -139,7 +139,7 @@
               :class="inputAnswerClass('input', 0)"
             />
             <input
-              placeholder="输入"
+              placeholder=""
               @blur="handleInput('input', 1)"
               v-model="curQue.Bookanswer[0].input.input[1].value"
               :readonly="TaskModel == 'ANSWER'"

src/components/Adult/preview/SentenceInput.vue

@@ -207,7 +207,7 @@
                 ? items.answer[0]
                 : curQue.Bookanswer[indexs].answer
             "
-            placeholder="输入"
+            placeholder=""
             :readonly="TaskModel == 'ANSWER'"
             @change="changeuserAnswerJudge(indexs)"
           />

src/components/Adult/preview/TableView.vue

@@ -28,7 +28,7 @@
                 <el-input
                     type="textarea"
                     autosize
-                    placeholder="输入"
+                    placeholder=""
                     v-model="curQue.Bookanswer.curCorrect[rowIndex][colIndex]"
                     :readonly="TaskModel=='ANSWER'"
                     maxlength="200">

src/components/Adult/preview/TextInputRecord.vue

@@ -79,7 +79,7 @@
               : curQue.Bookanswer[indexs].answer
           "
           @keyup.enter="handleReplaceTone($event, indexs)"
-          placeholder="输入"
+          placeholder=""
           maxlength="200"
           :readonly="TaskModel == 'ANSWER'"
           @change="changeuserAnswerJudge(indexs)"

src/views/courseList.vue

@@ -866,7 +866,8 @@ export default {
           } else {
             MethodName = "book-book_manager-AddBook";
           }
-          this.formDialog.publish_status = 1;
+        //   this.formDialog.publish_status = 1;
+          this.formDialog.publish_status = this.tableData[this.rowIndex].publish_status ? this.tableData[this.rowIndex].publish_status : 0
           let data = JSON.parse(JSON.stringify(_this.formDialog));
           getContent(MethodName, data)
             .then(res => {