Merge branch 'master' into NPC-lhd

src/components/Adult/common/HzModule.vue

@@ -62,6 +62,13 @@
         </div>
       </div>
       <div class="adult-book-input-item">
+        <span class="adult-book-lable">文字位置：</span>
+        <el-radio-group v-model="curQueItem.hanziSite">
+          <el-radio label="top">图片上方</el-radio>
+          <el-radio label="bottom">图片下方下方</el-radio>
+        </el-radio-group>
+      </div>
+      <div class="adult-book-input-item">
         <span class="adult-book-lable">拼音：</span>
         <el-input
           type="textarea"
@@ -71,6 +78,14 @@
           v-model="curQueItem.pinyin"
           @blur="onBlur(curQueItem, 'pinyin')"
         ></el-input>
+        <el-button @click="getPinyin(curQueItem)">生成拼音</el-button>
+      </div>
+      <div class="adult-book-input-item">
+        <span class="adult-book-lable">拼音位置：</span>
+        <el-radio-group v-model="curQueItem.pinyinSite">
+          <el-radio label="top">文字上方</el-radio>
+          <el-radio label="bottom">文字下方</el-radio>
+        </el-radio-group>
       </div>
     </template>
     <div

src/components/Adult/inputModules/Picture.vue

@@ -67,6 +67,8 @@ export default {
             isChecked: "",
             isJudge: "",
             correctInput: "",
+            pinyinSite:"",
+            hanziSite:"",
           },
         ],
         correct: [

src/components/Adult/inputModules/SelfAssessment.vue

@@ -30,7 +30,7 @@
           :type="type"
         />
       </div>
-      <div class="addoption" @click="addOption(toIndex)">添加一个选项</div>
+      <div class="addoption" @click="addOption">添加一个选项</div>
     </div>
   </div>
 </template>
@@ -104,8 +104,8 @@ export default {
     },
     //添加一个选项
     addOption(index) {
-      let obj = JSON.parse(JSON.stringify(this.data_structure[0].option[0]));
-      this.curQue[index].option.push(obj);
+      let obj = JSON.parse(JSON.stringify(this.data_structure.option[0]));
+      this.curQue.option.push(obj);
     },
   },
   //生命周期 - 创建完成（可以访问当前this实例）

src/components/Adult/inputModules/Sentence.vue

@@ -188,7 +188,8 @@ export default {
       });
       if (this.curQue.taskId) {
         let verseList = [];
-        this.curQue.detail.forEach((item) => {
+        this.curQue.detail.forEach((item,i) => {
+          // verseList = verseList.concat(`${i+1}`+item.sentence);
           verseList = verseList.concat(item.sentence);
         });
         if (verseList.length > 0) {

src/components/Adult/inputModules/Sort.vue

@@ -115,8 +115,9 @@ export default {
     //   向上移动
     upMove(opIndex, index) {
       if (this.curQue.option[opIndex].correctWordsList.length < 1) {
-        this.curQue.option[opIndex].correctWordsList =
-          this.curQue.option[opIndex].detail.wordsList;
+        this.curQue.option[opIndex].correctWordsList = JSON.parse(
+          JSON.stringify(this.curQue.option[opIndex].detail.wordsList)
+        );
       }
       if (index > 0) {
         let obj = this.curQue.option[opIndex].detail.wordsList[index - 1];
@@ -132,8 +133,9 @@ export default {
     // 向下移动
     downMove(opIndex, index) {
       if (this.curQue.option[opIndex].correctWordsList.length < 1) {
-        this.curQue.option[opIndex].correctWordsList =
-          this.curQue.option[opIndex].detail.wordsList;
+        this.curQue.option[opIndex].correctWordsList = JSON.parse(
+          JSON.stringify(this.curQue.option[opIndex].detail.wordsList)
+        );
       }
       if (index + 1 >= this.curQue.option[opIndex].detail.wordsList.length) {
         this.$message.warning("当前已经是最后一个");