natasha %!s(int64=3) %!d(string=hai) anos
pai
achega
9e44a1aa2f

+ 16 - 2
src/components/Adult/inputModules/UploadControl.vue

@@ -136,9 +136,23 @@ export default {
       this.curQue.upload_list = JSON.parse(JSON.stringify(articleImgRes));
     },
     changeFillId(fileList, item, index) {
-      this.curQue.fileList = JSON.parse(JSON.stringify(fileList));
+      const articleImgList = JSON.parse(JSON.stringify(fileList));
+      const articleImgRes = [];
+      articleImgList.forEach((item) => {
+        if (item.response) {
+          const obj = {
+            file_name: item.response.file_info_list[0].file_name,
+            url: item.response.file_info_list[0].file_url,
+            id: "[FID##" + item.response.file_info_list[0].file_id + "##FID]",
+            fileID: item.response.file_info_list[0].file_id,
+            file_relative_path: item.response.file_info_list[0].file_relative_path
+          };
+          articleImgRes.push(obj);
+        }
+      });
+      this.curQue.fileList = JSON.parse(JSON.stringify(articleImgRes));
       if (fileList.length > 0) {
-        this.curQue.data = fileList[0]?.response?.file_info_list[0];
+        this.curQue.data = fileList[0]?articleImgRes[0]:fileList[0].file_info_list[0];
         if (this.curQue.data?.file_name.indexOf("pdf") != -1) {
           this.curQue.data.fileRelativePath =
             process.env.VUE_APP_BASE_API + this.curQue.data.file_relative_path;

+ 14 - 2
src/components/Adult/inputModules/VideoControl.vue

@@ -98,8 +98,20 @@ export default {
       getContentFile(Mname, data)
         .then((res) => {
           this.curQue.definition_list = [];
-          this.curQue.definition_list.push(res["480P"]);
-          this.curQue.definition_list.push(res["720P"]);
+          const obj = {
+            name: res["480P"].name,
+            url: res["480P"].file_url,
+            id: "[FID##" + res["480P"].file_id + "##FID]",
+            media_duration: res["480P"].media_duration, //音频时长
+          };
+          const objs = {
+            name: res["720P"].name,
+            url: res["720P"].file_url,
+            id: "[FID##" + res["720P"].file_id + "##FID]",
+            media_duration: res["720P"].media_duration, //音频时长
+          };
+          this.curQue.definition_list.push(obj);
+          this.curQue.definition_list.push(objs);
           // this.loading2.close();
           this.loading2 = false;
         })

+ 0 - 2
src/components/Adult/preview/DialogueArticleViewChs/AnswerModel.vue

@@ -651,8 +651,6 @@ export default {
         }
       });
       this.resArr = resArr;
-      console.log("Normal");
-      console.log(this.resArr);
 
       // 循环文章图片
       if (curQue.img_list) {

+ 12 - 6
src/components/Adult/preview/SentenceInput.vue

@@ -89,23 +89,23 @@
                 :key="conIndex + 'con'"
               >
                 <template v-if="items.detail.pyPosition == 'top'">
-                  <!-- <div
+                  <div
                     v-if="conent.pinyin == '__'"
                     contenteditable="true"
                     class="input pinyin"
                     v-html="answerList[indexs].pinyin"
                     @change="changeAnswerList($event, indexs, 'pinyin')"
-                  ></div> -->
+                  ></div>
                   <!-- 
                     v-model="answerList[indexs].pinyin"
                    -->
-                  <p class="pinyin" v-if="conent.pinyin&&conent.pinyin.indexOf('__')==-1">
+                  <p class="pinyin" :class="[conent.pinyin.indexOf('__')>-1?'pinyin-opacity':'']" v-if="conent.pinyin">
                     {{ conent.pinyin }}
                   </p>
                 </template>
                 <template v-if="conent.chs.indexOf('__')>-1">
-                    {{items.detail.resArr[conIndex].inputNumber}}
-                  <!-- <EditDiv class="input chs" v-model='curQue.Bookanswer[indexs].answerList[items.detail.resArr[conIndex].inputNumber].chs' :canEdit="TaskModel=='ANSWER'?false:true"></EditDiv> -->
+                    <!-- {{items.detail.resArr[conIndex].inputNumber}} -->
+                  <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"
@@ -132,7 +132,7 @@
                     v-html="answerList[indexs].pinyin"
                     @change="changeAnswerList($event, indexs, 'pinyin')"
                   ></div> -->
-                  <p class="pinyin" v-if="conent.pinyin.indexOf('__')==-1">
+                  <p class="pinyin" :class="[conent.pinyin.indexOf('__')>-1?'pinyin-opacity':'']" v-if="conent.pinyin">
                     {{ conent.pinyin }}
                   </p>
                 </template>
@@ -175,6 +175,7 @@
               :TaskModel="TaskModel"
               type="normal"
               v-if="items.IsRecord"
+              :style="{marginLeft:'8px'}"
             />
           </template>
           <template v-else>
@@ -186,6 +187,7 @@
               type="mini"
               class="luyin-box"
               v-if="items.IsRecord"
+              :style="{marginLeft:'8px'}"
             />
           </template>
         </template>
@@ -286,6 +288,7 @@ export default {
         });
         this.$set(_this.curQue.option[dIndex].detail, "resArr", paraArr);
       });
