Merge branch 'NPC-lhd'

src/components/Adult/preview/SentenceSortQP.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="Big-Book-prev-Textdes sentenceSort" v-if="curQue">
     <h2>{{ curQue.title }}</h2>
-    <div class="item-box" v-for="(item, index) in curQue.option" :key="index">
+    <div class="item-box" v-for="(item, index) in curQue.Bookanswer" :key="index">
       <div class="item-right">
         <b>{{ index + 1 }}</b>
         <draggable
@@ -14,6 +14,7 @@
           :options="{
             group: { name: 'itxst' + index, pull: 'clone' },
           }"
+          :sort="TaskModel=='ANSWER'?'false':'true'"
           class="content-box"
         >
           <transition-group>
@@ -39,64 +40,11 @@
         <div class="fw">
           <span
             class="fw-btn"
+            :class="[!TaskModel||TaskModel!='ANSWER'?'sure-active':'']"
             @click="removeCurrentSortArr(item, index)"
           ></span>
         </div>
       </div>
-      <div class="item-right_bottom" v-if="1 == 2">
-        <!-- 
-                :style="{
-          width:
-            item.detail.wordsList.length * 82 +
-            item.detail.wordsList.length * 2 +
-            'px',
-        }"
-       -->
-        <!-- 
-          :options="{ group: { name: 'itxst' + index, pull: false } }"
-       -->
-        <draggable
-          v-model="SortArr[index]"
-          :group="'itxst' + index"
-          animation="300"
-          @start="onStart2($event, index)"
-          @end="onEnd2($event, index)"
-          :move="onMove"
-        >
-          <transition-group
-            :style="{
-              display: SortArr[index].length > 0 ? '-webkit-box' : 'flex',
-            }"
-          >
-            <div
-              class="item"
-              v-for="(itemNode, indexNode) in SortArr[index]"
-              :key="indexNode"
-            >
-              <p v-if="itemNode.pinyin">
-                {{ itemNode.pinyin }}
-              </p>
-              <p v-if="itemNode.chs">
-                {{ itemNode.chs }}
-              </p>
-            </div>
-          </transition-group>
-        </draggable>
-        <div class="fw">
-          <img
-            v-if="SortArr[index].length > 0"
-            src="../../../assets/NPC/fw.png"
-            alt=""
-            @click="removeCurrentSortArr(index)"
-          />
-          <img
-            @click="NOremove"
-            v-else
-            src="../../../assets/NPC/fw-no.png"
-            alt=""
-          />
-        </div>
-      </div>
     </div>
   </div>
 </template>
@@ -105,7 +53,7 @@
 import draggable from "vuedraggable";
 export default {
   components: { draggable },
-  props: ["curQue"],
+  props: ["curQue","TaskModel"],
   data() {
     return {
       userList: [],
@@ -227,6 +175,9 @@ export default {
       });
     });
     this.orgData = JSON.parse(JSON.stringify(this.curQue.option));
+    if (!this.curQue.Bookanswer) {
+        this.$set(this.curQue, "Bookanswer", JSON.parse(JSON.stringify(this.curQue.option)));
+    }
   },
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {},
@@ -291,7 +242,7 @@ export default {
       background: url("../../../assets/NPC/fw-no.png") no-repeat left top;
       background-size: 100% 100%;
       cursor: pointer;
-      &:hover {
+      &.sure-active:hover {
         background: url("../../../assets/NPC/fw.png") no-repeat left top;
         background-size: 100% 100%;
       }

src/components/Adult/preview/Soundrecord.vue

@@ -3,7 +3,7 @@
   <div class="NNPE-Book-record">
     <template v-if="(type && type == 'normal') || (type && type == 'mini')">
       <div
-        :class="['record', microphoneStatus ? 'active' : '', !this.TaskModel||this.TaskModel!='ANSWER'?'':'notAllow']"
+        :class="['record', microphoneStatus ? 'active' : '', !TaskModel||TaskModel!='ANSWER'?'':'notAllow']"
         @click="microphone"
       />
       <span
@@ -30,7 +30,7 @@
     </template>
     <template v-else-if="type && type == 'pro'">
       <div
-        :class="['record', microphoneStatus ? 'active' : '', !this.TaskModel||this.TaskModel!='ANSWER'?'':'notAllow']"
+        :class="['record', microphoneStatus ? 'active' : '', !TaskModel||TaskModel!='ANSWER'?'':'notAllow']"
         @click="microphone"
       />
       <el-select
@@ -57,13 +57,13 @@
         "
       />
       <a
-        :class="['record-delete', hasMicro&&(!this.TaskModel||this.TaskModel!='ANSWER') ? 'record-delete-has' : '', !this.TaskModel||this.TaskModel!='ANSWER'?'':'notAllow']"
+        :class="['record-delete', hasMicro&&(!TaskModel||TaskModel!='ANSWER') ? 'record-delete-has' : '', !TaskModel||TaskModel!='ANSWER'?'':'notAllow']"
         @click="handleDelete"
       />
     </template>
     <template v-else>
       <div
-        :class="['record', microphoneStatus ? 'active' : '', !this.TaskModel||this.TaskModel!='ANSWER'?'':'notAllow']"
+        :class="['record', microphoneStatus ? 'active' : '', !TaskModel||TaskModel!='ANSWER'?'':'notAllow']"
         @click="microphone"
       />
       <span
@@ -97,7 +97,7 @@
         "
       />
       <a
-        :class="['record-delete', hasMicro&&(!this.TaskModel||this.TaskModel!='ANSWER') ? 'record-delete-has' : '', !this.TaskModel||this.TaskModel!='ANSWER'?'':'notAllow']"
+        :class="['record-delete', hasMicro&&(!TaskModel||TaskModel!='ANSWER') ? 'record-delete-has' : '', !TaskModel||TaskModel!='ANSWER'?'':'notAllow']"
         @click="handleDelete"
       />
     </template>