Merge branch 'master' into dev_fbl

src/page/STB/operation/index.vue

@@ -45,7 +45,7 @@
       </div>
     </div>
     <div class="table-content">
-      <div class="party-table">
+      <div class="party-table noAdd">
         <el-table
           border
           style="width: 100%; height: 100%"

src/page/accounts/unitAdminDialog/add.vue

@@ -163,7 +163,7 @@ export default {
         permanent: true,
         date: "",
         roleList: [],
-        type: 1,
+        type: 2,
       };
     },
     // 提交

src/page/check/display/index.vue

@@ -48,7 +48,7 @@
       </div>
     </div>
     <div class="table-content">
-      <div class="party-table">
+      <div class="party-table noAdd">
         <el-table
           border
           style="width: 100%; height: 100%"
@@ -132,7 +132,6 @@
       </div>
       <div class="partyt-pagination">
         <el-pagination    
-          small
           background
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"

src/page/check/learn/index.vue

@@ -35,7 +35,7 @@
       <!-- <div class="btn-group">
         <el-button type="primary" @click="addPermis()">新建视频分类</el-button>
       </div> -->
-      <div class="party-table">
+      <div class="party-table noAdd">
         <el-table
           border
           style="width: 100%;height:100%" height="100%"

src/page/check/video/index.vue

@@ -32,7 +32,7 @@
       </div>
     </div>
     <div class="table-content">
-      <div class="party-table">
+      <div class="party-table noAdd">
         <el-table
           border
           style="width: 100%;height:100%"
@@ -97,7 +97,6 @@
       </div>
       <div class="partyt-pagination">
         <el-pagination
-          small
           background
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
@@ -139,24 +138,29 @@
     <el-dialog
       custom-class="party-dialog"
       title="视频详情"
-      height="600px"
+      height="200px"
       width="800px"
       :visible.sync="FormVisible"
       :before-close="close"
     >
       <div class="dialog-content">
-        <div>
+        
+        <span 
+         v-for="(item, index) in videoList"
+                :key="index">
+          
           <video
             :preload="preload"
-            :poster="videoImg"
+            :poster="item.thumbnail"
             :height="height"
             :width="width"
             align="center"
             :controls="controls"
           >
-            <source :src="videoSrc" />
+            <source :src="item.fileUrl" />
           </video>
-        </div>
+          <span>&nbsp;&nbsp;&nbsp;&nbsp; </span>
+        </span>
       </div>
     </el-dialog>
   </div>
