Merge branch 'master' into NPC-lhd

src/components/Adult/common/UploadView.vue

@@ -15,7 +15,6 @@
       :on-change="handleChange"
       :file-list="currentfileList"
       :limit="filleNumber"
-      :show-file-list="false"
     >
       <div class="uploadBtn">
         <img

src/components/Adult/common/data3.js

@@ -387,6 +387,10 @@ let fnData = [{
         type: "upload_control_chs",
         name: "上传控件",
     },
+    {
+        type: "upload_control_preview_chs",
+        name: "上传控件预览查看",
+    },
     // {
     //     type: "inputItem_chs",
     //     name: "输入选项",

src/components/Adult/inputModules/SelectInpue.vue

@@ -16,17 +16,38 @@
           @blur="onBlur(curQue, 'title')"
         ></el-input>
       </div>
-      <div class="adult-book-input-item">
-        <span class="adult-book-lable">内容：</span>
-        <el-input
-          class="adult-book-input"
-          type="textarea"
-          :autosize="{ minRows: 2 }"
-          placeholder="请输入内容"
-          v-model="curQue.con"
-          @blur="onBlur(curQue, 'con')"
-        ></el-input>
+      <div v-for="(item, Cindex) in curQue.con" :key="'con' + Cindex">
+        <div class="adult-book-input-item">
+          <span class="adult-book-lable">内容标题：</span>
+          <el-input
+            class="adult-book-input"
+            type="textarea"
+            :autosize="{ minRows: 2 }"
+            placeholder="请输入内容标题"
+            v-model="item.title"
+            @blur="onBlur(item, 'title')"
+          ></el-input>
+          <img
+            @click="deleteCon(Cindex)"
+            class="close"
+            src="../../../assets/adult/del-close.png"
+            alt=""
+          />
+        </div>
+        <div class="adult-book-input-item">
+          <span class="adult-book-lable">内容文本：</span>
+          <el-input
+            class="adult-book-input"
+            type="textarea"
+            :autosize="{ minRows: 2 }"
+            placeholder="请输入内容"
+            v-model="item.con"
+            @blur="onBlur(item, 'con')"
+          ></el-input>
+        </div>
       </div>
+      <div class="addoption" @click="addCon">添加一个内容</div>
+
       <div v-for="(item, Oindex) in curQue.option" :key="'op' + Oindex">
         <div class="adult-book-input-item">
           <span class="adult-book-lable">选项：</span>
@@ -100,12 +121,17 @@ export default {
         type: "选择填空控件",
         name: "select_input_chs",
         title: "",
-        con: "",
         option: [
           {
             con: "",
           },
         ],
+        con: [
+          {
+            title: "",
+            con: "",
+          },
+        ],
         answer: [
           {
             con: "",
@@ -121,6 +147,17 @@ export default {
     onBlur(item, field) {
       item[field] = item[field] ? item[field].trim() : "";
     },
+    deleteCon(index) {
+      if (this.curQue.con.length <= 1) {
+        this.$message.warning("至少要保留1个内容");
+        return;
+      }
+      this.curQue.con.splice(index, 1);
+    },
+    addCon() {
+      let obj = JSON.parse(JSON.stringify(this.data_structure.con[0]));
+      this.curQue.con.push(obj);
+    },
     // 删除其中一个选项
     deleteOptionOne(index) {
       if (this.curQue.option.length <= 1) {

src/components/Adult/inputModules/UploadControl.vue

@@ -7,7 +7,7 @@
       :filleNumber="1"
       :fileList="curQue.fileList"
     />
-    <div class="dv" v-loading="loading">
+    <div class="dv" v-loading="loading" v-if="type == 'upload_control_chs'">
       <div class="main">
         <div class="content">
           <template v-if="curQue.data">
@@ -47,7 +47,7 @@ export default {
     UploadView,
     pdf,
   },
-  props: ["curQue", "changeCurQue"],
+  props: ["curQue", "changeCurQue", "type"],
   data() {
     return {
       uploadType: "",
@@ -61,6 +61,12 @@ export default {
         title: "",
         fileList: [],
       },
+      data_structure2: {
+        type: "upload_control_preview_chs",
+        name: "上传控件预览查看",
+        title: "",
+        fileList: [],
+      },
       loading: false,
     };
   },
@@ -75,10 +81,9 @@ export default {
       this.$message.success("删除成功");
     },
     changeFillId(fileList, item, index) {
-      this.curQue.fileList = fileList;
+      this.curQue.fileList =JSON.parse(JSON.stringify(fileList));
       this.curQue.data = fileList[0].response.file_info_list[0];
-      if (this.curQue.data.file_name.indexOf("pdf" != -1)) {
-        this.curQue.data = fileList[0].response.file_info_list[0];
+      if (fileList[0].name.indexOf("pdf" != -1)) {
         this.curQue.data.fileRelativePath =
           process.env.VUE_APP_BASE_API + this.curQue.data.file_relative_path;
         this.getNumPages();
@@ -105,7 +110,12 @@ export default {
     },
 
     initcurQue() {
-      let data = JSON.parse(JSON.stringify(this.data_structure));
+      let data;
+      if (this.type == "upload_control_chs") {
+        data = JSON.parse(JSON.stringify(this.data_structure));
+      } else {
+        data = JSON.parse(JSON.stringify(this.data_structure2));
+      }
       this.changeCurQue(data);
     },
   },

src/components/Adult/preview/UploadControlView.vue

@@ -1,7 +1,7 @@
 <!--  -->
 <template>
   <div class="Big-Book-prev-Textdes Tinydemo" v-if="curQue">
-    <div style="display: flex">
+    <div style="display: flex" v-if="type=='upload_control_chs'">
       <UploadView
         :changeFillId="changeFillId"
         :accept="accept"
@@ -17,7 +17,6 @@
         下载表格
       </div>
     </div>
-
     <div class="dv" v-loading="loading">
       <div class="main">
         <div class="content">
@@ -43,7 +42,7 @@
           </template>
         </div>
       </div>
-      <div class="remove" @click="remove">
+      <div v-if="type=='upload_control_chs'" class="remove" @click="remove">
         <img src="../../../assets/adult/red_remove.png" alt="" />
       </div>
     </div>
@@ -60,7 +59,7 @@ export default {
     UploadView,
     pdf,
   },
-  props: ["curQue", "fn_data"],
+  props: ["curQue", "fn_data","type"],
   data() {
     return {
       uploadType: "",

src/views/adultInput3.vue

@@ -199,7 +199,12 @@
                       </template>
                       <template v-else> </template>
                     </template>
-                    <template v-if="topicIitem.type == 'upload_control_chs'">
+                    <template
+                      v-if="
+                        topicIitem.type == 'upload_control_chs' ||
+                        topicIitem.type == 'upload_control_preview_chs'
+                      "
+                    >
                       <template v-if="topicIitem.is_edit">
                         <UploadControl
                           :curQue="topicIitem.data"
@@ -210,6 +215,7 @@
                       </template>
                       <template v-else>
                         <UploadControlView
+                          :type="topicIitem.type"
                           :curQue="topicIitem.data"
                           :fn_data="fn_data"
                         />
@@ -470,7 +476,6 @@ import ZiLine from "@/components/Adult/inputModules/ZiLine.vue";
 import SelectInpue from "@/components/Adult/inputModules/SelectInpue.vue";
 import PlayInputReacord from "@/components/Adult/inputModules/PlayInputReacord.vue";
 
-
 import Textdes from "@/components/Adult/inputModules/Textdes.vue";
 import Record from "@/components/Adult/inputModules/Record.vue";
 import Hanzi from "@/components/Adult/inputModules/Hanzi.vue";