展板选择视频筛选更改，样式优化

src/page/check/display/index.vue

@@ -132,7 +132,6 @@
       </div>
       <div class="partyt-pagination">
         <el-pagination    
-          background
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pageSize"

src/page/check/learn/index.vue

@@ -111,7 +111,6 @@
       </div>
        <div class="partyt-pagination">
         <el-pagination
-          background
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pageSize"

src/page/check/video/index.vue

@@ -97,7 +97,6 @@
       </div>
       <div class="partyt-pagination">
         <el-pagination
-          background
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pageSize"

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

@@ -86,10 +86,10 @@ export default {
 </script>
 
 <style>
-.fileUpload {
+.el-upload .fileUpload {
   width: 148px;
   height: 148px;
-  line-height: 148px;
+  line-height: 148px!important;
   margin: 0 auto;
   border: 1px dashed #c0ccda;
   font-size: 24px;

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

@@ -86,10 +86,10 @@ export default {
 </script>
 
 <style>
-.fileUpload {
+.el-upload .fileUpload {
   width: 148px;
   height: 148px;
-  line-height: 148px;
+  line-height: 148px!important;
   margin: 0 auto;
   border: 1px dashed #c0ccda;
   font-size: 24px;

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

@@ -98,10 +98,10 @@ export default {
 </script>
 
 <style>
-.fileUpload {
+.el-upload .fileUpload {
   width: 148px;
   height: 148px;
-  line-height: 148px;
+  line-height: 148px!important;
   margin: 0 auto;
   border: 1px dashed #c0ccda;
   font-size: 24px;

src/page/content/display/content/add.vue

@@ -73,6 +73,7 @@
                 <el-select
                   placeholder="请选择视频版权方"
                   v-model="ruleForm.videoContentCopyrightOwnerId"
+                  @change="clearVideo"
                 >
                   <el-option
                     v-for="item in copyrightOwner"
@@ -86,6 +87,7 @@
                 <el-select
                   placeholder="请选择视频分类"
                   v-model="ruleForm.videoContentCatId"
+                  @change="clearVideo"
                 >
                   <el-option
                     v-for="item in videoContentCat"
@@ -95,8 +97,9 @@
                   ></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="请选择视频" prop="videoContentId">
+              <el-form-item label="请选择视频" prop="videoContentId" class="w100">
                 <el-select
+                  @focus="getVideoData"
                   placeholder="请选择视频"
                   v-model="ruleForm.videoContentId"
                   >
@@ -109,10 +112,14 @@
                 </el-select>
               </el-form-item>
               <el-form-item></el-form-item>
-              <el-form-item label="导览音频" class="w50" prop="audioIdList" required>
+              <el-form-item label="导览音频"  prop="audioIdList" required>
+                <div style="color:red;">（可上传汉语、蒙语、藏语、维吾尔语、英语五种语言音频资料，命名方式为展板名称+语言）</div>
                 <upload-audio :fileList="ruleForm.audioList" @audioList="audioList"></upload-audio>
               </el-form-item>
               <el-form-item label="参考资料" prop="datumIdList" required>
+                <div style="color:red;">
+                  （可支持word、excel、PDF、ppt、视频类型文件及图片上传）
+                </div>
                   <upload-datum :fileList="ruleForm.datumList" @datumList="datumList"></upload-datum>
               </el-form-item>
             </el-form>
@@ -163,6 +170,7 @@ export default {
         boardCopyrightOwnerId:"",
         videoContentCopyrightOwnerId: "",
         videoContentCatId: "",
+        videoContentId:"",
         audioIdList: [],
         datumIdList: [],
         datumList:[],
@@ -205,7 +213,7 @@ export default {
       this.getVideoContentCopyrightData();
       this.getExhibitionBoardCatId();
       this.getBoardCopyrightOwnerId();
-      this.getVideoData();
+      // this.getVideoData();
       if (this.$route.query.type === "Update") {
         this.getInfo(this.$route.query.id);
       }
@@ -366,19 +374,33 @@ export default {
       }).catch(function(err) {
           console.log(err);
       });
+    },
+    // 视频版权方或视频分类发生变化时，重置视频的值
+    clearVideo(){
+      this.ruleForm.videoContentId = ''
     },
      // 获取视频列表
     getVideoData() {
-      let vm = this;
-      vm.$https({
-        url: "videoContent/getList",
-        method: "get",
-        authType: this.backToken
-      }).then(res => {
-          this.videoContentId = res.data.data;
-      }).catch(function(err) {
-          console.log(err);
-      });
+      const param = {
+        videoContentCatId:this.ruleForm.videoContentCatId,
+        videoContentCopyrightOwnerId:this.ruleForm.videoContentCopyrightOwnerId
+      }
+      if((this.ruleForm.videoContentCatId.length>0)&&(this.ruleForm.videoContentCopyrightOwnerId.length>0)){
+        let vm = this;
+        vm.$https({
+          url: "videoContent/getList",
+          method: "get",
+          authType: this.backToken
+        },
+        param).then(res => {
+            this.videoContentId = res.data.data;
+        }).catch(function(err) {
+            console.log(err);
+        });
+      }else{
+        this.videoContentId = []
+      }
+      
     },
     // 关闭
     close() {

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

@@ -485,6 +485,7 @@ export default {
       } else {
         this.checkedThing = false;
       }
+      this.getTableParam()
     },
     //
     getSelectDep2(exhibitionBoardCatIdList) {
@@ -493,11 +494,19 @@ export default {
       } else {
         this.checkedThing2 = false;
       }
-      const param = {
+      this.getTableParam()
+    },
+    // 筛选展板备选清单选项条件
+    getTableParam(){
+       const param = {
         boardCopyrightOwnerIdList: this.ruleForm.copyrightOwnerIdList,
         exhibitionBoardCatIdList: this.ruleForm.exhibitionBoardCatIdList
       };
-      this.getTableData(param);
+      if((param.boardCopyrightOwnerIdList.length>0)&&(param.exhibitionBoardCatIdList.length>0)){
+        this.getTableData(param);
+      }else{
+        this.tableData = []
+      }
     },
     // 根据展板类别，版权方获取展板备选清单
     getTableData(param, type) {

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

@@ -148,19 +148,6 @@
                     <i class="icon-table icon-disable"></i>
                   </el-button>
                 </el-tooltip>
-                
-                 <!-- <el-button
-                      type="text"
-                      style="padding:0"
-                      :disabled="scope.$index == 0"
-                      @click="moveUpward(scope.row, scope.$index)"
-                    >上移</el-button>
-                    <el-button
-                      type="text"
-                      style="padding:0"
-                      :disabled="(scope.$index + 1) == tableData.length"
-                      @click="moveDown(scope.row, scope.$index)"
-                    >下移</el-button> -->
               </div>
             </template>
           </el-table-column>

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

@@ -71,8 +71,6 @@
       </div>
       <div class="partyt-pagination">
         <el-pagination
-          small
-          background
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pageSize"

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

@@ -112,8 +112,6 @@
       </div>
       <div class="partyt-pagination">
         <el-pagination
-          small
-          background
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pageSize"

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

@@ -74,8 +74,6 @@
       </div>
       <div class="partyt-pagination">
         <el-pagination
-          small
-          background
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pageSize"