汇出

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

@@ -371,6 +371,7 @@ export default {
       )
         .then(res => {
           let data = res.data.data;
+          console.log(data,"dhwdhwid")
           vm.assetType2 = data;
         })
         .catch(function(err) {

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

@@ -15,6 +15,7 @@
               placeholder="请选择视频版权方"
               @focus="getAssetCopyrightData"
               v-model="form.videoContentCopyrightOwnerId"
+              clearable
             >
               <el-option
                 v-for="item in copyrightOwner"
@@ -29,6 +30,7 @@
               placeholder="请选择预设视频分类"
               @focus="getAssetTypeData"
               v-model="form.videoContentCatId"
+              clearable
             >
               <el-option
                 v-for="item in videoContentCat"

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

@@ -2,23 +2,43 @@
   <div class="listPage H100">
     <div class="search-container">
       <el-form :inline="true" :model="form" class="search-form" onsubmit="return false;">
-        <el-form-item label="版权方名称">
+        <el-form-item label="">
           <el-input
-            size="mini"
-            placeholder="请输入版权方名称"
-            v-model="form.name"
+            placeholder="请输入视频名称"
+            v-model="form.nameOrCode"
             @keyup.enter.native="Search"
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="版权方有效期">
-          <el-date-picker
-            v-model="value1"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
+        <el-form-item label="">
+            <el-select
+              placeholder="请选择视频版权方"
+              @focus="getAssetCopyrightData"
+              v-model="form.videoContentCopyrightOwnerId"
+              clearable
+            >
+              <el-option
+                v-for="item in copyrightOwner"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="">
+            <el-select
+              placeholder="请选择预设视频分类"
+              @focus="getAssetTypeData"
+              v-model="form.videoContentCatId"
+              clearable
+            >
+              <el-option
+                v-for="item in videoContentCat"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              ></el-option>
+            </el-select>
           </el-form-item>
         <el-form-item>
           <div class="btn-group">
@@ -47,14 +67,13 @@
         >
           <el-table-column type="selection" width="55"></el-table-column>
           <el-table-column type="index" width="120" label="序号"></el-table-column>
-          <el-table-column label="视频名称" prop="name"></el-table-column>
-          <el-table-column label="版权方" prop="copyrightOwnerName"></el-table-column>
-          <el-table-column label="视频类别" prop="createTime"></el-table-column>
+          <el-table-column label="视频名称" prop="videoContentCopyrightOwnerName"></el-table-column>
+          <el-table-column label="版权方" prop="exhibitionBoardName"></el-table-column>
+          <el-table-column label="视频类别" prop="videoContentCatName"></el-table-column>
         </el-table>
       </div>
       <div class="partyt-pagination">
         <el-pagination
-          small
           background
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
@@ -79,6 +98,8 @@ export default {
       }
     };
     return {
+      copyrightOwner:[],
+      videoContentCat:[],
       type: true,
       value1: "",
       page: { currentPage: 1, pageSize: 10, total: 0 },
@@ -87,7 +108,7 @@ export default {
       FormVisible1: false,
       formLabelWidth: "100px",
       form: {
-        name: ""
+        nameOrCode: ""
       },
       editform: {
         menuName: "",
@@ -132,6 +153,39 @@ export default {
   },
   components: {},
   methods: {
+       // 获取展板分类列表
+    getAssetCopyrightData(){
+       let vm = this;
+      vm.$https({
+        url: "copyrightOwner/getList",
+        method: "get",
+        authType: this.backToken
+      },
+      {copyrightOwnerType:'VIDEO_CONTENT'})
+        .then(res => {
+          let data = res.data.data;
+          this.copyrightOwner = data;
+        })
+        .catch(function(err) {
+          console.log(err);
+        });
+    },
+    // 获取视频分类列表
+    getAssetTypeData() {
+      let vm = this;
+      vm.$https({
+        url: "videoContentCat/getList",
+        method: "get",
+        authType: this.backToken
+      })
+        .then(res => {
+          let data = res.data.data;
+          this.videoContentCat = data;
+        })
+        .catch(function(err) {
+          console.log(err);
+        });
+    },
     // 渲染父级权限
     getPermis() {
       let vm = this;
@@ -162,7 +216,7 @@ export default {
       let vm = this;
       vm.$https(
         {
-          url: "videoContentCat/getPageList",
+          url: "asset/getPageList",
           method: "post",
           authType: this.backToken
         },
@@ -192,7 +246,6 @@ export default {
     },
     // 重置
     Reset(){
-      // this.$refs["form"].resetFields();
       this.form = {}
       this.Search()
     },
@@ -202,7 +255,9 @@ 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
       };
       this.getTableData(searchObj);
     },
@@ -234,11 +289,11 @@ export default {
         _this.selection.forEach(function(e) {
           arr.push(e.id);
         });
-        // str = arr.join(",");
-        str = arr;
+        str = arr.join(",");
+        // str = arr;
       } else {
-        // str = "";
-        str = [];
+        str = "";
+        // str = [];
       }
       return str;
     },
@@ -249,31 +304,36 @@ export default {
       //   console.log(str)
       if (str.length > 0) {
         console.log(str);
-        // _this.$https({
-        //     url: "menu/batchDel?menuIds=" + str,
-        //     method: "post",
-        //     authType: this.backToken
-        //   })
-        //   .then(
-        //     res => {
-        //       if (res.data.status == 201 || res.data.status == 200) {
-        //         var reader = new FileReader();
-        //         reader.readAsDataURL(blob); // 转换为base64，可以直接放入a表情href
-        //         reader.onload = function(e) {
-        //           var a = document.createElement("a");
-        //           a.download =
-        //             genUUID() + (batchno !== "" ? "_" + batchno : "") + ".zip"; //下载文件名
-        //           a.href = e.target.result;
-        //           $("body").append(a); // 修复firefox中无法触发click
-        //           a.click();
-        //           $(a).remove();
-        //         };
-        //       }
-        //       //重新查询数据
-        //       _this.onSearch();
-        //     },
-        //     error => {}
-        //   );
+        _this.$https({
+            url: "asset/download",
+            method: "get",
+            authType: this.backToken
+          },
+          {idList:str}
+          )
+          .then(
+            res => {
+                const blob = new Blob([res.data], {
+            type:
+              "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'"
+          })
+          const downloadElement = document.createElement('a')
+          const contentDisposition = res.headers['content-disposition']
+          const patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*')
+          const result = patt.exec(contentDisposition)
+          const filename = decodeURI(result[1])
+          const href = window.URL.createObjectURL(blob) // 创建下载的链接
+          downloadElement.href = href
+          downloadElement.download = filename // 下载后文件名
+          document.body.appendChild(downloadElement)
+          downloadElement.click() // 点击下载
+          document.body.removeChild(downloadElement) // 下载完成移除元素
+          window.URL.revokeObjectURL(href) // 释放blob对象
+          
+            
+            },
+            error => {}
+          );
       } else {
         this.$message({
           type: "info",