+        console.log(_this.curQue.option)
     },
     //词和标点合一起
     mergeWordSymbol(sItem, wItem, curIndex) {
@@ -425,6 +428,9 @@ export default {
             line-height: 130%;
             color: rgba(0, 0, 0, 0.6);
             margin-top: 8px;
+            &-opacity{
+                opacity: 0;
+            }
           }
           .chs {
             font-family: "FZJCGFKTK";

+ 1 - 1
src/components/Adult/preview/Single.vue

@@ -7,7 +7,7 @@
             <p v-if="itemI.topic.con" :class="[/^[\u4e00-\u9fa5]/.test(itemI.topic.con)?'hasCn':'']">{{itemI.topic.con}}</p>
             <Audio
                 :mp3="
-                itemI.topic.mp3_list.length > 0 ? itemI.topic.mp3_list[0].url : ''"
+                itemI.topic.mp3_list.length > 0 ? itemI.topic.mp3_list[0].id : ''"
                 :themeColor="themeColor"
                 class="audio-play"
             />

+ 0 - 1
src/components/Adult/preview/Soundrecord.vue

@@ -195,7 +195,6 @@ export default {
   // 生命周期 - 挂载完成(可以访问DOM元素)
   mounted() {
     let _this = this;
-    console.log(_this.answerRecordList);
     _this.recordList = _this.answerRecordList
       ? JSON.parse(JSON.stringify(_this.answerRecordList))
       : [];

+ 1 - 1
src/components/Adult/preview/UploadControlView.vue

@@ -45,7 +45,7 @@
               curQue.data.file_name.indexOf('jpeg') != -1
             "
           >
-            <img :src="curQue.data.file_url" alt="" />
+            <img :src="curQue.data.id" alt="" />
           </template>
           <template
             v-else-if="curQue.Bookanswer.file_name.indexOf('pdf') != -1"

+ 2 - 2
src/components/Adult/preview/VideoControl.vue

@@ -109,8 +109,8 @@ export default {
     // 设置清晰度
     _this.player.emit("resourceReady", [
       { name: "高清", url: _this.curQue.video_list[0].id },
-      { name: "标清", url: _this.curQue.definition_list[1].file_url },
-      { name: "流畅", url: _this.curQue.definition_list[0].file_url },
+      { name: "标清", url: _this.curQue.definition_list[1].id },
+      { name: "流畅", url: _this.curQue.definition_list[0].id },
     ]);
     setTimeout(() => {
       let name = document.getElementsByClassName("name")[0];