Merge branch 'NPC-lhd'

src/components/Adult/preview/EditDiv.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="edit-div"
          v-html="innerText"
-         :contenteditable="TaskModel=='ANSWER'?'false':'true'"
+         :contenteditable="canEdit"
          @focus="isLocked = true"
          @blur="isLocked = false"
          @input="changeText"
@@ -16,9 +16,9 @@ export default {
                 type: String,
                 default: ''
             },
-            TaskModel: {
-                type: String,
-                default: ''
+            canEdit: {
+                type: Boolean,
+                default: true
             }
         },
         data(){

src/components/Adult/preview/SentenceInput.vue

@@ -104,7 +104,7 @@
                   </p>
                 </template>
                 <template v-if="conent.chs.indexOf('__')>-1">
-                  <EditDiv class="input chs" v-model='curQue.Bookanswer[indexs].answerList[items.detail.resArr[conIndex].inputNumber].chs' :TaskModel="TaskModel"></EditDiv>
+                  <EditDiv class="input chs" v-model='curQue.Bookanswer[indexs].answerList[items.detail.resArr[conIndex].inputNumber].chs' :canEdit="TaskModel=='ANSWER'?false:true"></EditDiv>
                   <!-- <el-input
                     class="input chs"
                     type="textarea"