diff --git a/src/page/STB/base/index.vue b/src/page/STB/base/index.vue
index b00604e58d9900157573b22ca650d6f690740154..20ad83c68f5cafa4440f0f9ba2e7b0dee7c7dbe3 100644
--- a/src/page/STB/base/index.vue
+++ b/src/page/STB/base/index.vue
@@ -14,6 +14,7 @@
         </el-form-item>
         <el-form-item>
           <el-cascader
+            placeholder="请选择区域"
             v-model="form.areaId"
             :options="areaOptions"
             :props="defaultProps"
diff --git a/src/page/STB/operation/index.vue b/src/page/STB/operation/index.vue
index c1d08b57972fe3909f05d25b5351bf8ad44af315..df8d046563c34068bbbfb2eb6d01c194bee29df3 100644
--- a/src/page/STB/operation/index.vue
+++ b/src/page/STB/operation/index.vue
@@ -24,6 +24,7 @@
         </el-form-item>
         <el-form-item>
           <el-cascader
+            placeholder="请选择区域"
             v-model="form.areaId"
             :options="areaOptions"
             :props="defaultProps"
diff --git a/src/page/content/components/uploadVue/uploadImg.vue b/src/page/content/components/uploadVue/uploadImg.vue
index 0584214c4a6d80581182dbc7500776216eff21fd..92334bfd52375ba93be574e6c1bee8585a5f59a2 100644
--- a/src/page/content/components/uploadVue/uploadImg.vue
+++ b/src/page/content/components/uploadVue/uploadImg.vue
@@ -1,6 +1,8 @@
 <template>
   <div>
     <el-upload
+      accept=".jpg,.jpeg,.png.JPG,.JPEG,.PNG"
+      :class="{disabled:uploadDisabled}"
       action="http://111.203.232.175:8088/mall/file/image/upload"
       list-type="picture-card"
       :on-preview="handlePictureCardPreview"
@@ -12,6 +14,7 @@
       :multiple ="false"
     >
       <i class="el-icon-plus"></i>
+      <div slot="tip" class="el-upload__tip color_red">只能上传.jpg/.jpeg/.png文件</div>
     </el-upload>
     <el-dialog :visible.sync="dialogVisible">
       <img width="100%" :src="dialogImageUrl" alt />
@@ -31,6 +34,7 @@ export default {
     return {
       dialogImageUrl: "",
       dialogVisible: false,
+      imageUrl:""
     };
   },
   computed: {
@@ -39,6 +43,9 @@ export default {
         Authorization: localStorage.getItem("backToken") || "",
       };
     },
