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

src/config/menu.js

@@ -26,7 +26,7 @@ export const menuList = [
                 url: '',
                 children: [
                     { name: '版权方管理', icon: 'icon-copyrights', color: 'index-red', avatar: '', url: '/videoCopyright' },
-                    { name: '分类管理', icon: 'icon-classify', color: 'index-blue', avatar: '', url: '/videoclassifyify' },
+                    { name: '分类管理', icon: 'icon-classify', color: 'index-blue', avatar: '', url: '/videoclassify' },
                     { name: '内容管理', icon: 'icon-content', color: 'index-green', avatar: '', url: '/videoContent' },
                     { name: '视频汇出', icon: 'icon-plane', color: 'index-purple', avatar: '', url: '/videoRemit' },
                 ]

src/page/STB/base/index.vue

@@ -30,7 +30,7 @@
       <div class="page-tip">
         <span class="page-tip-title">页面说明:</span>
         <span class="page-tips"
-          >可按照账号状态及所属单位进行信息筛选。可新增机顶盒账号，“*”为必填项。请先创建单位管理员账号，否则机顶盒无法激活</span
+          >机顶盒账号为机顶盒所属单位名称，新建后生成6位数字及字母的随机密码，作为机顶盒的登录密码。</span
         >
       </div>
     </div>

src/page/STB/interactive/index.vue

@@ -36,7 +36,7 @@
         <div class="page-tip">
           <span class="page-tip-title">页面说明:</span>
           <span class="page-tips"
-            >可按照账号状态及所属单位进行信息筛选。可新增机顶盒账号，“*”为必填项。请先创建单位管理员账号，否则机顶盒无法激活</span
+            >可查看某个组织机构的互动信息</span
           >
         </div>
       </div>
@@ -224,6 +224,7 @@ export default {
     display: flex;
     font-size: 14px;
     color: #333333;
+    line-height: 30px;
     .page-tip-title {
       font-weight: bold;
       padding-right: 10px;
@@ -254,7 +255,7 @@ export default {
       color: #333;
     }
     .page-tips {
-      width: 500px;
+      width: 220px;
     }
   }
   .content-item {

src/page/check/learn/details.vue

@@ -3,6 +3,21 @@
     <div class="info-header">学习内容详情</div>
     <div class="info-container">
       <div class="info-wrapper">
+         <el-form
+              class="demo-form-inline"
+              :inline="true"
+              :model="formInline"
+              label-position="top"
+            >
+             <el-form-item label="学习内容名称" class="w50">
+                xxxxxxx
+                <!-- <el-input v-model="formInline.user" placeholder="审批人"></el-input> -->
+              </el-form-item>
+              <el-form-item label="学习内容宣传图" class="w50">
+                <img class="imgSize" src alt />
+              </el-form-item>
+            
+            </el-form>
         <el-collapse v-model="activeNames" @change="handleChange">
           <el-collapse-item title="建党伟业" name="1">
             <el-form
@@ -71,7 +86,46 @@ export default {
       }
     };
   },
+  mounted(){
+    this.init()
+  },
   methods: {
+        init() {
+        this.getInfo(this.$route.query.id);
+    },
+      //  获取版权方详情
+    getInfo(id) {
+      let vm = this;
+      vm.$https(
+        {
+          url: "learningContent/get/" + id,
+          method: "get",
+          authType: this.backToken
+        }
+        // param
+      )
+        .then(res => {
+          let data = res.data.data;
+          this.ruleForm = data;
+          console.log(this.ruleForm)
+          // this.ruleForm = {
+          //   name :data.name,
+          //   applicableScope:data.applicableScope,
+          //   copyrightOwnerIdList:data.copyrightOwnerIdList,
+          //   cover:data.cover,
+          //   learningProjectId:data.learningProjectId,
+          //   exhibitionBoardCatIdList:data.exhibitionBoardCatIdList,
+          //   id:data.id,
+          //   exhibitionBoardIdList:data.exhibitionBoardIdList,
+          // }
+          this.tableData = data.exhibitionBoardList
+          // this.multipleSelection = data.exhibitionBoardList
+          
+        })
+        .catch(function(err) {
+          console.log(err);
+        });
+    },
     close() {
       history.go(-1);
     },

src/page/check/video/index.vue

@@ -10,6 +10,14 @@
             @keyup.enter.native="Search"
             clearable
           ></el-input>
+        </el-form-item>
+          <el-form-item >
+          <el-select v-model="form.status" placeholder="请选择审核状态">
+            <el-option label="待初审" value="TBC"></el-option>
+            <el-option label="已驳回" value="REFUSED"></el-option>
+            <el-option label="待复审" value="TBCA"></el-option>
+            <el-option label="通过" value="APPROVED_FINAL"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item>
           <div class="btn-group">
@@ -20,7 +28,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">
@@ -37,9 +45,17 @@
         >
         <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="userName"></el-table-column>
             <el-table-column label="提交日期" prop="createTime"></el-table-column>
-            <el-table-column label="审核项" prop="remarks"></el-table-column>
+            <el-table-column label="审核项" prop="operation"></el-table-column>
+             <el-table-column label="审核状态" prop="status">
+              <template slot-scope="scope">
+                <span v-if="scope.row.status === 'TBC'">待初审</span>
+                <span v-else-if="scope.row.status === 'REFUSED'">已驳回</span>
+                <span v-else-if="scope.row.status === 'TBCA'">待复审</span>
+                <span v-else-if="scope.row.status === 'APPROVED_FINAL'">通过</span>
+              </template>
+            </el-table-column>
             <el-table-column label="操作" header-align="center" align="center">
               <template slot-scope="scope" width="220">
                 <el-button-group>
@@ -162,6 +178,9 @@
 </template>
 <script>
 export default {
+  components: {
+   
+  },
   data() {
     var checkIsNull = (rule, value, callback) => {
       if (value) {
@@ -181,7 +200,8 @@ export default {
       FormVisible1: false,
       formLabelWidth: "100px",
       form: {
-        name: ""
+        name: "",
+        type:'VIDEO_CONTENT'
       },
       editform: {
         menuName: "",
@@ -256,12 +276,12 @@ export default {
       let vm = this;
       vm.$https(
         {
-          url: "assetType/getPageList",
-          method: "post",
+          url: "audit/getPageAllList",
+          method: "get",
           authType: this.backToken
         },
-        vm.$qs.stringify(param)
-        // param
+        // vm.$qs.stringify(param)
+        param
       )
         .then(res => {
           let data = res.data.data;
@@ -290,14 +310,16 @@ export default {
       let searchObj = {
         _index: 1,
         _size: _this.page.pageSize,
-        name: _this.form.name
+        name: _this.form.name,
+        status:_this.form.status,
+        type:'VIDEO_CONTENT'
       };
       this.getTableData(searchObj);
     },
     // 重置
     Reset(){
       // this.$refs["form"].resetFields();
-      this.form = {}
+      this.form = {type:"VIDEO_CONTENT"}
       this.Search()
     },
     // // 获取当前查询参数
@@ -328,7 +350,7 @@ export default {
         if (valid) {
           _this
             .$https(
-              { url: "assetType/save", method: "post", authType: this.backToken },
+              { url: "videoContentCat/save", method: "post", authType: this.backToken },
               // _this.$qs.stringify(_this.classForm)
               _this.classForm
             )
@@ -370,7 +392,7 @@ export default {
         if (valid) {
           _this
             .$https(
-              { url: "assetType/update", method: "put", authType: this.backToken },
+              { url: "videoContentCat/update", method: "put", authType: this.backToken },
               _this.$qs.stringify(_this.classForm)
               // _this.classForm
             )
@@ -445,7 +467,7 @@ export default {
       let vm = this;
       vm.$https(
         {
-          url: "assetType/get/" + id,
+          url: "videoContentCat/get/" + id,
           method: "get",
           authType: this.backToken
         },
@@ -478,7 +500,7 @@ export default {
         .then(() => {
           _this.$https({
             method: 'delete',
-            url: 'assetType/delete/'+ row.id,
+            url: 'videoContentCat/delete/'+ row.id,
             authType: this.backToken
           }).then((res) => {
               this.$message({type: 'success', message: '删除成功!'});

src/page/content/components/audioPlay.vue

+
+<template>
+  <el-row style="background: #000;">
+    <audio ref="audio" :src="music_path" loop="loop">
+      <!--                <source src="" type="audio/wav">-->
+      <!--                <source src="" type="audio/mpeg">-->
+      <!--                <source src="http://sc1.111ttt.cn/2018/1/03/13/396131232171.mp3" type="audio/mpeg">-->
+      <!--                controls  class="btn-audio"-->
+      <!--<source :src="recordUrl" type="audio/mpeg">-->
+    </audio>
+    <button type="button" @click="reloadYP">{{buttonText}}</button>
+  </el-row>
+ 
+ 
+</template>
+<style></style>
+<script>
+ // import fngmp3 from "@/assets/mp3/fng.mp3";
+ 
+  export default {
+    data () {
+      return {
+        msg: 'vue模板页',
+        buttonText:'stop',
+        music_path: 'http://sc1.111ttt.cn/2018/1/03/13/396131229550.mp3',
+      }
+    },
+    mounted: function(){
+ 
+      this.reloadYP();
+    },
+    methods: {
+      reloadYP () {
+        this.$refs.audio.src = 'http://sc1.111ttt.cn/2018/1/03/13/396131232171.mp3';
+        //this.$refs.audio.src = fngmp3;
+        console.log(this.music_path);
+        console.log('hello');
+        // this.music_path = 'http://sc1.111ttt.cn/2018/1/03/13/396131232171.mp3';
+        if (this.is_play) {
+          this.$refs['audio'].pause();
+          this.is_play = false
+          this.buttonText = 'stopped'
+        } else {
+          this.$refs['audio'].play();
+          this.is_play = true
+          this.buttonText = 'starting'
+        }
+      },
+ 
+    }
+  }
+</script>

src/page/content/components/dialog/addCopyright.vue

@@ -6,6 +6,7 @@
     width="468px"
     :visible.sync="dialogVisible"
     :before-close="close"
+    
   >
     <div class="dialog-content">
       <el-form
@@ -14,11 +15,8 @@
         ref="ruleForm"
         label-width="140px"
         class="party-form form-inline"
+        label-position="top"
       >
-        <el-form-item
-          label="页面说明："
-          class="addTipMsg"
-        >可新建版权方信息。“*”为必填项。预设视频分类中没有合适的选项，可点击“新建视频分类”在弹框中新建分类</el-form-item>
         <el-form-item label="版权方名称" prop="name">
           <el-input v-model="ruleForm.name"></el-input>
         </el-form-item>
@@ -32,10 +30,6 @@
             end-placeholder="结束日期"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item class="addTip">
-          <span>若没有相应的视频分类，请点击</span>
-          <el-button type="text" @click="addVideoClass">新建视频分类</el-button>
-        </el-form-item>
         <el-form-item class="selectH100" label="请选择预设视频分类">
           <el-select
             placeholder="请选择预设视频分类"
@@ -45,7 +39,7 @@
             @change="getSelectDep"
           >
             <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
-            <el-option v-for="item in assetType" :label="item.name" :value="item.id" :key="item.id"></el-option>
+            <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 label="备注">
@@ -64,17 +58,18 @@
 export default {
   data() {
     return {
+      dialogVisible:true,
       ruleForm: {
         assetTypeIdList: [],
         name: "",
-        ownerType: "ASSET"
+        ownerType: "VIDEO_CONTENT"
       },
             ruleForm: {
         assetTypeIdList: [],
         name: "",
-        ownerType: "ASSET"
+        ownerType: "VIDEO_CONTENT"
       },
-      assetType: [
+      videoContentCat: [
         {
           value: "Beijing",
           label: "北京"
@@ -136,7 +131,7 @@ export default {
         if (valid) {
           this.$https(
             {
-              url: "assetType/save",
+              url: "videoContentCat/save",
               method: "post",
               authType: this.backToken
             },
@@ -171,13 +166,13 @@ export default {
     getAssetTypeData() {
       let vm = this;
       vm.$https({
-        url: "assetType/getList",
+        url: "videoContentCat/getList",
         method: "get",
         authType: this.backToken
       })
         .then(res => {
           let data = res.data.data;
-          this.assetType = data;
+          this.videoContentCat = data;
           // this.value1[0]=data.expireDateEnd
           //this.value1[1]=data.expireDateStart
         })
@@ -186,7 +181,7 @@ export default {
         });
     },
     getSelectDep(assetTypeIdList) {
-      if (assetTypeIdList.length === this.assetType.length) {
+      if (assetTypeIdList.length === this.videoContentCat.length) {
         this.checkedThing = true;
       } else {
         this.checkedThing = false;
@@ -196,7 +191,7 @@ export default {
       // debugger
       this.ruleForm.assetTypeIdList = [];
       if (this.checkedThing) {
-        this.assetType.map(item => {
+        this.videoContentCat.map(item => {
           this.ruleForm.assetTypeIdList.push(item.id);
         });
       } else {

src/page/content/components/dialog/videoDialog.vue

+<template>
+  <!--新增弹框-->
+  <el-dialog
+    custom-class="party-dialog"
+    title="视频详情"
+    width="80%"
+    :visible.sync="dialogVisible"
+    :before-close="close"
+    
+  >
+    <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" -->
+      <video    :preload="preload"
+              :poster="videoImg" :height="height" :width="width" align="center" :controls="controls"  :autoplay="autoplay">
+        <source :src="videoSrc" type="video/mp4">
+      </video>
+    </div>
+    <!-- <div slot="footer" class="dialog-footer btn-group">
+      <el-button size="mini" type="primary" @click="close">关闭</el-button>
+    </div> -->
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      dialogVisible:true,
+      videoSrc: 'https://video.pearvideo.com/mp4/short/20200209/cont-1650197-14888002-hd.mp4',
+      videoImg: 'https://sm.ms/image/ueRFCZfk2xTONGb',
+      playStatus: '',
+      muteStatus: '',
+      isMute: true,
+      isPlay: false,
+      width: '820', // 设置视频播放器的显示宽度（以像素为单位）
+      height: '500', // 设置视频播放器的显示高度（以像素为单位）
+      preload: 'auto', //  建议浏览器是否应在<video>加载元素后立即开始下载视频数据。
+      controls: true, // 确定播放器是否具有用户可以与之交互的控件。没有控件，启动视频播放的唯一方法是使用autoplay属性或通过Player API。
+      autoplay: ''
+    }
+  },
+  methods: {
+   
+    // 新增关闭
+    close() {
+      this.dialogVisible = false;
+
+    },
+   
+  }
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file

src/page/content/components/mulClassify/mulDisplay.vue

@@ -7,7 +7,7 @@
     @change="getSelectDep"
   >
     <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
-    <el-option v-for="item in assetType" :label="item.name" :value="item.id" :key="item.id"></el-option>
+    <el-option v-for="item in videoContentCat" :label="item.name" :value="item.id" :key="item.id"></el-option>
   </el-select>
 </template>
 
@@ -15,7 +15,7 @@
 export default {
   data() {
     return {
-      assetType: [],
+      videoContentCat: [],
       assetTypeIdList: [],
       checkedThing: false,
       selfstyle: {
@@ -32,7 +32,7 @@ export default {
     }
   },
   methods: {
-    // this.$refs.mulDisplay.assetType	// 使用时父组件直接获取此值即可
+    // this.$refs.mulDisplay.videoContentCat	// 使用时父组件直接获取此值即可
     // 获取视频版权方
     getAssetTypeData() {
       let vm = this;
@@ -42,11 +42,11 @@ export default {
         authType: this.backToken
       },
       // _this.$qs.stringify(_this.permisform)
-      {copyrightOwnerType:'ASSET'}
+      {copyrightOwnerType:'VIDEO_CONTENT'}
       )
         .then(res => {
           let data = res.data.data;
-          this.assetType = data;
+          this.videoContentCat = data;
           // this.value1[0]=data.expireDateEnd
           //this.value1[1]=data.expireDateStart
         })
@@ -55,7 +55,7 @@ export default {
         });
     },
     getSelectDep(assetTypeIdList) {
-      if (assetTypeIdList.length === this.assetType.length) {
+      if (assetTypeIdList.length === this.videoContentCat.length) {
         this.checkedThing = true;
       } else {
         this.checkedThing = false;
@@ -66,7 +66,7 @@ export default {
       // debugger
       this.assetTypeIdList = [];
       if (this.checkedThing) {
-        this.assetType.map(item => {
+        this.videoContentCat.map(item => {
           this.assetTypeIdList.push(item.id);
         });
       } else {

src/page/content/components/mulClassify/mulVideo.vue

@@ -7,7 +7,7 @@
     @change="getSelectDep"
   >
     <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
-    <el-option v-for="item in assetType" :label="item.name" :value="item.id" :key="item.id"></el-option>
+    <el-option v-for="item in videoContentCat" :label="item.name" :value="item.id" :key="item.id"></el-option>
   </el-select>
 </template>
 
@@ -15,7 +15,7 @@
 export default {
   data() {
     return {
-      assetType: [],
+      videoContentCat: [],
       assetTypeIdList: [],
       checkedThing: false,
       selfstyle: {
@@ -26,18 +26,18 @@ export default {
     };
   },
   methods: {
-    // this.$refs.mulDisplay.assetType	// 使用时父组件直接获取此值即可
+    // this.$refs.mulDisplay.videoContentCat	// 使用时父组件直接获取此值即可
     // 获取视频分类列表
     getAssetTypeData() {
       let vm = this;
       vm.$https({
-        url: "assetType/getList",
+        url: "videoContentCat/getList",
         method: "get",
         authType: this.backToken
       })
         .then(res => {
           let data = res.data.data;
-          this.assetType = data;
+          this.videoContentCat = data;
           // this.value1[0]=data.expireDateEnd
           //this.value1[1]=data.expireDateStart
         })
@@ -46,7 +46,7 @@ export default {
         });
     },
     getSelectDep(assetTypeIdList) {
-      if (assetTypeIdList.length === this.assetType.length) {
+      if (assetTypeIdList.length === this.videoContentCat.length) {
         this.checkedThing = true;
       } else {
         this.checkedThing = false;
@@ -57,7 +57,7 @@ export default {
       // debugger
       this.assetTypeIdList = [];
       if (this.checkedThing) {
-        this.assetType.map(item => {
+        this.videoContentCat.map(item => {
           this.assetTypeIdList.push(item.id);
         });
       } else {

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

@@ -23,10 +23,12 @@
     },
     methods: {
     handleAvatarSuccess(res, file) {
-        console.log(res)
-        console.log(res.url)
-        this.$emit('videoList', res.urlList)
-       
+      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();

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

@@ -32,9 +32,11 @@ export default {
   methods: {
     // 图片上传成功的返回值
     handleAvatarSuccess(res, file) {
+  
         console.log(res)
-        console.log(res.url)
-        this.$emit('imgUrl', res.url)
+        console.log(res.data.url)
+        this.$emit('imgUrl', res.data.url)
+        // console.log(data.fileList[0].url)
         // this.imageUrl = URL.createObjectURL(file.raw);
     },
     handleRemove(file, fileList) {

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

@@ -34,7 +34,7 @@ export default {
     handleAvatarSuccess(res, file) {
         console.log(res)
         console.log(res.url)
-        this.$emit('qrcodeUrl', res.url)
+        this.$emit('qrcodeUrl', res.data.url)
         // this.imageUrl = URL.createObjectURL(file.raw);
     },
     handleRemove(file, fileList) {

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

@@ -125,7 +125,7 @@ export default {
        let vm = this;
       vm.$https(
         {
-          url: "asset/dddddgetPageList",
+          url: "videoContent/dddddgetPageList",
           method: "post",
           authType: this.backToken
         },

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

@@ -93,7 +93,7 @@
                   @change="getAssetType"
                 >
                   <el-option
-                    v-for="item in assetType"
+                    v-for="item in videoContentCat"
                     :label="item.name"
                     :value="item.id"
                     :key="item.id"
@@ -178,7 +178,7 @@ export default {
         assetTypeId: "",
         videoUrlList: []
       },
-      assetType: [
+      videoContentCat: [
         {
           value: "Beijing",
           label: "北京"
@@ -314,7 +314,7 @@ export default {
         if (valid) {
           this.$https(
             {
-              url: "assetType/save",
+              url: "videoContentCat/save",
               method: "post",
               // headers: {
               //   'Content-Type': 'application/json'
@@ -406,7 +406,7 @@ export default {
           method: "get",
           authType: this.backToken
         },
-        { copyrightOwnerType: "ASSET" }
+        { copyrightOwnerType: "VIDEO_CONTENT" }
       )
         .then(res => {
           let data = res.data.data;
@@ -456,13 +456,13 @@ export default {
     getAssetTypeData() {
       let vm = this;
       vm.$https({
-        url: "assetType/getList",
+        url: "videoContentCat/getList",
         method: "get",
         authType: this.backToken
       })
         .then(res => {
           let data = res.data.data;
-          this.assetType = data;
+          this.videoContentCat = data;
         })
         .catch(function(err) {
           console.log(err);
@@ -472,7 +472,7 @@ export default {
     getVideoData() {
       let vm = this;
       vm.$https({
-        url: "asset/getList",
+        url: "videoContent/getList",
         method: "get",
         authType: this.backToken
       })

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

@@ -53,7 +53,14 @@
           <el-table-column label="关联视频名称" prop="createTime"></el-table-column>
           <el-table-column label="视频版权方" prop="expireDateEnd"></el-table-column>
           <el-table-column label="创建时间" prop="createTime"></el-table-column>
-          <el-table-column label="审核状态" prop="auditStatus"></el-table-column>
+           <el-table-column label="审核状态" prop="auditStatus">
+              <template slot-scope="scope">
+                <span v-if="scope.row.auditStatus === 'TBC'">待初审</span>
+                <span v-else-if="scope.row.auditStatus === 'REFUSED'">已驳回</span>
+                <span v-else-if="scope.row.auditStatus === 'TBCA'">待复审</span>
+                <span v-else-if="scope.row.auditStatus === 'APPROVED_FINAL'">通过</span>
+              </template>
+            </el-table-column>
           <el-table-column label="是否上架" prop="createTime"></el-table-column>
           <el-table-column label="操作" header-align="center" align="center">
             <template slot-scope="scope" width="360">
@@ -65,8 +72,8 @@
                   @click="openEdit(scope.row)"
                 >编辑&nbsp;&nbsp;</el-button>
                 <el-button type="text" size="mini" @click="displayInfo(scope.row)">展板详情</el-button>
-                <el-button type="text" size="mini" @click="handleDelete(scope.row)">下架&nbsp;&nbsp;</el-button>
-                <el-button type="text" size="mini" @click="handleDelete(scope.row)">上架&nbsp;&nbsp;</el-button>
+                <el-button type="text" size="mini" @click="handlePublish(scope.row ,'False')">下架&nbsp;&nbsp;</el-button>
+                <el-button type="text" size="mini" @click="handlePublish(scope.row,'True')">上架&nbsp;&nbsp;</el-button>
                 <el-button type="text" size="mini" @click="handleDelete(scope.row)">删除</el-button>
               </el-button-group>
             </template>
@@ -350,6 +357,30 @@ export default {
         })
         .catch(() => {});
     },
+    // 上下架
+    handlePublish(row ,isPublish) {
+      let _this = this;
+      _this
+            .$https({
+              method: "put",
+              url: "exhibitionBoard/publish/" + row.id,
+              authType: this.backToken
+            },
+            _this.$qs.stringify({isPublish:isPublish}))
+            .then(
+              res => {
+                // this.$message({ type: "success", message: "删除成功!" });
+                alert("已提交审核！")
+                _this.Search();
+              },
+              error => {
+                this.$message({
+                  type: "fail",
+                  message: "失败!" + error.response.data
+                });
+              }
+            );
+    },
     // 保存编辑信息
     submitForm() {
       let _this = this;

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

 <template>
   <div class="info">
+    <!-- <audio-play></audio-play> -->
+    <video-dialog></video-dialog>
     <div class="info-header">新建学习内容</div>
     <div class="info-container">
       <div class="info-wrapper">
@@ -51,7 +53,7 @@
             >
               <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
               <el-option
-                v-for="item in assetType"
+                v-for="item in videoContentCat"
                 :label="item.name"
                 :value="item.id"
                 :key="item.id"
@@ -91,24 +93,65 @@
              <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="name"></el-table-column>
+            <el-table-column show-overflow-tooltip label="展板类别" prop="assetCopyrightOwnerName"></el-table-column>
+            <el-table-column show-overflow-tooltip label="展板版权方" prop="boardCopyrightOwnerName"></el-table-column>
             <el-table-column label="操作" width="180">
               <template slot-scope="scope">
                 <el-button
                   type="text"
                   style="padding:0"
-                  @click="moveUpward(scope.row, scope.$index)"
+                  @click="videoPreview(scope.row)"
                 >视频预览</el-button>
                 <el-button
                   type="text"
                   style="padding:0"
-                  @click="moveDown(scope.row, scope.$index)"
+                  @click="displayPreview(scope.row)"
                 >展板预览</el-button>
+                
               </template>
             </el-table-column>
           </el-table>
         </div>
+             <!--新增弹框-->
+        <el-dialog
+          custom-class="party-dialog"
+          title="展板预览区"
+          width="468px"
+          :visible.sync="dialogVisible"
+          :before-close="closeDialog"
+        >
+          <div class="dialog-content">
+            <el-form
+              :model="classForm"
+              ref="classForm"
+              label-width="80px"
+              label-position="top"
+              :rules="rules"
+              id="ruleo"
+              class="party-form"
+            >
+              <el-form-item label="展板名称">
+                <el-input v-model="classForm.name"></el-input>
+              </el-form-item>
+              <el-form-item label="版权方">
+                <el-input v-model="classForm.name"></el-input>
+              </el-form-item>
+              <el-form-item label="展板分类">
+                <el-input v-model="classForm.name"></el-input>
+              </el-form-item>
+              <el-form-item label="展板宣传图">
+                <img class="imgSize" :src="classForm.cover" alt="">
+              </el-form-item>
+              <el-form-item label="简介">
+                <el-input type="textarea" v-model="classForm.remarks"></el-input>
+              </el-form-item>
+            </el-form>
+          </div>
+          <!-- <div slot="footer" class="dialog-footer btn-group">
+            <el-button size="mini" type="primary" @click="save('classForm')">确定</el-button>
+            <el-button size="mini" @click="close">取 消</el-button>
+          </div> -->
+        </el-dialog>
       </div>
     </div>
     <div class="info-footer">
@@ -124,15 +167,21 @@
 
 <script>
 import uploadImg from '@/page/content/components/uploadVue/uploadImg'
+import videoDialog from '@/page/content/components/dialog/videoDialog'
+import audioPlay from '@/page/content/components/audioPlay'
 export default {
    components:{
-    uploadImg
+    uploadImg,
+    videoDialog,
+    audioPlay
   },
   data() {
     return {
+      dialogVisible: false,
+      classForm: {},
       type: this.$route.query.type,
       learningProjectIdList:'',
-      assetType: [],
+      videoContentCat: [],
       assetType2:[],
       checkedThing: false,
       checkedThing2:false,
@@ -175,13 +224,26 @@ export default {
     this.init()
   },
   methods: {
+    // 视频预览
+    videoPreview(){
+      alert("视频")
+    },
+     // 展板预览
+    displayPreview(row) {
+      this.dialogVisible = true;
+      this.classForm =row
+    },
+    // 关闭弹窗
+    closeDialog(){
+      this.dialogVisible = false;
+    },
       init() {
       if (this.$route.query.type === "Update") {
         this.getInfo(this.$route.query.id);
         this.getLearnProject()
         this.getAssetTypeData()
         this.getAssetTypeData2()
-        this.getLearnContentBoard()
+        // this.getLearnContentBoard()
       }
     },
     //  获取版权方详情
@@ -199,22 +261,18 @@ export default {
           let data = res.data.data;
           this.ruleForm = data;
           console.log(this.ruleForm)
-          // this.ruleForm = {
-          //   assetCopyrightOwnerId :data.assetCopyrightOwnerId,
-          //   assetId:data.assetId,
-          //   assetTypeId:data.assetTypeId,
-          //   boardCopyrightOwnerId:data.boardCopyrightOwnerId,
-          //   cover:data.cover,
-          //   exhibitionBoardCatId:data.exhibitionBoardCatId,
-          //   guideAudioUrl:data.guideAudioUrl,
-          //   id:data.id,
-          //   name:data.name,
-          //   qrcodeUrl:data.qrcodeUrl,
-          //   refMaterialUrl:data.refMaterialUrl,
-          //   remarks:data.remarks,
-          //   audioUrlList:data.audioUrlList,
-          //   materialUrlList:data.materialUrlList
-          // }
+          this.ruleForm = {
+            name :data.name,
+            applicableScope:data.applicableScope,
+            copyrightOwnerIdList:data.copyrightOwnerIdList,
+            cover:data.cover,
+            learningProjectId:data.learningProjectId,
+            exhibitionBoardCatIdList:data.exhibitionBoardCatIdList,
+            id:data.id,
+            exhibitionBoardIdList:data.exhibitionBoardIdList,
+          }
+          this.tableData = data.exhibitionBoardList
+          this.multipleSelection = data.exhibitionBoardList
           
         })
         .catch(function(err) {
@@ -233,8 +291,9 @@ export default {
       )
         .then(res => {
           let data = res.data.data;
-          this.tableData = data
-          this.multipleSelection = data
+          console.log(data)
+          // this.tableData = data
+          // this.multipleSelection = data
         })
         .catch(function(err) {
           console.log(err);
@@ -325,7 +384,7 @@ export default {
       this.ruleForm.cover = url
     },
     getSelectDep(exhibitionBoardCatIdList) {
-      if (exhibitionBoardCatIdList.length === this.assetType.length) {
+      if (exhibitionBoardCatIdList.length === this.videoContentCat.length) {
         this.checkedThing = true;
       } else {
         this.checkedThing = false;
@@ -374,7 +433,7 @@ export default {
       // debugger
       this.ruleForm.exhibitionBoardCatIdList = [];
       if (this.checkedThing) {
-        this.assetType.map(item => {
+        this.videoContentCat.map(item => {
           this.ruleForm.exhibitionBoardCatIdList.push(item.id);
         });
       } else {
@@ -402,7 +461,7 @@ export default {
       })
         .then(res => {
           let data = res.data.data;
-          this.assetType = data;
+          this.videoContentCat = data;
           // this.value1[0]=data.expireDateEnd
           //this.value1[1]=data.expireDateStart
         })

src/page/content/learn/content/details.vue

@@ -8,21 +8,30 @@
             <el-form
               class="demo-form-inline"
               :inline="true"
-              :model="formInline"
+              :model="checkForm"
               label-position="top"
             >
               <el-form-item label="审核层级" class="w100">
                 <span class="w50 l-float">
-                  <strong>初审</strong> 2021/02/02
+                  <strong>初审</strong> {{checkForm.firstTime}}
                 </span>
                 <span class="w50">
-                  <strong>复审</strong> 2021/02/23
+                  <strong>复审</strong> {{checkForm.secondTime}}
                 </span>
               </el-form-item>
-              <el-form-item label="审核结果" class="w50">驳回</el-form-item>
+              <el-form-item label="审核结果" class="w50">
+                <span v-if="checkForm.status === 'TBC'">待初审</span>
+                <span v-else-if="checkForm.status === 'TBCA'">待复审</span>
+                <span v-else-if="checkForm.status === 'REFUSED'">驳回</span>
+                 <span v-else-if="checkForm.status === 'APPROVED_FINAL'">通过</span>
+              </el-form-item>
               <el-form-item
                 label="驳回原因"
-              >各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给</el-form-item>
+                class="w100"
+              >
+              {{checkForm.firstRemarks}}
+              {{checkForm.secondRemarks}}
+              </el-form-item>
             </el-form>
           </el-collapse-item>
           <el-collapse-item title="学习内容" name="2">
@@ -32,14 +41,14 @@
               :model="formInline"
               label-position="top"
             >
-              <el-form-item label="学习内容名称" class="w50">xxxxxxx</el-form-item>
+              <el-form-item label="学习内容名称" class="w50">{{ruleForm.name}}</el-form-item>
               <el-form-item label="学习内容宣传图" class="w50">
-                <img class="imgSize" src alt />
+                <img class="imgSize" :src="ruleForm.cover" alt />
               </el-form-item>
             </el-form>
           </el-collapse-item>
           <el-collapse-item title="展板列表" name="3">
-              {{tableData}}
+              <!-- {{tableData}} -->
             <div class="party-table">
               <el-table
                 border
@@ -85,6 +94,15 @@
 export default {
   data() {
     return {
+      checkForm:{
+        firstTime:"",
+        secondTime:"",
+        status:"",
+
+      },
+      ruleForm:{
+
+      },
       tableData: [
         {
           id: "1",
@@ -99,14 +117,100 @@ export default {
           name: "3"
         }
       ],
-      activeNames: ["1"],
+      activeNames: ["1","2","3"],
       formInline: {
         user: "",
         region: ""
       }
     };
   },
+  mounted(){
+    this.init()
+  },
   methods: {
+    init() {
+        this.getInfo(this.$route.query.id);
+        // this.getLearnContentBoard()
+        this.getCheckInfo(this.$route.query.id)
+    },
+    // 获取审核详情
+     getCheckInfo(id) {
+      let vm = this;
+      vm.$https(
+        {
+          url: "audit/getById",
+          method: "get",
+          authType: this.backToken
+        },
+        {id:id,
+          type:"LEARNING_CONTENT"}
+        // this.$qs.stringify({
+        //   id:id,
+        //   type:"LEARNING_CONTENT"
+        // })
+      )
+        .then(res => {
+          let data = res.data.data;
+          this.checkForm = data;
+          
+        })
+        .catch(function(err) {
+          console.log(err);
+        });
+    },
+      //  获取学习内容详情
+    getInfo(id) {
+      let vm = this;
+      vm.$https(
+        {
+          url: "learningContent/get/" + id,
+          method: "get",
+          authType: this.backToken
+        }
+        // param
+      )
+        .then(res => {
+          let data = res.data.data;
+          this.ruleForm = data;
+          console.log(this.ruleForm)
+          // this.ruleForm = {
+          //   name :data.name,
+          //   applicableScope:data.applicableScope,
+          //   copyrightOwnerIdList:data.copyrightOwnerIdList,
+          //   cover:data.cover,
+          //   learningProjectId:data.learningProjectId,
+          //   exhibitionBoardCatIdList:data.exhibitionBoardCatIdList,
+          //   id:data.id,
+          //   exhibitionBoardIdList:data.exhibitionBoardIdList,
+          // }
+          this.tableData = data.exhibitionBoardList
+          // this.multipleSelection = data.exhibitionBoardList
+          
+        })
+        .catch(function(err) {
+          console.log(err);
+        });
+    },
+    // 获取获取学习内容展板全部列表
+    getLearnContentBoard(){
+      let vm = this;
+      vm.$https({
+        url: "learningContentBoard/getList",
+        method: "get",
+        authType: this.backToken
+      },
+      {learningContentId:this.$route.query.id}
+      )
+        .then(res => {
+          let data = res.data.data;
+          console.log(data)
+          this.tableData = data
+          // this.multipleSelection = data
+        })
+        .catch(function(err) {
+          console.log(err);
+        });
+    },
     close() {
       history.go(-1);
     },

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

@@ -35,7 +35,6 @@
     <div class="table-content">
       <div class="btn-group">
         <el-button type="primary" @click="addPermis()">新建学习内容</el-button>
-        <el-button type="primary" @click="learnDetails()">学习内容详情界面</el-button>
       </div>
       <div class="party-table">
         <el-table
@@ -51,17 +50,35 @@
           <el-table-column label="创建时间" prop="createTime"></el-table-column>
           <el-table-column label="版权方有效期" prop="expireDateEnd"></el-table-column>
           <el-table-column show-overflow-tooltip label="备注" prop="remarks"></el-table-column>
-          <el-table-column label="操作" header-align="center" align="center">
-            <template slot-scope="scope" width="220">
-              <el-button-group>
-                <el-button
-                  title="编辑"
-                  size="mini"
-                  type="text"
-                  @click="openEdit(scope.row)"
-                >编辑&nbsp;&nbsp;</el-button>
-                <el-button title="删除" type="text" size="mini" @click="handleDelete(scope.row)">删除</el-button>
-              </el-button-group>
+          <el-table-column label="操作" width="240" header-align="center" align="center">
+            <template slot-scope="scope"  >
+              <div class="table-btn-group">
+                <el-tooltip content="修改" placement="top">
+                  <el-button circle @click="openEdit(scope.row)">
+                    <i class="icon-table icon-edit"></i>
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip content="详情" placement="top">
+                  <el-button circle @click="learnDetails(scope.row)">
+                    <i class="icon-table icon-detail"></i>
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip content="启用" placement="top">
+                  <el-button circle @click="handlePublish(scope.row,'True')">
+                    <i class="icon-table icon-enable"></i>
+                  </el-button>
+                </el-tooltip>
+                 <el-tooltip content="禁用" placement="top">
+                  <el-button circle @click="handlePublish(scope.row,'False')">
+                    <i class="icon-table icon-disable"></i>
+                  </el-button>
+                </el-tooltip>
+                 <!-- <el-tooltip content="删除" placement="top">
+                  <el-button circle @click="handleDelete(scope.row)">
+                    <i class="icon-table icon-del"></i>
+                  </el-button>
+                </el-tooltip> -->
+              </div>
             </template>
           </el-table-column>
         </el-table>
@@ -170,6 +187,30 @@ export default {
         }
       );
     },
+    // 上下架
+    handlePublish(row ,isPublish) {
+      let _this = this;
+      _this
+            .$https({
+              method: "put",
+              url: "learningContent/enable/" + row.id,
+              authType: this.backToken
+            },
+            _this.$qs.stringify({isPublish:isPublish}))
+            .then(
+              res => {
+                // this.$message({ type: "success", message: "删除成功!" });
+                alert("已提交审核！")
+                _this.Search();
+              },
+              error => {
+                this.$message({
+                  type: "fail",
+                  message: "失败!" + error.response.data
+                });
+              }
+            );
+    },
     // 获得数据接口
     getTableData(param) {
       let vm = this;
@@ -240,8 +281,8 @@ export default {
       // this.FormVisible1 = true;
     },
     // 学习内容详情
-    learnDetails(){
-      this.$router.push({ path: "learnContentDetails", query: { id: "111" } });
+    learnDetails(row){
+      this.$router.push({ path: "learnContentDetails", query: { id: row.id } });
     },
     // 添加权限
     permisSave() {

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

@@ -51,7 +51,19 @@
             <el-table-column label="备注" prop="remarks"></el-table-column>
             <el-table-column label="操作" header-align="center" align="center">
               <template slot-scope="scope" width="220">
-                <el-button-group>
+                <div class="table-btn-group">
+                <el-tooltip content="修改" placement="top">
+                  <el-button circle @click="openEdit(scope.row)">
+                    <i class="icon-table icon-edit"></i>
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip content="删除" placement="top">
+                  <el-button circle @click="handleDelete(scope.row)">
+                    <i class="icon-table icon-del"></i>
+                  </el-button>
+                </el-tooltip>
+              </div>
+                <!-- <el-button-group>
                   <el-button
                     title="删除"
                     type="text"
@@ -64,8 +76,7 @@
                     type="text"
                     @click="openEdit(scope.row)"
                   >编辑&nbsp;&nbsp;</el-button>
-                  <!-- <el-button title="编辑" size="mini" type="text" @click="openDetails(scope.row)">查看详情</el-button> -->
-                </el-button-group>
+                </el-button-group> -->
               </template>
             </el-table-column>
         </el-table>

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

@@ -34,7 +34,7 @@
             >
               <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
               <el-option
-                v-for="item in assetType"
+                v-for="item in videoContentCat"
                 :label="item.name"
                 :value="item.id"
                 :key="item.id"
@@ -67,7 +67,7 @@
               @change="getAssetType"
             >
               <el-option
-                v-for="item in assetType"
+                v-for="item in videoContentCat"
                 :label="item.name"
                 :value="item.id"
                 :key="item.id"
@@ -168,7 +168,7 @@ export default {
         thumbnail:"",
         videoUrlList:[]
       },
-      assetType: [
+      videoContentCat: [
         {
           value: "Beijing",
           label: "北京"
@@ -254,7 +254,7 @@ export default {
        let vm = this;
       vm.$https(
         {
-          url: "asset/get/" + id,
+          url: "videoContent/get/" + id,
           method: "get",
           authType: this.backToken
         }
@@ -287,7 +287,7 @@ export default {
         if (valid) {
           this.$https(
             {
-              url: "assetType/save",
+              url: "videoContentCat/save",
               method: "post",
               // headers: {
               //   'Content-Type': 'application/json'
@@ -332,7 +332,7 @@ export default {
         if (valid) {
           this.$https(
             {
-              url: "/asset/save",
+              url: "/videoContent/save",
               method: "post",
               authType: this.backToken
             },
@@ -359,7 +359,7 @@ export default {
         if (valid) {
           this.$https(
             {
-              url: "asset/update",
+              url: "videoContent/update",
               method: "put",
               authType: this.backToken
             },
@@ -390,7 +390,7 @@ export default {
         method: "get",
         authType: this.backToken
       },
-      {copyrightOwnerType:'ASSET'})
+      {copyrightOwnerType:'VIDEO_CONTENT'})
         .then(res => {
           let data = res.data.data;
           this.copyrightOwner = data;
@@ -403,20 +403,20 @@ export default {
     getAssetTypeData() {
       let vm = this;
       vm.$https({
-        url: "assetType/getList",
+        url: "videoContentCat/getList",
         method: "get",
         authType: this.backToken
       })
         .then(res => {
           let data = res.data.data;
-          this.assetType = data;
+          this.videoContentCat = data;
         })
         .catch(function(err) {
           console.log(err);
         });
     },
     getSelectDep(assetTypeIdList) {
-      if (assetTypeIdList.length === this.assetType.length) {
+      if (assetTypeIdList.length === this.videoContentCat.length) {
         this.checkedThing = true;
       } else {
         this.checkedThing = false;
@@ -426,7 +426,7 @@ export default {
       // debugger
       this.ruleForm.assetTypeIdList = [];
       if (this.checkedThing) {
-        this.assetType.map(item => {
+        this.videoContentCat.map(item => {
           this.ruleForm.assetTypeIdList.push(item.id);
         });
       } else {

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

@@ -49,7 +49,14 @@
           <el-table-column show-overflow-tooltip label="视频名称" prop="name"></el-table-column>
           <el-table-column show-overflow-tooltip label="版权方" prop="assetCopyrightOwnerName"></el-table-column>
           <el-table-column label="视频分类" prop="assetTypeName"></el-table-column>
-          <el-table-column label="审核状态" prop="auditStatus"></el-table-column>
+         <el-table-column label="审核状态" prop="auditStatus">
+              <template slot-scope="scope">
+                <span v-if="scope.row.auditStatus === 'TBC'">待初审</span>
+                <span v-else-if="scope.row.auditStatus === 'REFUSED'">已驳回</span>
+                <span v-else-if="scope.row.auditStatus === 'TBCA'">待复审</span>
+                <span v-else-if="scope.row.auditStatus === 'APPROVED_FINAL'">通过</span>
+              </template>
+            </el-table-column>
           <el-table-column label="操作" header-align="center" align="center">
             <template slot-scope="scope" width="220">
               <el-button-group>
@@ -289,7 +296,7 @@ export default {
       let vm = this;
       vm.$https(
         {
-          url: "asset/getPageList",
+          url: "videoContent/getPageList",
           method: "post",
           authType: this.backToken
         },
@@ -434,7 +441,7 @@ export default {
       let vm = this;
       vm.$https(
         {
-          url: "asset/get/" + id,
+          url: "videoContent/get/" + id,
           method: "get",
           authType: this.backToken
         }
@@ -460,7 +467,7 @@ export default {
           _this
             .$https({
               method: "delete",
-              url: "asset/delete/" + row.id,
+              url: "videoContent/delete/" + row.id,
               authType: this.backToken
             })
             .then(

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

@@ -41,7 +41,7 @@
             >
               <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
               <el-option
-                v-for="item in assetType"
+                v-for="item in videoContentCat"
                 :label="item.name"
                 :value="item.id"
                 :key="item.id"
@@ -113,18 +113,18 @@ export default {
     return {
       type: this.$route.query.type,
       dialogVisible: false,
+      classForm: {},
       formLabelWidth: "100px",
       form: {
         name: ""
       },
-      classForm: {},
       value1: [],
       ruleForm: {
         assetTypeIdList: [],
         name: "",
-        ownerType: "ASSET"
+        ownerType: "VIDEO_CONTENT"
       },
-      assetType: [
+      videoContentCat: [
         {
           value: "Beijing",
           label: "北京"
@@ -197,7 +197,7 @@ export default {
       })
         .then(res => {
           let data = res.data.data;
-          // this.assetType = data
+          // this.videoContentCat = data
           this.ruleForm = data;
           this.value1 = [data.expireDateStart, data.expireDateEnd];
 
@@ -221,7 +221,7 @@ export default {
         if (valid) {
           this.$https(
             {
-              url: "assetType/save",
+              url: "videoContentCat/save",
               method: "post",
               // headers: {
               //   'Content-Type': 'application/json'
@@ -321,13 +321,13 @@ export default {
     getAssetTypeData() {
       let vm = this;
       vm.$https({
-        url: "assetType/getList",
+        url: "videoContentCat/getList",
         method: "get",
         authType: this.backToken
       })
         .then(res => {
           let data = res.data.data;
-          this.assetType = data;
+          this.videoContentCat = data;
           // this.value1[0]=data.expireDateEnd
           //this.value1[1]=data.expireDateStart
         })
@@ -336,7 +336,7 @@ export default {
         });
     },
     getSelectDep(assetTypeIdList) {
-      if (assetTypeIdList.length === this.assetType.length) {
+      if (assetTypeIdList.length === this.videoContentCat.length) {
         this.checkedThing = true;
       } else {
         this.checkedThing = false;
@@ -346,7 +346,7 @@ export default {
       // debugger
       this.ruleForm.assetTypeIdList = [];
       if (this.checkedThing) {
-        this.assetType.map(item => {
+        this.videoContentCat.map(item => {
           this.ruleForm.assetTypeIdList.push(item.id);
         });
       } else {

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

@@ -52,15 +52,42 @@
           <el-table-column show-overflow-tooltip label="备注" prop="remarks"></el-table-column>
           <el-table-column label="操作" header-align="center" align="center">
             <template slot-scope="scope" width="220">
-              <el-button-group>
-                <el-button
-                  title="编辑"
-                  size="mini"
-                  type="text"
-                  @click="openEdit(scope.row)"
-                >编辑&nbsp;&nbsp;</el-button>
-                <el-button title="删除" type="text" size="mini" @click="handleDelete(scope.row)">删除</el-button>
-              </el-button-group>
+              <div class="table-btn-group">
+                        <el-tooltip content="修改" placement="top">
+                            <el-button circle  @click="openEdit(scope.row)">
+                                <i class="icon-table icon-edit"></i>
+                            </el-button>
+                        </el-tooltip>
+                        <el-tooltip content="删除" placement="top">
+                            <el-button circle  @click="handleDelete(scope.row)">
+                                <i class="icon-table icon-del"></i>
+                            </el-button>
+                        </el-tooltip>
+                  
+                         <!-- <el-tooltip content="禁用" placement="top">
+                            <el-button 
+                             circle 
+                             :disabled="scope.row.status == 2 || scope.row.statusName == '待审核' "
+                             @click="handleOperate(scope.row,'disable')">
+                                <i class="icon-table icon-disable"></i>
+                            </el-button>
+                        </el-tooltip>
+                       <el-tooltip content="激活" placement="top">
+                            <el-button 
+                             circle 
+                             :disabled="scope.row.status == 1"
+                             @click="handleOperate(scope.row,'enable')">
+                                <i class="icon-table icon-enable"></i>
+                            </el-button>
+                        </el-tooltip>
+                        <el-tooltip content="审核详情" placement="top">
+                            <el-button 
+                             circle
+                             @click="handleOperate(scope.row,'examine')">
+                                <i class="icon-table icon-detail"></i>
+                            </el-button>
+                        </el-tooltip> -->
+                    </div>
             </template>
           </el-table-column>
         </el-table>
@@ -100,7 +127,7 @@ export default {
       formLabelWidth: "100px",
       form: {
         nameOrCode: "",
-        ownerType:'ASSET'
+        ownerType:'VIDEO_CONTENT'
       },
       editform: {
         menuName: "",
@@ -206,7 +233,7 @@ export default {
     // 重置
     Reset(){
       // this.$refs["form"].resetFields();
-      this.form = { ownerType:'ASSET'}
+      this.form = { ownerType:'VIDEO_CONTENT'}
       this.Search()
     },
     Search() {
@@ -216,7 +243,7 @@ export default {
         _index: 1,
         _size: _this.page.pageSize,
         nameOrCode: _this.form.nameOrCode,
-        ownerType:'ASSET'
+        ownerType:'VIDEO_CONTENT'
       };
       this.getTableData(searchObj);
     },

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

@@ -162,7 +162,7 @@ export default {
       let vm = this;
       vm.$https(
         {
-          url: "assetType/getPageList",
+          url: "videoContentCat/getPageList",
           method: "post",
           authType: this.backToken
         },