@@ -184,6 +188,7 @@ export default {
       LOWER: "下架"
     };
     return {
+      videoList:[],
       videoSrc: "",
       videoSrc:
         "https://video.pearvideo.com/mp4/short/20200209/cont-1650197-14888002-hd.mp4",
@@ -192,8 +197,8 @@ export default {
       muteStatus: "",
       isMute: true,
       isPlay: false,
-      width: "100%", // 设置视频播放器的显示宽度（以像素为单位）
-      height: "100%", // 设置视频播放器的显示高度（以像素为单位）
+      width: "350px", // 设置视频播放器的显示宽度（以像素为单位）
+      height: "200px", // 设置视频播放器的显示高度（以像素为单位）
       preload: "auto", //  建议浏览器是否应在<video>加载元素后立即开始下载视频数据。
       controls: true, // 确定播放器是否具有用户可以与之交互的控件。没有控件，启动视频播放的唯一方法是使用autoplay属性或通过Player API。
       autoplay: "",
@@ -517,10 +522,12 @@ export default {
         .then(res => {
           let data = res.data.data;
           console.log(res.data.data.videoFileList[0].fileUrl);
-          this.videoSrc = res.data.data.videoFileList[0].fileUrl;
+         
+          this.videoList = res.data.data.videoFileList
           console.log(this.videoSrc);
           vm.FormVisible = true;
-          this.videoImg = data.thumbnail;
+           // this.videoSrc = res.data.data.videoFileList[0].fileUrl;
+          // this.videoImg = data.thumbnail;
         })
         .catch(function(err) {
           console.log(err);

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

-<template>
-  <el-upload
-  class="upload-demo"
-  ref="upload"
-  action="http://192.168.110.67/mall/file/audio/upload"
-  :on-preview="handlePreview"
-  :on-remove="handleRemove"
-  :file-list="fileList"
-  :on-success="handleAvatarSuccess"
-  :auto-upload="false">
-  <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-  <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
-  <div slot="tip" class="el-upload__tip">（支持上传多个视频及视频文件夹，视频语言支持汉语、蒙语、藏语、维吾尔语、英语，视频命名规定：视频名称+语言）</div>
-</el-upload>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        fileList: []
-      };
-    },
-    methods: {
-    handleAvatarSuccess(res, file) {
-        console.log(res)
-        console.log(res.data.fileList)
-         const data = res.data.fileList
-          let newArray = data.map((item) => {
-              return item.id;
-          })
-        this.$emit('audioList', newArray)
-       
-    },
-      submitUpload() {
-        this.$refs.upload.submit();
-      },
-      handleRemove(file, fileList) {
-        console.log(file, fileList);
-      },
-      handlePreview(file) {
-        console.log(file);
-      }
-    }
-  }
-</script>
-
-<style>
-
-</style>
\ No newline at end of file

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

-<template>
-  <el-upload
-  class="upload-demo"
-  ref="upload"
-  action="http://192.168.110.67/mall/file/datum/upload"
-  :on-preview="handlePreview"
-  :on-remove="handleRemove"
-  :file-list="fileList"
-  :on-success="handleAvatarSuccess"
-  :auto-upload="false">
-  <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-  <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
-  <div slot="tip" class="el-upload__tip">（支持上传多个视频及视频文件夹，视频语言支持汉语、蒙语、藏语、维吾尔语、英语，视频命名规定：视频名称+语言）</div>
-</el-upload>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        fileList: []
-      };
-    },
-    methods: {
-    handleAvatarSuccess(res, file) {
-        console.log(res)
-        // console.log(res.url)
-         const data = res.data.fileList
-          let newArray = data.map((item) => {
-              return item.id;
-          })
-        this.$emit('datumList', newArray)
-       
-    },
-      submitUpload() {
-        this.$refs.upload.submit();
-      },
-      handleRemove(file, fileList) {
-        console.log(file, fileList);
-      },
-      handlePreview(file) {
-        console.log(file);
-      }
-    }
-  }
-</script>
-
-<style>
-
-</style>
\ No newline at end of file

src/page/content/components/uploadVue/uploadFile--.vue

-<template>
-  <el-upload
-  class="upload-demo"
-  ref="upload"
-  action="http://192.168.110.67/mall/file/video/content/upload"
-  :on-preview="handlePreview"
-  :on-remove="handleRemove"
-  :file-list="fileList"
-  :on-success="handleAvatarSuccess"
-  :auto-upload="false">
-  <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-  <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
-  <div slot="tip" class="el-upload__tip">（支持上传多个视频及视频文件夹，视频语言支持汉语、蒙语、藏语、维吾尔语、英语，视频命名规定：视频名称+语言）</div>
-</el-upload>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        fileList: []
-      };
-    },
-    methods: {
-    handleAvatarSuccess(res, file) {
-      const data = res.data.fileList
-      let newArray = data.map((item) => {
-          return item.id;
-      })
-      this.$emit('videoList', newArray)
-      // console.log(newArray,'----idArray')
-    },
-      submitUpload() {
-        this.$refs.upload.submit();
-      },
-      handleRemove(file, fileList) {
-        console.log(file, fileList);
-      },
-      handlePreview(file) {
-        console.log(file);
-      }
-    }
-  }
-</script>
-
-<style>
-
-</style>
\ No newline at end of file

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

