Merge branch 'master' of http://111.203.232.171:8888/qzhxx/national_museum_vod into dev_xll

src/page/STB/appversion/components/addDialog.vue

@@ -38,6 +38,7 @@
           class="text-center"
           drag
           :action="uploadUrl"
+          :headers ="headers"
           :on-success="handleAvatarSuccess"
           :before-upload="handleBeforeUpload"
           :file-list="fileList"
@@ -64,6 +65,7 @@ export default {
     return {
       uploadUrl:'http://192.168.110.67/mall/file/upload/allType',
       formVisible: false,
+      headers:{Authorization: localStorage.getItem('backToken')},
       formItem: {},
       fileList: [],
       rules: {

src/page/STB/pageCustom/index.vue

@@ -14,6 +14,7 @@
                 action="http://192.168.110.67/mall/file/image/upload"
                 :on-success="uploadPageImg"
                 :before-upload="handleBeforeUpload"
+                :headers ="headers"
                 :file-list="dirList"
               >
                 <el-button type="default">上传背景图</el-button>
@@ -45,6 +46,7 @@
                 action="http://192.168.110.67/mall/file/image/upload"
                 :on-success="uploadRunImg"
                 :before-upload="handleBeforeUpload"
+                :headers ="headers"
                 :file-list="fileRunList"
               >
                 <el-button type="default">上传背景图</el-button>
@@ -86,6 +88,7 @@ export default {
   components: { Swiper, SwiperSlide },
   data() {
     return {
+      headers:{Authorization: localStorage.getItem('backToken')},
       radioPage: "", // 选中项
       radioRun: "",
       dirList: [], // 上传列表

src/page/check/display/index.vue

@@ -65,7 +65,11 @@
           <el-table-column label="展板名称" prop="name"></el-table-column>
           <el-table-column label="提交人" prop="userName"></el-table-column>
           <el-table-column label="提交日期" prop="createTime"></el-table-column>
-          <el-table-column label="审核项" prop="operation"></el-table-column>
+           <el-table-column label="审核项" prop="operation">
+            <template slot-scope="scope">
+              <span class="input-item">{{keyMap[scope.row.operation]}}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="审核状态" prop="status">
             <template slot-scope="scope">
               <span v-if="scope.row.status === 'TBC'">待初审</span>
@@ -89,12 +93,8 @@
           </el-table-column>
           <el-table-column label="审核" header-align="center" align="center">
             <template slot-scope="scope" width="220">
-              <div class="table-btn-group">
-                <!-- <el-tooltip content="详情" placement="top">
-                  <el-button circle @click="learnDetails(scope.row)">
-                    <i class="icon-table icon-detail"></i>
-                  </el-button>
-                </el-tooltip> -->
+              <!-- <div class="table-btn-group">
+               
                 <el-tooltip content="通过" placement="top">
                   <el-button circle @click="adopt(scope.row)">
                     <i class="icon-table icon-enable"></i>
@@ -105,6 +105,26 @@
                     <i class="icon-table icon-disable"></i>
                   </el-button>
                 </el-tooltip>
+              </div> -->
+               <div class="table-btn-group">
+                <el-button
+                  round
+                  class="passed"
+                  :disabled="
+                scope.row.status === 'REFUSED' ||
+                scope.row.status === 'APPROVED_FINAL'
+              "
+                  @click="adopt(scope.row)"
+                >通过</el-button>
+                <el-button
+                  round
+                  class="rejected"
+                  :disabled="
+                scope.row.status === 'REFUSED' ||
+                scope.row.status === 'APPROVED_FINAL'
+              "
+                  @click="reject(scope.row)"
+                >驳回</el-button>
               </div>
             </template>
           </el-table-column>
@@ -237,7 +257,18 @@ export default {
         }
       }
     };
+    const keyMap = {
+      ADD: "新增",
+      EDIT: "修改",
+      REMOVE: "删除",
+      DISABLE: "禁用",
+      ENABLE: "启用",
+      UPPER: "上架",
+      LOWER: "下架"
+    };
+
     return {
+      keyMap: keyMap,
       type: true,
       value1: "",
       page: { currentPage: 1, pageSize: 10, total: 0 },

src/page/check/learn/details.vue

@@ -28,17 +28,17 @@
               :model="formInline"
               label-position="top"
             >
-              <el-form-item label="展板宣传图">
+              <el-form-item label="展板宣传图"  class="w100">
                 <img class="imgSize" :src="item.cover" alt />
               </el-form-item>
-              <el-form-item label="展板版权方">
+              <el-form-item label="展板版权方" class="w50" >
                 <span>{{ item.boardCopyrightOwnerName }}</span>
               </el-form-item>
-              <el-form-item label="展板名称" class="w50">
+              <el-form-item label="展板名称">
                 <span>{{ item.name }}</span>
               </el-form-item>
              
-              <el-form-item label="展板简介">
+              <el-form-item label="展板简介" class="w100">
                 <span>{{ item.remarks }}</span>
               </el-form-item>
               <el-form-item label="展板视频" class="w100">

src/page/check/learn/index.vue

@@ -47,7 +47,11 @@
             <el-table-column label="学习内容名称" prop="name"></el-table-column>
             <el-table-column label="提交人" prop="userName"></el-table-column>
             <el-table-column label="提交日期" prop="createTime"></el-table-column>
-            <el-table-column label="审核项" prop="operation"></el-table-column>
+             <el-table-column label="审核项" prop="operation">
+            <template slot-scope="scope">
+              <span class="input-item">{{keyMap[scope.row.operation]}}</span>
+            </template>
+          </el-table-column>
             <el-table-column label="审核状态" prop="status">
               <template slot-scope="scope">
                 <span v-if="scope.row.status === 'TBC'">待初审</span>
@@ -70,6 +74,26 @@
              <el-table-column label="审核" header-align="center" align="center">
               <template slot-scope="scope" width="220">
                  <div class="table-btn-group">
+                <el-button
+                  round
+                  class="passed"
+                  :disabled="
+                scope.row.status === 'REFUSED' ||
+                scope.row.status === 'APPROVED_FINAL'
+              "
+                  @click="adopt(scope.row)"
+                >通过</el-button>
+                <el-button
+                  round
+                  class="rejected"
+                  :disabled="
+                scope.row.status === 'REFUSED' ||
+                scope.row.status === 'APPROVED_FINAL'
+              "
+                  @click="reject(scope.row)"
+                >驳回</el-button>
+              </div>
+                <!-- <div class="table-btn-group">
                 <el-tooltip content="通过" placement="top">
                   <el-button circle @click="adopt(scope.row)">
                     <i class="icon-table icon-enable"></i>
@@ -80,7 +104,7 @@
                     <i class="icon-table icon-disable"></i>
                   </el-button>
                 </el-tooltip>
-              </div>
+              </div> -->
               </template>
             </el-table-column>
         </el-table>
@@ -172,8 +196,18 @@ export default {
           callback();
         }
       }
+    };
+     const keyMap = {
+      ADD: "新增",
+      EDIT: "修改",
+      REMOVE: "删除",
+      DISABLE: "禁用",
+      ENABLE: "启用",
+      UPPER: "上架",
+      LOWER: "下架"
     };
     return {
+      keyMap: keyMap,
       type:true,
       value1: "",
       page: { currentPage: 1, pageSize: 10, total: 0 },

src/page/content/components/uploadVue/uploadAudio.vue

@@ -23,20 +23,25 @@
 
 <script>
 export default {
+  props:{
+    fileList:{
+      type:Array,
+      default:[]
+    },
+  },
   data() {
     return {
-      filedata:[],
+      filedata: [],
       fileArr: [],
-      fileList:[],
-    //   fileList: [{name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}, {name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}]
     };
   },
+  mounted(){
+    console.log("uploadAudio",this.fileList)
+  },
   methods: {
-    submitUpload() {  // 导入
-        let tempData =  this.filedata
+    submitUpload() {
         this.filedata = new FormData()  //  用FormData存放上传文件
         this.$refs.upload.submit()  // 会循环调用uploadFile方法，多个文件调用多次
-
         let _this = this;
       _this
         .$https(
@@ -52,15 +57,13 @@ export default {
           console.log(res)
 
           if (resData.resultCode == "200") {
-            // alert("上传成功");
-            console.log(resData.data.fileList)
             const data = resData.data.fileList
-            console.log(data)
-            let newArray = data.map((item) => {
-                return item.id;
-            })
-            this.$emit('audioList', newArray)
-
+            let newArray = data.map((item) => item.id)
+            let editArray =[]
+            if(this.fileList.length){
+              editArray = this.fileList.map(item=>item.id)
+            }
+            this.$emit('audioList', [...newArray,...editArray])
           } else {
             _this.$message.error(resData.msg || resData.message);
           }

src/page/content/components/uploadVue/uploadDatum.vue

 <template>
-<div>
-<!-- accept="application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" -->
+  <div>
+    <!-- accept="application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" -->
     <!-- :show-file-list="false" -->
     <!-- :file-list="fileList" -->
     <!-- action="http://192.168.110.67/mall/file/video/content/upload" -->
@@ -14,28 +14,37 @@
       :before-upload="beforeAvatarUpload"
     >
       <i class="el-icon-plus fileUpload"></i>
-
     </el-upload>
-   <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
-</div>
-
+    <el-button
+      style="margin-left: 10px"
+      size="small"
+      type="success"
+      @click="submitUpload"
+      >上传到服务器</el-button
+    >
+  </div>
 </template>
 
 <script>
 export default {
+  props:{
+    fileList:{
+      type:Array,
+      default:[]
+    },
+  },
   data() {
     return {
-      filedata:[],
+      filedata: [],
       fileArr: [],
-      fileList:[],
-    //   fileList: [{name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}, {name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}]
     };
   },
+  mounted(){
+  },
   methods: {
-    submitUpload() {  // 导入
-        let tempData =  this.filedata
-        this.filedata = new FormData()  //  用FormData存放上传文件
-        this.$refs.upload.submit()  // 会循环调用uploadFile方法，多个文件调用多次
+    submitUpload() {
+      this.filedata = new FormData(); //  用FormData存放上传文件
+      this.$refs.upload.submit(); // 会循环调用uploadFile方法，多个文件调用多次
 
       let _this = this;
       _this
@@ -43,35 +52,31 @@ export default {
           {
             method: "post",
             url: "file/datum/upload",
-            authType: this.backToken
+            authType: this.backToken,
           },
           this.filedata
         )
-        .then(res => {
+        .then((res) => {
           let resData = res.data;
-          console.log(res)
-
           if (resData.resultCode == "200") {
-            // alert("上传成功");
-            console.log(resData.data.fileList)
-            const data = resData.data.fileList
-            console.log(data)
-            let newArray = data.map((item) => {
-                return item.id;
-            })
-            this.$emit('datumList', newArray)
-
+            const data = resData.data.fileList;
+            let newArray = data.map((item) => item.id);
+            let editArray =[]
+            if(this.fileList.length){
+              editArray = this.fileList.map(item=>item.id)
+            }
+            this.$emit("datumList", [...newArray,...editArray]);
           } else {
             _this.$message.error(resData.msg || resData.message);
           }
         })
-        .catch(err => {
+        .catch((err) => {
           console.log(err);
           _this.$message.error(err.msg || err.message);
         });
     },
     uploadFile(file) {
-         this.filedata.append('file', file.file)
+      this.filedata.append("file", file.file);
     },
     beforeAvatarUpload(file) {
       const isLt10G = file.size / 1024 < 10;

src/page/content/components/uploadVue/uploadImg.vue

@@ -8,7 +8,8 @@
       :on-success="handleAvatarSuccess"
       :headers="headers"
       :file-list="fileList"
-      accept=""
+      :limit="1"
+      :multiple ="false"
     >
       <i class="el-icon-plus"></i>
     </el-upload>
@@ -20,6 +21,12 @@
 
 <script>
 export default {
+  props:{
+    fileList:{
+      type:Array,
+      default:[]
+    },
+  },
   data() {
     return {
       dialogImageUrl: "",

src/page/content/components/uploadVue/uploadQrcode.vue

@@ -7,6 +7,9 @@
       :on-remove="handleRemove"
       :on-success="handleAvatarSuccess"
       :headers="headers"
+      :file-list="fileList"
+      :limit="1"
+      :multiple ="false"
     >
       <i class="el-icon-plus"></i>
     </el-upload>
@@ -18,6 +21,12 @@
 
 <script>
 export default {
+  props:{
+    fileList:{
+      type:Array,
+      default:[]
+    },
+  },
   data() {
     return {
       dialogImageUrl: "",

src/page/content/display/content/details.vue

@@ -272,19 +272,6 @@ export default {
     },
     reviewFile() {
       console.log("点击预览。。。");
-      // const _this = this;
-      // this.$confirm("确定要下载该文件？", "提示", {
-      //   confirmButtonText: "确定",
-      //   cancelButtonText: "取消",
-      //   type: "warning",
-      //   center: true,
-      // })
-      //   .then(() => {
-      //     this.updateVersion(row);
-      //   })
-      //   .catch(() => {
-      //     this.$message("已取消");
-      //   });
     },
     close() {
       this.$router.go(-1);

src/page/content/video/content/add.vue

@@ -246,7 +246,7 @@ export default {
       console.log(data)
       console.log(this.ruleForm.videoContentCatId)
     },
-    //  获取版权方详情
+    //  获取信息
     getInfo(id) {
        let vm = this;
       vm.$https(