guanchunjie 3 years ago
parent
commit
ce73f7cc75

+ 1 - 1
src/components/Adult/common/AudioControlModule.vue

@@ -86,7 +86,7 @@ export default {
           const obj = {
             name: item.name,
             url: item.response.file_info_list[0].file_url,
-            id: "[FID##" + item.response.file_info_list[0].file_id + "#FID]",
+            id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
             media_duration: item.response.file_info_list[0].media_duration, //音频时长
           };
           articleImgRes.push(obj);

+ 1 - 1
src/components/Adult/common/DialogueModule.vue

@@ -182,7 +182,7 @@ export default {
           const obj = {
             name: item.name,
             url: item.response.file_info_list[0].file_url,
-            id: "[FID##" + item.response.file_info_list[0].file_id + "#FID]",
+            id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
             media_duration: item.response.file_info_list[0].media_duration, //音频时长
           };
           articleImgRes.push(obj);

+ 2 - 1
src/components/Adult/common/HzModule.vue

@@ -205,7 +205,8 @@ export default {
           const obj = {
             name: item.name,
             url: item.response.file_info_list[0].file_url,
-            id: "[FID##" + item.response.file_info_list[0].file_id + "#FID]",
+            id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
+
             media_duration: item.response.file_info_list[0].media_duration, //音频时长
           };
           articleImgRes.push(obj);

+ 1 - 1
src/components/Adult/common/Inputmodule.vue

@@ -102,7 +102,7 @@ export default {
           const obj = {
             name: item.name,
             url: item.response.file_info_list[0].file_url,
-            id: "[FID##" + item.response.file_info_list[0].file_id + "#FID]",
+            id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
             media_duration: item.response.file_info_list[0].media_duration, //音频时长
           };
           articleImgRes.push(obj);

+ 3 - 2
src/components/Adult/common/JudgeModule.vue

@@ -155,7 +155,8 @@ export default {
           const obj = {
             name: item.name,
             url: item.response.file_info_list[0].file_url,
-            id: "[FID##" + item.response.file_info_list[0].file_id + "#FID]",
+            id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
+
             media_duration: item.response.file_info_list[0].media_duration, //音频时长
           };
           articleImgRes.push(obj);
@@ -173,7 +174,7 @@ export default {
           const obj = {
             name: item.name,
             url: item.response.file_info_list[0].file_url,
-            id: "[FID##" + item.response.file_info_list[0].file_id + "#FID]",
+            id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
           };
           articleImgRes.push(obj);
         }

+ 3 - 2
src/components/Adult/common/LigatureModule.vue

@@ -172,7 +172,8 @@ export default {
           const obj = {
             name: item.name,
             url: item.response.file_info_list[0].file_url,
-            id: "[FID##" + item.response.file_info_list[0].file_id + "#FID]",
+            id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
+
             media_duration: item.response.file_info_list[0].media_duration, //音频时长
           };
           articleImgRes.push(obj);
@@ -190,7 +191,7 @@ export default {
           const obj = {
             name: item.name,
             url: item.response.file_info_list[0].file_url,
-            id: "[FID##" + item.response.file_info_list[0].file_id + "#FID]",
+            id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
           };
           articleImgRes.push(obj);
         }

+ 2 - 1
src/components/Adult/common/NewordPhraseModule.vue

@@ -146,7 +146,8 @@ export default {
           const obj = {
             name: item.name,
             url: item.response.file_info_list[0].file_url,
-            id: "[FID##" + item.response.file_info_list[0].file_id + "#FID]",
+            id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
+
             media_duration: item.response.file_info_list[0].media_duration,
             file_relative_path:
               item.response.file_info_list[0].file_relative_path,

+ 3 - 2
src/components/Adult/common/RecordModule.vue

@@ -120,7 +120,8 @@ export default {
           const obj = {
             name: item.name,
             url: item.response.file_info_list[0].file_url,
-            id: "[FID##" + item.response.file_info_list[0].file_id + "#FID]",
+            id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
+
             media_duration: item.response.file_info_list[0].media_duration, //音频时长
           };
           articleImgRes.push(obj);
@@ -137,7 +138,7 @@ export default {
           const obj = {
             name: item.name,
             url: item.response.file_info_list[0].file_url,
-            id: "[FID##" + item.response.file_info_list[0].file_id + "#FID]",
+            id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
           };
           articleImgRes.push(obj);
         }

+ 2 - 1
src/components/Adult/common/SentenceModule.vue

@@ -164,7 +164,8 @@ export default {
           const obj = {
             name: item.name,
             url: item.response.file_info_list[0].file_url,
-            id: "[FID##" + item.response.file_info_list[0].file_id + "#FID]",
+            id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
+
             media_duration: item.response.file_info_list[0].media_duration, //音频时长
           };
           articleImgRes.push(obj);

+ 3 - 2
src/components/Adult/common/SingleModule.vue

@@ -159,7 +159,8 @@ export default {
           const obj = {
             name: item.name,
             url: item.response.file_info_list[0].file_url,
-            id: "[FID##" + item.response.file_info_list[0].file_id + "#FID]",
+            id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
+
             media_duration: item.response.file_info_list[0].media_duration, //音频时长
           };
           articleImgRes.push(obj);
@@ -177,7 +178,7 @@ export default {
           const obj = {
             name: item.name,
             url: item.response.file_info_list[0].file_url,
-            id: "[FID##" + item.response.file_info_list[0].file_id + "#FID]",
+            id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
           };
           articleImgRes.push(obj);
         }

+ 4 - 2
src/components/Adult/inputModules/ArticleTemChs/index.vue

@@ -2949,7 +2949,8 @@ export default {
             name: item.name,
             duration: item.response.file_info_list[0].media_duration,
             url: item.response.file_info_list[0].file_url,
-            id: "[FID##" + item.response.file_info_list[0].file_id + "#FID]",
+            id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
+
             media_duration: item.response.file_info_list[0].media_duration, //音频时长
           };
           articleImgRes.push(obj);
@@ -2964,7 +2965,8 @@ export default {
         const obj = {
           name: file.name,
           url: file.response.file_info_list[0].file_url,
-          id: "[FID##" + file.response.file_info_list[0].file_id + "#FID]",
+          id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
+
           imgNumber: 0,
         };
         this.curQue.img_list.push(obj);

+ 1 - 1
src/components/Adult/inputModules/BgControl.vue

@@ -45,7 +45,7 @@ export default {
           const obj = {
             name: item.name,
             url: item.response.file_info_list[0].file_url,
-            id: "[FID##" + item.response.file_info_list[0].file_id + "#FID]",
+            id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
           };
           articleImgRes.push(obj);
         }

+ 1 - 1
src/components/Adult/inputModules/DialogueArticleChs/components/RoleChs.vue

@@ -136,7 +136,7 @@ export default {
           const obj = {
             name: item.name,
             url: item.response.file_info_list[0].file_url,
-            id: "[FID##" + item.response.file_info_list[0].file_id + "#FID]",
+            id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
           };
           articleImgRes.push(obj);
         }

+ 7 - 1
src/components/Adult/inputModules/DialogueArticleChs/index.vue

@@ -2963,7 +2963,8 @@ export default {
             name: item.name,
             duration: item.response.file_info_list[0].media_duration,
             url: item.response.file_info_list[0].file_url,
-            id: "[FID##" + item.response.file_info_list[0].file_id + "#FID]",
+            id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
+
             media_duration: item.response.file_info_list[0].media_duration, //音频时长
           };
           articleImgRes.push(obj);
@@ -2978,7 +2979,12 @@ export default {
         const obj = {
           name: file.name,
           url: file.response.file_info_list[0].file_url,
+<<<<<<< HEAD
           id: "[FID##" + file.response.file_info_list[0].file_id + "#FID]",
+=======
+          id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
+
+>>>>>>> 6e72e8d0f6995078b984890e566c87a283c19789
           imgNumber: 0,
         };
         this.curQue.img_list.push(obj);

+ 65 - 68
src/components/Adult/inputModules/Ligature.vue

@@ -90,74 +90,71 @@ export default {
           mp3_url: [],
         },
       },
-      data_structure: {
-        type: "ligature",
-        name: "连线",
-        title: "",
-        optionTitle: "",
-        conTitle: "",
-        con: [
-          {
-            hanzi: "",
-            pinyin: "",
-            Number: "",
-            mp3_list: [],
-            img_list: [],
-            definition_list: [],
-            Answer: "",
-            isAnswer: "",
-            isChecked: "",
-            judge: "",
-            correctInput: "",
-            AnswerList: [],
-          },
-          {
-            hanzi: "",
-            pinyin: "",
-            Number: "",
-            mp3_list: [],
-            img_list: [],
-            definition_list: [],
-            Answer: "",
-            isAnswer: "",
-            isChecked: "",
-            judge: "",
-            correctInput: "",
-            AnswerList: [],
-          },
-        ],
-        option: [
-          {
-            hanzi: "",
-            pinyin: "",
-            mp3_list: [],
-            img_list: [],
-            definition_list: [],
-            Answer: "",
-            isAnswer: "",
-            isChecked: "",
-            judge: "",
-            correctInput: "",
-          },
-          {
-            hanzi: "",
-            pinyin: "",
-            mp3_list: [],
-            img_list: [],
-            definition_list: [],
-            Answer: "",
-            isAnswer: "",
-            isChecked: "",
-            judge: "",
-            correctInput: "",
-          },
-        ],
-        correct: [
-          {
-            input: ["", ""],
-          },
-        ],
-      },
+        data_structure: {
+            type: 'ligature_chs',
+            name: "连线",
+            title: "",
+            con: [{
+                    hanzi: '',
+                    Number: '',
+                    mp3_list: [],
+                    img_list: [],
+                    definition_list: [],
+                    Answer: "",
+                    isAnswer: '',
+                    isChecked: '',
+                    judge: '',
+                    correctInput: '',
+                    AnswerList: [],
+                },
+                {
+                    hanzi: '',
+                    Number: '',
+                    mp3_list: [],
+                    img_list: [],
+                    definition_list: [],
+                    Answer: "",
+                    isAnswer: '',
+                    isChecked: '',
+                    judge: '',
+                    correctInput: '',
+                    AnswerList: [],
+
+                },
+            ],
+            option: [{
+                    roleName: "",
+                    site: "left",
+                    hanzi: '',
+                    pinyin: '',
+                    mp3_list: [],
+                    img_list: [],
+                    definition_list: [],
+                    Answer: "",
+                    isAnswer: '',
+                    isChecked: '',
+                    judge: '',
+                    correctInput: ''
+                },
+                {
+                    roleName: "",
+                    site: "left",
+                    hanzi: '',
+                    pinyin: '',
+                    mp3_list: [],
+                    img_list: [],
+                    definition_list: [],
+                    Answer: "",
+                    isAnswer: '',
+                    isChecked: '',
+                    judge: '',
+                    correctInput: ''
+                },
+            ],
+            correct: [{
+                input: ["", ""],
+            }]
+        },
     };
   },
   computed: {},

+ 10 - 8
src/components/Adult/inputModules/ToneSelect.vue

@@ -71,6 +71,7 @@
             :datafileList="curQueItem.mp3_list"
             :filleNumber="mp3Number"
             :uploadType="'mp3'"
+            :index="index"
           />
         </div>
       </div>
@@ -156,8 +157,9 @@ export default {
         skin_url: "/tinymce/skins/ui/oxide",
         height: 150,
         width: 500,
-        // plugins: "",
-        toolbar: "bold",
+        plugins:
+          "link lists image code table colorpicker textcolor wordcount contextmenu",
+        toolbar: " forecolor",
         branding: false,
       }, //富文本初始化
     };
@@ -169,9 +171,6 @@ export default {
     ConInput(e) {},
     //   选择声调
     selectTone(oindex, aindex) {
-      this.curQue.option.forEach((item) => {
-        item.answer = null;
-      });
       this.curQue.option[oindex].answer = aindex;
     },
     numberInput(value) {
@@ -183,7 +182,7 @@ export default {
     onBlur(item, field) {
       item[field] = item[field] ? item[field].trim() : "";
     },
-    changeMp3(fileList) {
+    changeMp3(fileList, item, index) {
       console.log(fileList);
       const articleImgList = JSON.parse(JSON.stringify(fileList));
       const articleImgRes = [];
@@ -192,14 +191,17 @@ export default {
           const obj = {
             name: item.name,
             url: item.response.file_info_list[0].file_url,
-            id: "[FID##" + item.response.file_info_list[0].file_id + "#FID]",
+            id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
             media_duration: item.response.file_info_list[0].media_duration, //音频时长
           };
           articleImgRes.push(obj);
         }
       });
       //this.articleImgList = articleImgRes;
-      this.curQueItem.mp3_list = JSON.parse(JSON.stringify(articleImgRes));
+      console.log(index);
+      this.curQue.option[index].mp3_list = JSON.parse(
+        JSON.stringify(articleImgRes)
+      );
     },
     addoption() {
       let leg = this.curQue.option.length;

+ 3 - 0
src/views/adultInput.vue

@@ -567,6 +567,9 @@ export default {
     },
     // 当前目录id  name    父级name/当前 name
     changeId(id, name, fatherName) {
+      this.TopicIndex = null;
+      this.RowIndex = null;
+      this.LineIndex = null;
       this.fatherName = fatherName;
       this.currentTreeID = id;
       // 根据当前目录切换题

+ 4 - 2
src/views/adultInput3.vue

@@ -242,13 +242,12 @@
                       </template>
                       <template v-else> </template>
                     </template>
-                    <template v-if="topicIitem.type == 'ligature'">
+                    <template v-if="topicIitem.type == 'ligature_chs'">
                       <template v-if="topicIitem.is_edit">
                         <Ligature
                           :curQue="topicIitem.data"
                           :fn_data="fn_data"
                           :changeCurQue="changeCurQue"
-
                         />
                       </template>
                       <template v-else>
@@ -576,6 +575,9 @@ export default {
     },
     // 当前目录id  name    父级name/当前 name
     changeId(id, name, fatherName) {
+      this.TopicIndex = null;
+      this.RowIndex = null;
+      this.LineIndex = null;
       this.fatherName = fatherName;
       this.currentTreeID = id;
       // 根据当前目录切换题