@@ -23,6 +23,12 @@
 
 <script>
 export default {
+   props:{
+    fileList:{
+      type:Array,
+      default:[]
+    },
+  },
   data() {
     return {
       filedata:[],
@@ -52,13 +58,22 @@ export default {
           console.log(res)
 
           if (resData.resultCode == "200") {
-            console.log(resData.data.fileList)
-            const data = resData.data.fileList
-            console.log(data)
-            let newArray = data.map((item) => {
-                return item.id;
-            })
-            this.$emit('videoList', newArray)
+            // console.log(resData.data.fileList)
+            // const data = resData.data.fileList
+            // console.log(data)
+            // let newArray = data.map((item) => {
+            //     return item.id;
+            // })
+            
+            // this.$emit('videoList', 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("videoList", [...newArray,...editArray]);
 
           } else {
             _this.$message.error(resData.msg || resData.message);
@@ -80,44 +95,6 @@ export default {
         this.$message.error("上传文件大小不能超过 10GB!");
       }
       return isLt10G;
-    },
-    handleRequest(file) {
-      //   let formData = new FormData();
-      //   this.fileArr.push(file.file)
-      //   console.log(this.fileArr,'文件数组')
-
-      //   formData.append("file", this.fileArr);
-      let formData = new FormData();
-      if (Array.isArray(file)) {
-        file.forEach(item => {
-          formData.append("file", item.file);
-        });
-      } else {
-        formData.append("file", file.file);
-      }
-
-      let _this = this;
-      _this
-        .$https(
-          {
-            method: "post",
-            url: "file/video/content/upload",
-            authType: this.backToken
-          },
-          formData
-        )
-        .then(res => {
-          let resData = res.data;
-          if (resData.resultCode == 200) {
-            //   _this.getOrgTree();
-          } else {
-            _this.$message.error(resData.msg || resData.message);
-          }
-        })
-        .catch(err => {
-          console.log(err);
-          _this.$message.error(err.msg || err.message);
-        });
     }
   }
 };

src/page/content/components/videoPlay.vue

 <template>
-  <div>
-    <!--
-      <video :src="videoSrc" :poster="videoImg" :autoplay="playStatus" height="421" width="700" :muted="muteStatus">
-        your browser does not support the video tag
-      </video>
-      <button @click="playClick" :class="{hide: isPlay}">点击播放</button> -->
-    <!--class="video-js vjs-default-skin vjs-big-play-centered" -->
+<div>
+ <span v-for="(item,index) in videoList" :key="index">
     <video
       :preload="preload"
-      :poster="videoImg"
+      :poster="item.cover"
       :height="height"
       :width="width"
       align="center"
       :controls="controls"
-      :autoplay="autoplay"
     >
-      <source :src="videoSrc" type="video/mp4" />
+      <source :src="item.fileUrl" type="video/mp4" />
     </video>
-  </div>
+    <span>&nbsp;&nbsp;&nbsp;&nbsp; </span>
+  </span>
+</div>
+ 
 </template>
 
 <script>
@@ -25,6 +22,7 @@ export default {
   name: "Video",
   data() {
     return {
+      videoList:[],
       videoSrc:
         "https://video.pearvideo.com/mp4/short/20200209/cont-1650197-14888002-hd.mp4",
       videoImg: "https://sm.ms/image/ueRFCZfk2xTONGb",
@@ -32,8 +30,8 @@ export default {
       muteStatus: "",
       isMute: true,
       isPlay: false,
-      width: "820", // 设置视频播放器的显示宽度（以像素为单位）
-      height: "500", // 设置视频播放器的显示高度（以像素为单位）
+      width: "350", // 设置视频播放器的显示宽度（以像素为单位）
+      height: "200", // 设置视频播放器的显示高度（以像素为单位）
       preload: "auto", //  建议浏览器是否应在<video>加载元素后立即开始下载视频数据。
       controls: true, // 确定播放器是否具有用户可以与之交互的控件。没有控件，启动视频播放的唯一方法是使用autoplay属性或通过Player API。
       autoplay: "",

src/page/content/display/classify/index.vue

@@ -29,11 +29,11 @@
           <div class="btn-group">
             <el-button
               type="primary"
-              class="btn_form_search"
+
               @click="onSearch"
               >查询</el-button
             >
-            <el-button class="btn_form_search" @click="Reset">重置</el-button
+            <el-button @click="Reset">重置</el-button
             >
           </div>
         </el-form-item>

src/page/content/learn/content/add.vue

@@ -81,7 +81,7 @@
             >
               <el-table-column type="selection" width="55"></el-table-column>
               <el-table-column type="index" width="120" label="序号"></el-table-column>
-              <el-table-column show-overflow-tooltip label="版权方名称" prop="name"></el-table-column>
+              <el-table-column show-overflow-tooltip label="展板名称" prop="name"></el-table-column>
               <el-table-column show-overflow-tooltip label="展板类别" prop="exhibitionBoardCatName"></el-table-column>
               <el-table-column show-overflow-tooltip label="展板版权方" prop="boardCopyrightOwnerName"></el-table-column>
               <el-table-column label="操作" width="180">
@@ -265,10 +265,13 @@ export default {
   methods: {
     // 视频预览
     videoPreview(row) {
+      console.log(row)
+      console.log(row.videoList)
       this.$refs.videoDialog.dialogVisible = true;
-      this.$refs.videoDialog.videoImg = row.cover;
-      let videoList0 = row.videoList[0];
-      this.$refs.videoDialog.videoSrc = videoList0 ? videoList0.fileUrl : "";
+      this.$refs.videoDialog.videoList = row.videoList
+      // this.$refs.videoDialog.videoImg = row.cover;
+      // let videoList0 = row.videoList[0];
+      // this.$refs.videoDialog.videoSrc = videoList0 ? videoList0.fileUrl : "";
     },
     // 展板预览
     displayPreview(row) {
@@ -501,7 +504,7 @@ export default {
       vm.$https(
         {
           url: "exhibitionBoard/getList",
-          method: "get",
+          method: "post",
           authType: this.backToken
         },
         vm.$qs.stringify(param)

src/page/content/learn/content/index.vue

@@ -139,12 +139,12 @@
                   </el-button>
                 </el-tooltip>
                 <el-tooltip content="启用" placement="top">
-                  <el-button circle v-show="!scope.row.published" @click="handlePublish(scope.row, 'True')">
+                  <el-button circle :disabled="scope.row.auditStatus !== 'APPROVED_FINAL'" v-show="!scope.row.published" @click="handlePublish(scope.row, 'True')">
                     <i class="icon-table icon-enable"></i>
                   </el-button>
                 </el-tooltip>
                 <el-tooltip content="禁用" placement="top">
-                  <el-button circle  v-show="scope.row.published" @click="handlePublish(scope.row, 'False')">
+                  <el-button circle :disabled="scope.row.auditStatus !== 'APPROVED_FINAL'" v-show="scope.row.published" @click="handlePublish(scope.row, 'False')">
                     <i class="icon-table icon-disable"></i>
                   </el-button>
                 </el-tooltip>

src/page/content/video/classify/index.vue

@@ -501,7 +501,7 @@ export default {
                 // };
 
               if(res.data.resultCode === "200"){
-                this.$message({ type: "success", message: "删除视频分类申请已提交,待审核！" });
+                this.$message({ type: "success", message: "删除成功！" });
                 _this.Search();
               }else{
                 this.$message({ type: "error", message: res.data.message });

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

@@ -80,11 +80,11 @@
             </el-select>
           </el-form-item>
           <el-form-item label="视频缩略图" required>
-            <upload-img @imgUrl="imgUrl"></upload-img>
+            <upload-img :fileList="ruleForm.imageList" @imgUrl="imgUrl"></upload-img>
           </el-form-item>
           <el-form-item label="上传视频" required>
             <p style="color:red">（支持上传多个视频及视频文件夹，视频语言支持汉语、蒙语、藏语、维吾尔语、英语，视频命名规定：视频名称+语言）</p>
-            <upload-file @videoList="videoList"></upload-file>
+            <upload-file :fileList="ruleForm.videoList" @videoList="videoList"></upload-file>
           </el-form-item>
         </el-form>
         <!--新增弹框-->
@@ -265,6 +265,8 @@ export default {
           this.ruleForm.videoContentCatId = data.videoContentCatId
           this.ruleForm.thumbnail = data.thumbnail
           this.ruleForm.videoFileIdList = data.videoFileIdList
+          this.ruleForm.imageList=[{url:data.thumbnail}]
+          this.ruleForm.videoList=data.videoFileList.map(item=>{return {id:item.id,name:item.fileName,url:item.fileUrl}})
       }).catch(function(err) {
           console.log(err);
       });

src/page/content/video/copyright/index.vue

@@ -23,8 +23,8 @@
         </el-form-item>
         <el-form-item>
           <div class="btn-group">
-            <el-button size="mini" type="primary" class="btn_form_search" @click="Search">查询</el-button>
-            <el-button size="mini" class="btn_form_search" @click="Reset">重置</el-button>
+            <el-button type="primary" @click="Search">查询</el-button>
+            <el-button @click="Reset">重置</el-button>
           </div>
         </el-form-item>
       </el-form>
@@ -338,7 +338,7 @@ export default {
             .then(
               res => {
               if(res.data.resultCode === "200"){
-                this.$message({ type: "success", message: "删除视频版权方申请已提交,待审核！" });
+                this.$message({ type: "success", message: "删除成功！" });
                 _this.Search();
               }else{
                 this.$message({ type: "error", message: res.data.message });