+    uploadDisabled:function() {
+        return this.imageUrl !== ''
+    },
   },
   methods: {
     // 图片上传成功的返回值
@@ -52,6 +59,7 @@ export default {
     },
     handleRemove(file, fileList) {
       this.$emit("imgUrl", "");
+      this.imageUrl=""
     },
     handlePictureCardPreview(file) {
       this.dialogImageUrl = file.url;
@@ -68,9 +76,17 @@ export default {
 };
 </script>
 
-<style>
+<style lang="less">
 .avatar {
   width: 100%;
   height: 100%;
 }
+.color_red{
+  color:red;
+}
+
+.disabled .el-upload--picture-card {
+    display: none;
+}
+
 </style>
diff --git a/src/page/content/components/uploadVue/uploadQrcode.vue b/src/page/content/components/uploadVue/uploadQrcode.vue
index 702bced4b4e63e70a1174a8eb7811991e0d320f8..4cae987e5324726869ab104050af7ffdbec2c56d 100644
--- a/src/page/content/components/uploadVue/uploadQrcode.vue
+++ b/src/page/content/components/uploadVue/uploadQrcode.vue
@@ -1,6 +1,8 @@
 <template>
   <div>
     <el-upload
+      accept=".jpg,.jpeg,.png,.JPG,.JPEG,.PBG"
+      :class="{disabled:uploadDisabled}"
       action="http://111.203.232.175:8088/mall/file/image/upload"
       list-type="picture-card"
       :on-preview="handlePictureCardPreview"
@@ -12,6 +14,7 @@
       :multiple ="false"
     >
       <i class="el-icon-plus"></i>
+      <div slot="tip" class="el-upload__tip color_red">只能上传.jpg/.jpeg/.png文件</div>
     </el-upload>
     <el-dialog :visible.sync="dialogVisible">
       <img width="100%" :src="dialogImageUrl" alt />
@@ -35,26 +38,38 @@ export default {
   data() {
     return {
       dialogImageUrl: "",
-      dialogVisible: false
+      dialogVisible: false,
+      imageUrl:""
     };
   },
    computed: {
     headers() {
     //   return { 'token': this.backToken }
     return {'Authorization':localStorage.getItem('backToken')}
-    }
+    },
+     uploadDisabled:function() {
+        return this.imageUrl !== ''
+    },
   },
   methods: {
     // 图片上传成功的返回值
     handleAvatarSuccess(res, file) {
-        console.log(res)
-        // console.log(res.url)
-        console.log(res.data.url)
-        this.$emit('qrcodeUrl', res.data.url)
-        // this.imageUrl = URL.createObjectURL(file.raw);
+  
+        // this.$emit('qrcodeUrl', res.data.url)
+
+         if (res.resultCode == 200) {
+         this.$emit('qrcodeUrl', res.data.url)
+
+        this.imageUrl = res.data.url;
+      } else {
+        this.$message.error(res.message);
+      }
+       
     },
     handleRemove(file, fileList) {
       console.log(file, fileList);
+      this.$emit("qrcodeUrl", "");
+      this.imageUrl=""
     },
     handlePictureCardPreview(file) {
       this.dialogImageUrl = file.url;
@@ -65,4 +80,11 @@ export default {
 </script>
 
 <style>
+.color_red{
+  color:red;
+}
+
+.disabled .el-upload--picture-card {
+    display: none;
+}
 </style>
diff --git a/src/page/content/display/classify/index.vue b/src/page/content/display/classify/index.vue
index 2acbd666db3d9f695fd50b12cd9c8446d9d0c4d5..e5b412790687a32c8b55d86c87d34d723c4322da 100644
--- a/src/page/content/display/classify/index.vue
+++ b/src/page/content/display/classify/index.vue
@@ -93,7 +93,7 @@
     </div>
     <!--新增弹框-->
     <el-dialog
-      :title="type?'新建版权方':'编辑版权方'"
+      :title="type?'新建展板分类':'编辑展板分类'"
       custom-class="party-dialog"
       width="468px"
       :visible.sync="FormVisible"
diff --git a/src/page/content/display/content/add.vue b/src/page/content/display/content/add.vue
index a229573ca6399e8c11702b5d7561695f6771c5c1..18bed2b668425f1c70081d259552ae832680f92b 100644
--- a/src/page/content/display/content/add.vue
+++ b/src/page/content/display/content/add.vue
@@ -120,11 +120,11 @@
                 </el-select>
               </el-form-item>
               <el-form-item></el-form-item>
-              <el-form-item label="导览音频"  prop="audioIdList" required>
+              <el-form-item label="导览音频"  prop="audioIdList" >
                 <div style="color:red;">（可上传汉语、蒙语、藏语、维吾尔语、英语五种语言音频资料，命名方式为展板名称+语言）</div>
                 <upload-audio :fileList="ruleForm.audioList" @audioList="audioList"></upload-audio>
               </el-form-item>
-              <el-form-item label="参考资料" prop="datumIdList" required>
+              <el-form-item label="参考资料" prop="datumIdList" >
                 <div style="color:red;">
                   （可支持word、excel、PDF、ppt、视频类型文件及图片上传）
                 </div>
@@ -225,6 +225,7 @@ export default {
       // this.getVideoData();
       if (this.$route.query.type === "Update") {
         this.getInfo(this.$route.query.id);
+       
       }
     },
     // 更换展板版权方，展板分类清空
@@ -265,7 +266,10 @@ export default {
             imageList:[{url:data.cover}],
             qrcodeList:[{url:data.qrcodeUrl}]
           }
-          console.log(this.ruleForm)
+          // console.log(this.ruleForm)
+        this.getVideoContentCatData();
+        this.getExhibitionBoardCatId();
+        this.getVideoData();
       }).catch(function(err) {
           console.log(err);
       });
diff --git a/src/page/content/display/content/index.vue b/src/page/content/display/content/index.vue
index 4428c3a05957aeeb66c110eeb2a064fa6fa3497f..d2a45e9df56cd4ddb052e2fd9f04753435dfb880 100644
--- a/src/page/content/display/content/index.vue
+++ b/src/page/content/display/content/index.vue
@@ -50,7 +50,7 @@
       </el-form>
       <div class="page-tip">
         <span class="page-tip-title">页面说明:</span>
-        <span class="page-tips">可通过展板名称、创建时间对展板信息进行快速检索。可对展板进行上架、下架、删除、修改及查看展板详情等操作。其中已上架的展板不能被删除。</span>
+        <span class="page-tips">可通过展板名称、创建时间对展板信息进行快速检索。可对展板进行上架、下架、删除、修改及查看展板详情等操作。已上架展板需先下架才能删除。</span>
       </div>
     </div>
     <div class="table-content">
@@ -302,14 +302,14 @@ export default {
                 //   des: `申请已提交，待审核…`,
                 // };
                  if(res.data.resultCode === "200"){
+                   
                    if(_isPublish){
                      this.$message({ type: "success", message: "上架申请已提交,待审核！" });
+                    
                    }else{
                      this.$message({ type: "success", message: "下架申请已提交,待审核！" });
                    }
-                   
-                
-                _this.Search();
+                    _this.onSearch();
               }else{
                 this.$message({ type: "error", message: res.data.message });
               }
diff --git a/src/page/content/learn/content/add.vue b/src/page/content/learn/content/add.vue
index 9251f0c8316f3d8d28f4e3206bdd144a37fb186d..9546c8345e92a76ae2135342d7b236dfb49acd5d 100644
--- a/src/page/content/learn/content/add.vue
+++ b/src/page/content/learn/content/add.vue
@@ -318,6 +318,7 @@ export default {
           this.multipleSelection = data.exhibitionBoardList;
           this.$refs.uploadImg.showImg(this.ruleForm.cover);
           this.getExhibitionBoardTable();
+          this.getAssetTypeData()
         })
         .catch(function(err) {
           console.log(err);
@@ -352,7 +353,7 @@ export default {
         url: "exhibitionBoardCat/getList",
         method: "post",
         authType: this.backToken
-      },{copyrightOwnerId:this.ruleForm.exhibitionBoardCatIdList.toString})
+      },this.$qs.stringify({copyrightOwnerId:this.ruleForm.copyrightOwnerIdList.toString()}))
         .then(res => {
           let data = res.data.data;
           vm.videoContentCat = data;
@@ -497,7 +498,7 @@ export default {
       } else {
         this.checkedThing2 = false;
       }
-      this.getTableParam()
+      // this.getTableParam()
     },
     // 筛选展板备选清单选项条件
     getTableParam(){
diff --git a/src/page/content/learn/project/index.vue b/src/page/content/learn/project/index.vue
index ac14844cb10b9112e36e6bac8ce09ff4ab4c635c..d586cce1a1139dc605b7587fe76f8e641603bf81 100644
--- a/src/page/content/learn/project/index.vue
+++ b/src/page/content/learn/project/index.vue
@@ -80,7 +80,6 @@
       </div>
       <div class="partyt-pagination">
         <el-pagination
-          background
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pageSize"
diff --git a/src/page/content/video/content/add.vue b/src/page/content/video/content/add.vue
index 55e7c66915700a4ce9ed20b659a82392361c0e58..8615242017dbc25b3e157b3c61816ed9a8f59dbd 100644
--- a/src/page/content/video/content/add.vue
+++ b/src/page/content/video/content/add.vue
@@ -238,8 +238,8 @@ export default {
     init() {
       if (this.$route.query.type === "Update") {
         this.getInfo(this.$route.query.id);
-        this.getVideoContentCatData()
-        this.getVideoContentCopyrightData()
+        
+
       }
     },
     getVideoContentCat(data){
@@ -267,6 +267,8 @@ export default {
           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}})
+          this.getVideoContentCatData()
+          this.getVideoContentCopyrightData()
       }).catch(function(err) {
           console.log(err);
       });
@@ -393,15 +395,20 @@ export default {
     // 获取视频分类列表
     getVideoContentCatData() {
       let vm = this;
-      vm.$https({
+      if(this.ruleForm.videoContentCopyrightOwnerId){
+         vm.$https({
         url: "videoContentCat/getList",
         method: "get",
         authType: this.backToken
-      }).then(res => {
+      },{copyrightOwnerId:this.ruleForm.videoContentCopyrightOwnerId}).then(res => {
           this.videoContentCat = res.data.data;
       }).catch(function(err) {
           console.log(err);
       });
+      }else{
+        this.$message.warning("请先选择视频版权方！")
+      }
+     
     },
     getSelectDep(videoContentCatIdList) {
       this.checkedThing = videoContentCatIdList.length === this.videoContentCat.length;
diff --git a/src/page/content/video/content/index.vue b/src/page/content/video/content/index.vue
index 7867275ca08a3d11af6007d9a621f498d5683891..819340781f3eeeebd88bf33976c640e4c1c3d099 100644
--- a/src/page/content/video/content/index.vue
+++ b/src/page/content/video/content/index.vue
@@ -4,8 +4,8 @@
       <el-form :inline="true" :model="form" class="search-form" onsubmit="return false;">
         <el-form-item label="">
           <el-input
-            placeholder="请输入版权方名称"
-            v-model="form.name"
+            placeholder="请输入视频名称"
+            v-model="form.nameOrCode"
             @keyup.enter.native="Search"
             clearable
           ></el-input>
@@ -104,7 +104,7 @@
                     <i class="icon-table icon-del"></i>
                   </el-button>
                 </el-tooltip>
-                <el-tooltip content="详情" placement="top">
+                <el-tooltip content="审核详情" placement="top">
                   <el-button circle @click="openDetails(scope.row)">
                     <i class="icon-table icon-detail"></i>
                   </el-button>
@@ -389,7 +389,7 @@ export default {
       let searchObj = {
         _index: 1,
         _size: _this.page.pageSize,
-        name: _this.form.name,
+        nameOrCode: _this.form.nameOrCode,
         videoContentCatId:_this.form.videoContentCatId,
         videoContentCopyrightOwnerId:_this.form.videoContentCopyrightOwnerId
       };
diff --git a/src/page/content/video/remit/index.vue b/src/page/content/video/remit/index.vue
index e8c1e8a57e8807d0cc30e2c72c4e427e9a9e4dd1..fdc390fefe21381e489492a7a53d5e916f54c54a 100644
--- a/src/page/content/video/remit/index.vue
+++ b/src/page/content/video/remit/index.vue
@@ -49,7 +49,7 @@
       </el-form>
       <div class="page-tip">
         <span class="page-tip-title">页面说明:</span>
-        <span class="page-tips">可使用版权方、视频分类、视频名称模糊搜索对需要汇出的视频进行快速检索，选定视频后将视频汇出到指定U盘。</span>
+        <span class="page-tips">可使用版权方、视频分类、视频名称模糊搜索对需要汇出的视频进行快速检索，下载至本地。</span>
       </div>
     </div>
     <div class="table-content">