Merge branch 'master' into NPC-lhd

src/views/adultInput.vue

@@ -366,7 +366,10 @@
                   />
                 </template>
                 <template v-if="topicIitem.type === 'header_separate'">
-                  <header-separate :cur-que="topicIitem.data" :change-cur-que="changeCurQue" />
+                  <header-separate
+                    :cur-que="topicIitem.data"
+                    :change-cur-que="changeCurQue"
+                  />
                 </template>
                 <template v-if="topicIitem.type === 'fill_drag'">
                   <fill-drag
@@ -836,7 +839,7 @@ import DialogueAnswerChs from "@/components/Adult/inputModules/DialogueAnswerChs
 import VoiceMatrix from "@/components/Adult/inputModules/VoiceMatrix.vue";
 import SelectDrag from "@/components/Adult/inputModules/SelectDrag.vue";
 import ConfigurableTable from "@/components/Adult/inputModules/ConfigurableTable/index.vue";
-import HeaderSeparate from '@/components/Adult/inputModules/HeaderSeparate/index.vue';
+import HeaderSeparate from "@/components/Adult/inputModules/HeaderSeparate/index.vue";
 import FillDrag from "@/components/Adult/inputModules/FillDrag.vue";
 import ImageQuestion from "@/components/Adult/inputModules/ImageQuestion.vue";
 import PurePreview from "@/components/Adult/inputModules/PurePreview.vue";
@@ -1480,18 +1483,31 @@ export default {
                 sentence_list_mp = sentence_list_mp.concat(obj.res); // 句子+分词数组
               });
             } else if (topicIitem.type == "NewWord_chs") {
+              let audio_file_id = "";
+              audio_file_id =
+                topicIitem.data.mp3_list && topicIitem.data.mp3_list.length > 0
+                  ? topicIitem.data.mp3_list[0].id
+                      .replace("[FID##", "")
+                      .replace("##FID]", "")
+                  : "";
+
               topicIitem.data.option.forEach((item) => {
                 item.map((sItem) => {
-                  sItem.audio_file_id = "";
-                  if (sItem.mp3_list && sItem.mp3_list.length > 0) {
-                    sItem.audio_file_id = sItem.mp3_list[0].id
-                      .replace("[FID##", "")
-                      .replace("##FID]", "");
-                  }
-                  sItem.audio_begin_time = 0;
-                  sItem.audio_end_time = 0;
+                  sItem.audio_file_id = audio_file_id;
+                  sItem.audio_begin_time =
+                    topicIitem.data.wordTime &&
+                    topicIitem.data.wordTime[sItem.sIndex]
+                      ? Number(topicIitem.data.wordTime[sItem.sIndex].bg)
+                      : 0;
+                  sItem.audio_end_time =
+                    topicIitem.data.wordTime &&
+                    topicIitem.data.wordTime[sItem.sIndex]
+                      ? Number(topicIitem.data.wordTime[sItem.sIndex].ed)
+                      : 0;
                   return sItem;
                 });
+
+                console.log(item);
                 new_word_list = new_word_list.concat(item);
               });
             }
@@ -1683,7 +1699,7 @@ export default {
       // }
     },
     emptyQustion() {
-        this.currentTreeID = ''
+      this.currentTreeID = "";
     },
   }, // 如果页面有keep-alive缓存功能，这个函数会触发
 };

vue.config.js

@@ -43,8 +43,8 @@ module.exports = {
       // change xxx-api/login => mock/login
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        //target: `https://gcls.utschool.cn/`,
-        target: `https://gcls.helxsoft.cn/`,
+        target: `https://gcls.utschool.cn/`,
+        //target: `https://gcls.helxsoft.cn/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''