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

5ba8a29a · xulili · 02e4739b · 90bde5bc · 5ba8a29a · 5ba8a29a
Commit 5ba8a29a authored Mar 26, 2021 by xulili
40 changed files
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -10,18 +10,23 @@
    "build": "node build/build.js"
  },
  "dependencies": {
+    "animate.css": "^4.1.1",
    "awe-dnd": "^0.3.1",
    "axios": "^0.18.0",
    "echarts": "^4.2.0-rc.2",
    "element-ui": "^2.4.8",
    "file-saver": "^2.0.0-rc.3",
    "moment": "^2.22.2",
+    "node-sass": "^4.12.0",
    "ol": "^5.2.0",
    "ol-ext": "^3.0.2",
    "qrcode.vue": "^1.6.1",
    "qs": "^6.5.2",
    "qs-stringify": "^1.1.0",
+    "video.js": "^7.11.4",
+    "swiper": "^5.4.5",
    "vue": "^2.5.2",
+    "vue-awesome-swiper": "^4.1.1",
    "vue-qr": "^1.5.2",
    "vue-router": "^3.0.1",
    "vuex": "^3.0.1",

--- a/src/assets/default-rect.png
+++ b/src/assets/default-rect.png
--- a/src/assets/icons/detail.png
+++ b/src/assets/icons/detail.png
--- a/src/config/menu.js
+++ b/src/config/menu.js
@@ -22,7 +22,7 @@ export const menuList = [
          {
              subtitle:'学习内容及互动管理',
              subMenu:[
-                  {label:'学习内容管理', imgUrl:'',url:'/learn'},
+                  {label:'学习内容管理', imgUrl:'',url:'/learnContent'},
                  {label:'互动管理', imgUrl:'',url:'/interactive'}
              ]
          },
@@ -53,7 +53,9 @@ export const menuList = [
             {
              subtitle:'内容及账号审核',
              subMenu:[
-                  {label:'视频及展板审核', imgUrl:''},
+                  {label:'视频审核', imgUrl:'',url:'/checkVideo'},
+                  {label:'展板审核', imgUrl:'',url:'/checkDisplay'},
+                  {label:'平台学习内容审核', imgUrl:'',url:'/checkLearn'},
                  {label:'账号禁用审核', imgUrl:''}
              ]
          }

--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,8 @@ import {shortcuts} from './common/js/commonJs'
 import VueDND from 'awe-dnd'
 import echarts from 'echarts'
+import Video from 'video.js'
+import 'video.js/dist/video-js.css'
 Vue.prototype.$echarts = echarts

--- a/src/page/STB/appversion/components/addDialog.vue
+++ b/src/page/STB/appversion/components/addDialog.vue
@@ -37,11 +37,11 @@
          <div class="el-upload__tip" slot="tip">只能上传zip文件，且不超过500kb</div>
        </el-upload>
      </el-form>
+    </div>
    <div slot="footer" class="dialog-footer btn-group">
      <el-button size="mini" type="primary" @click="submitForm('formItem')">确定</el-button>
      <el-button size="mini" @click="close">取 消</el-button>
    </div>
-    </div>
  </el-dialog>
 </template>

--- a/src/page/STB/appversion/components/detailDialog.vue
+++ b/src/page/STB/appversion/components/detailDialog.vue
@@ -31,10 +31,10 @@
          <el-input type="textarea" size="small" v-model="formItem.newContent" disabled></el-input>
        </el-form-item>
      </el-form>
+    </div>
    <div slot="footer" class="dialog-footer btn-group">
      <el-button size="mini" type="primary" @click="close()">确定</el-button>
    </div>
-    </div>
  </el-dialog>
 </template>

--- a/src/page/STB/appversion/index.vue
+++ b/src/page/STB/appversion/index.vue
@@ -36,21 +36,18 @@
          <el-table-column label="操作者" prop="name"></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-button
+                <el-tooltip content="详情" placement="top">
-                  title="详情"
+                    <el-button circle  @click="handleDetail(scope.row)">
-                  size="mini"
+                        <i class="icon-table icon-detail"></i>
-                  type="text"
+                    </el-button>
-                  @click="handleDetail(scope.row)"
+                </el-tooltip>
-                >详情&nbsp;&nbsp;</el-button>
+                <el-tooltip content="启用" placement="top">
-                <el-button
+                    <el-button circle @click="ableBtn(scope.row)">
-                  title="激活"
+                        <i class="icon-table icon-enable"></i>
-                  type="text"
+                    </el-button>
-                  size="mini"
+                </el-tooltip>
-                  @click="ableBtn(scope.row)"
+            </div>
-                >启用&nbsp;&nbsp;</el-button>
-              </el-button-group>
            </template>
          </el-table-column>
        </el-table>

--- a/src/page/STB/base/components/dialog.vue
+++ b/src/page/STB/base/components/dialog.vue
@@ -35,10 +35,10 @@
          <el-input size="small" v-model="formItem.address" disabled></el-input>
        </el-form-item>
      </el-form>
-      <div slot="footer" class="dialog-footer btn-group">
-        <el-button size="mini" type="primary" @click="submitForm('formItem')">确定</el-button>
-        <el-button size="mini" @click="close">取 消</el-button>
    </div>
+    <div slot="footer" class="dialog-footer btn-group">
+      <el-button type="primary" @click="submitForm('formItem')">确定</el-button>
+      <el-button @click="close">取 消</el-button>
    </div>
  </el-dialog>
 </template>

--- a/src/page/STB/base/index.vue
+++ b/src/page/STB/base/index.vue
@@ -246,6 +246,24 @@ export default {
    getAreas() {
      getAreas().then(res => {
        this.areaOptions = res;
+        // 处理children为[] 的问题
+        this.areaOptions.forEach(item=>{
+          if(!item.children.length){
+            item.children = null
+          }else{
+            item.children.forEach(j=>{
+              if(!j.children.length){
+                j.children = null
+              }else{
+                j.children.forEach(k=>{
+                  if(!k.children.length){
+                    k.children = null
+                  }
+                })
+              }
+            })
+          }
+        })
      });
    },
    // 查询

--- a/src/page/STB/pageCustom/index.vue
+++ b/src/page/STB/pageCustom/index.vue
@@ -14,32 +14,58 @@
              <el-button type="default" @click="uploadPageImg">上传背景图</el-button>
            </div>
          </div>
-          <!-- <div class="swiper-content">
+          <div class="swiper-content top">
-            <swiper class="swiper" :options="swiperOption">
+            <swiper class="swiper" data-title="page" :options="swiperOption">
-              <swiper-slide v-for="(item, index) in list" :key="index">
+              <swiper-slide v-for="(item, index) in pageList" :key="index">
-                <el-col :span="24" class="slider-group-item">{{index}}</el-col>
+                <div class="swiper-item">
+                  <el-radio v-model="radioPage" :label="item.id"></el-radio>
+                  <img :src="item.url" alt="">
+                </div>
              </swiper-slide>
-              <div slot="button-prev" class="swiper-button-prev">
+              <div class="swiper-button-prev" slot="button-prev">
-                <i class="el-icon-arrow-left" />
+                <i class="iconfont icon-arrow-left"></i>
              </div>
-              <div slot="button-next" class="swiper-button-next">
+              <div class="swiper-button-next" slot="button-next">
-                <i class="el-icon-arrow-right" />
+                <i class="iconfont icon-arrow-right"></i>
              </div>
            </swiper>
-          </div> -->
+          </div>
        </div>
        <div class="down-content">
          <div class="content-title">
            <div class="title">app运行画面设置</div>
+            <el-upload
+              class="upload-demo"
+              action="#"
+              :on-preview="handlePreview"
+              :on-remove="handleRemove"
+              :before-remove="beforeRemove"
+              multiple
+              :limit="3"
+              :on-exceed="handleExceed"
+              :file-list="pagefileList">
              <div class="btn-group">
                <el-button type="default" @click="uploadRunImg">上传背景图</el-button>
              </div>
+            </el-upload>
+          </div>
+          <div class="swiper-content bottom">
+            <swiper class="swiper" :options="swiperOption">
+              <swiper-slide v-for="(item, index) in runList" :key="index">
+                <div class="swiper-item">
+                  <el-radio v-model="radioRun" :label="item.id"></el-radio>
+                  <img :src="item.url" alt="">
+                </div>
+              </swiper-slide>
+              <div class="swiper-button-prev" slot="button-prev">
+                <i class="iconfont icon-arrow-left"></i>
+              </div>
+              <div class="swiper-button-next" slot="button-next">
+                <i class="iconfont icon-arrow-right"></i>
+              </div>
+            </swiper>
          </div>
-          <el-carousel :autoplay="false" type="card" height="120px">
-            <el-carousel-item v-for="item in 6" :key="item">
-              <h3 class="medium">{{ item }}</h3>
-            </el-carousel-item>
-          </el-carousel>
        </div>
      </div>
      <div class="btn-group footer-btn">
@@ -50,31 +76,85 @@
  </div>
 </template>
 <script>
+import { Swiper, SwiperSlide } from 'vue-awesome-swiper'
+import 'swiper/css/swiper.css'
+var vm = null
 export default {
+  components:{Swiper, SwiperSlide},
  data() {
    return {
+      radioPage: 1,
+      radioRun: 1,
      swiperOption: {
-        effect: "coverflow",
+        slideToClickedSlide:true,//点击后居中展示
-        grabCursor: true,
+        slidesPerView: 5,
+        spaceBetween: 30,
        centeredSlides: true,
-        slidesPerView: "auto",
+        observer: true,    // 动态检查器,自动初始化swiper,默认为false
-        coverflowEffect: {
+        observerParents: true,
-          rotate: 50,
+        // centerInsufficientSlides: true, //不够5个时居中显示
-          stretch: 0,
+        loop: true, // 不能同上一个属性同用
-          depth: 100,
+        navigation: {
-          modifier: 1,
+          nextEl: '.swiper-button-next',
-          slideShadows: true
+          prevEl: '.swiper-button-prev',
        },
-        pagination: {
+        on:{
-          el: ".swiper-pagination"
+          click:function(){
+            if(this.$el[0].parentNode.className.indexOf('top')>0){
+              vm.radioPage = vm.pageList[this.realIndex].id
+            }
+            if(this.$el[0].parentNode.className.indexOf('bottom')>0){
+              vm.radioRun = vm.runList[this.realIndex].id
            }
          }
+        }
+      },
+      pagefileList:[],
+      pageList:[
+        {url:require("@/assets/default-rect.png"),id:1},
+        {url:require("@/assets/default-rect.png"),id:2},
+        {url:require("@/assets/default-rect.png"),id:3},
+        {url:require("@/assets/default-rect.png"),id:4},
+        {url:require("@/assets/default-rect.png"),id:5},
+        {url:require("@/assets/default-rect.png"),id:6},
+      ],
+      runList:[
+        {url:require("@/assets/default-rect.png"),id:1},
+        {url:require("@/assets/default-rect.png"),id:2},
+        {url:require("@/assets/default-rect.png"),id:3},
+        {url:require("@/assets/default-rect.png"),id:4},
+        {url:require("@/assets/default-rect.png"),id:5},
+        {url:require("@/assets/default-rect.png"),id:6},
+      ]
    };
  },
-  mounted() {},
+  created(){
+    vm = this
+  },
+  mounted() {
+  },
  methods: {
    uploadPageImg() {},
-    uploadRunImg() {}
+    uploadRunImg() {},
+    handleRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    handlePreview(file) {
+      console.log(file);
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+    },
+    beforeRemove(file, fileList) {
+      return this.$confirm(`确定移除 ${ file.name }？`);
+    },
+    submitForm(){
+    },
+    close(){
+      this.$router.go(-1)
+    }
  }
 };
 </script>
@@ -125,20 +205,75 @@ export default {
        padding: 0 20px;
      }
    }
-    .el-carousel__item h3 {
+    .swiper-content {
-      color: #475669;
+      .swiper-item {
+        position: relative;
+        width: 100%;
+        height: 128px;
+        background-color: #99a9bf;
+        border-radius:10px;
+        /deep/.el-radio {
+          position: absolute;
+          right: 12px;
+          top:12px;
+          .el-radio__inner {
+            width: 24px;
+            height: 24px;
+          }
+          .el-radio__input.is-checked .el-radio__inner {
+            border-color: #ac9374;
+            background: #ac9374;
+          }
+          .el-radio__inner:hover {
+            border-color: #ac9374;
+          }
+        }
+        img {
+          width: 100%;
+          height: 100%;
+        }
+      }
+      .swiper-button-next {
+        right:0;
+      }
+      .swiper-button-prev {
+        left :0;
+      }
+      .swiper-button-prev, .swiper-button-next{
+        background: #ac9374;
+        width: 36px;
+        height: 36px;
+        border-radius: 50%;
+      }  
+      .swiper-button-next:after, 
+      .swiper-button-prev:after {
        font-size: 14px;
-      opacity: 0.75;
+        font-weight: 700;
-      line-height: 200px;
+        color: #fff;
-      margin: 0;
      }
+      .swiper-slide {
-    .el-carousel__item:nth-child(2n) {
+        text-align: center;
-      background-color: #99a9bf;
+        font-size: 18px;
+        background: #fff;
+        display: -webkit-box;
+        display: -ms-flexbox;
+        display: -webkit-flex;
+        display: flex;
+        -webkit-box-pack: center;
+        -ms-flex-pack: center;
+        -webkit-justify-content: center;
+        justify-content: center;
+        -webkit-box-align: center;
+        -ms-flex-align: center;
+        -webkit-align-items: center;
+        align-items: center;
+        transition: 300ms;
+        transform: scale(0.8);
+      }
+      .swiper-slide-active,
+      .swiper-slide-duplicate-active {
+        transform: scale(1);
      }
-    .el-carousel__item:nth-child(2n + 1) {
-      background-color: #d3dce6;
    }
  }
  .footer-btn {
@@ -153,11 +288,5 @@ export default {
      padding: 0 20px;
    }
  }
-  /deep/.el-carousel__arrow {
-    background-color: #ac9374;
-  }
-  /deep/.el-carousel__item--card {
-    width: 30%;
-  }
 }
 </style>
\ No newline at end of file
--- a/src/page/check/display/index.vue
+++ b/src/page/check/display/index.vue
--- a/src/page/check/learn/details.vue
+++ b/src/page/check/learn/details.vue
+<template>
+  <div class="info">
+    <div class="info-header">学习内容详情</div>
+    <div class="info-container">
+      <div class="info-wrapper">
+        <el-collapse v-model="activeNames" @change="handleChange">
+          <el-collapse-item title="建党伟业" name="1">
+            <el-form
+              class="demo-form-inline"
+              :inline="true"
+              :model="formInline"
+              label-position="top"
+            >
+              <el-form-item label="学习内容宣传图" class="w50">
+                <img class="imgSize" src alt />
+              </el-form-item>
+              <el-form-item label="展板宣传图">
+                <img class="imgSize" src alt />
+              </el-form-item>
+              <el-form-item label="展板名称" class="w50">
+                xxxxxxx
+                <!-- <el-input v-model="formInline.user" placeholder="审批人"></el-input> -->
+              </el-form-item>
+              <el-form-item label="展板版权方">
+                xxxxxxx
+                <!-- <el-input v-model="formInline.user" placeholder="审批人"></el-input> -->
+              </el-form-item>
+              <el-form-item label="展板简介">
+                各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给
+                <!-- <el-input type="textarea" v-model="formInline.remarks"></el-input> -->
+              </el-form-item>
+              <el-form-item label="展板视频" class="w100">
+                <div>
+                  <img class="iconImg" src alt />
+                  <span>xxx.mp4</span>
+                </div>
+              </el-form-item>
+              <el-form-item label="展板音频">
+                <div>
+                  <img class="iconImg" src alt />
+                  <span>xxx.mp3</span>
+                </div>
+              </el-form-item>
+            </el-form>
+          </el-collapse-item>
+          <el-collapse-item title="改革之路" name="2">
+            <div>与现实生活一致：与现实生活的流程、逻辑保持一致，遵循用户习惯的语言和概念；</div>
+            <div>在界面中一致：所有的元素和结构需保持一致，比如：设计样式、图标和文本、元素的位置等。</div>
+          </el-collapse-item>
+          <el-collapse-item title="伟大复兴" name="3"></el-collapse-item>
+          <el-collapse-item title="辉煌成就" name="4"></el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
+    <div class="info-footer">
+      <div class="btn-group">
+        <el-button size="mini" type="primary" class="btn_form_search" @click="close">关闭</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      activeNames: ["1"],
+      formInline: {
+        user: "",
+        region: ""
+      }
+    };
+  },
+  methods: {
+    close() {
+      history.go(-1);
+    },
+    handleChange(val) {
+      console.log(val);
+    }
+  }
+};
+</script>
+<style lang="less">
+</style>
\ No newline at end of file
--- a/src/page/check/learn/index-.vue
+++ b/src/page/check/learn/index-.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" -->
+      <video    :preload="preload"
+              :poster="videoImg" :height="height" :width="width" align="center" :controls="controls"  :autoplay="autoplay">
+        <source :src="videoSrc" type="video/mp4">
+      </video>
+    </div>
+</template>
+<script>
+export default {
+  name: 'Video',
+  data () {
+    return {
+      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: ''
+    }
+  }
+  // 自动播放属性,muted:静音播放
+  // autoplay: 'muted',
+}
+</script>
+<style scoped >
+</style>
--- a/src/page/check/learn/index.vue
+++ b/src/page/check/learn/index.vue
--- a/src/page/check/video/details.vue
+++ b/src/page/check/video/details.vue
+fefe
\ No newline at end of file
--- a/src/page/check/video/index.vue
+++ b/src/page/check/video/index.vue
--- a/src/page/check/videoAndDisplay/index.vue
+++ b/src/page/check/videoAndDisplay/index.vue
--- a/src/page/content/display/classify/index.vue
+++ b/src/page/content/display/classify/index.vue
 <template>
  <div class="listPage H100">
    <div class="search-container">
-      <el-form :inline="true" :model="form" class="search-form" onsubmit="return false;">
+      <el-form :inline="true" :model="form" ref="form" class="search-form" onsubmit="return false;">
        <el-form-item label="版权方名称">
          <el-input
            size="mini"
@@ -23,7 +23,7 @@
        <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">重置</el-button>
+            <el-button size="mini" class="btn_form_search" @click="Reset">重置</el-button>
          </div>
        </el-form-item>
      </el-form>
@@ -83,7 +83,7 @@
        </div>
    </div>
     <!--新增弹框-->
-      <el-dialog title="新建" class="newPermis" :visible.sync="FormVisible1" :before-close="close1">
+      <el-dialog title="新建" custom-class="party-dialog"  width="468px" :visible.sync="FormVisible1" :before-close="close1">
           <div class="dialog-content">
        <el-form
          :model="classForm"
@@ -254,7 +254,7 @@ export default {
        // param
      )
        .then(res => {
-          let data = res.data.body;
+          let data = res.data.data;
          vm.page.pageSize = data.size;
          vm.page.total = data.total;
          vm.tableData = data.records;
@@ -284,6 +284,12 @@ export default {
      };
      this.getTableData(searchObj);
    },
+    // 重置
+    Reset(){
+      // this.$refs["form"].resetFields();
+      this.form = {}
+      this.Search()
+    },
    // // 获取当前查询参数
    getSearchQuery() {
      let _this = this;
@@ -433,7 +439,7 @@ export default {
      )
        .then(res => {
-          let data = res.data.body;
+          let data = res.data.data;
          this.classForm = data
        })
        .catch(function(err) {
@@ -582,7 +588,6 @@ export default {
 <style lang="less">
 // @import "../../../../style/common";
 // @import "../../style/list";
-// @import "../../../../style/dialog";
 @import "../../../../style/dialog.less";
 @import '../../../../style/table.less';
 @import '../../../../style/pagination.less';

--- a/src/page/content/display/content/add-----.vue
+++ b/src/page/content/display/content/add-----.vue
+<template>
+  <div class="addFormBox">
+    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="140px" class="addForm" label-position="top">
+      <el-form-item
+        label="页面说明："
+        class="addTipMsg"
+      >可新建版权方信息。创建展板内容，“*”为必填项，音频资料支持汉语、蒙语、藏语、维吾尔语、英语五种言音频上传，参考资料支持多文件上传。</el-form-item>
+      <div class="addTitle">展板基本信息</div>
+      <el-form-item label="展板名称" prop="name">
+        <el-input v-model="ruleForm.name"></el-input>
+      </el-form-item>
+      <el-form-item label="展板版权方">
+        <el-select v-model="ruleForm.desc" placeholder="请选择">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+       <el-form-item label="展板分类">
+        <el-select v-model="ruleForm.desc" placeholder="请选择">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="展板图片">
+      </el-form-item>
+      <el-form-item label="展板二维码">
+      </el-form-item>
+      <el-form-item label="展板介绍">
+        <el-input type="textarea" v-model="ruleForm.desc"></el-input>
+      </el-form-item>
+      <div class="addTitle">展板影音信息</div> 
+      <el-form-item label="视频版权方">
+        <el-select v-model="ruleForm.desc" placeholder="请选择">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="视频类别">
+        <el-select v-model="ruleForm.desc" placeholder="请选择">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="视频">
+        <el-select v-model="ruleForm.desc" placeholder="请选择">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="导览音频">
+      </el-form-item>
+      <el-form-item label="参考资料">
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('ruleForm')">确定</el-button>
+        <el-button @click="resetForm('ruleForm')">取消</el-button>
+      </el-form-item>
+    </el-form>
+    <!--新增弹框-->
+    <el-dialog
+      custom-class="party-dialog"
+      title="新建视频分类"
+      width="468px"
+      :visible.sync="dialogVisible"
+      :before-close="close"
+    >
+      <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="视频分类名称" prop="name">
+            <el-input v-model="classForm.name"></el-input>
+          </el-form-item>
+          <el-form-item label="备注">
+            <el-input type="textarea" v-model="classForm.desc"></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div slot="footer" class="dialog-footer btn-group">
+        <el-button size="mini" type="primary" @click="save">确定</el-button>
+        <el-button size="mini" @click="close">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      options: [
+        {
+          value: "选项1",
+          label: "黄金糕"
+        },
+        {
+          value: "选项2",
+          label: "双皮奶"
+        },
+        {
+          value: "选项3",
+          label: "蚵仔煎"
+        },
+        {
+          value: "选项4",
+          label: "龙须面"
+        },
+        {
+          value: "选项5",
+          label: "北京烤鸭"
+        }
+      ],
+      dialogVisible: false,
+      formLabelWidth: "100px",
+      form: {
+        name: ""
+      },
+      classForm: {
+        menuName: "",
+        menuUrl: "",
+        parentId: "",
+        sort: ""
+      },
+      value1: "",
+      ruleForm: {
+        name: "",
+        region: "",
+        date1: "",
+        date2: "",
+        delivery: false,
+        type: [],
+        resource: "",
+        desc: ""
+      },
+      departments: [
+        {
+          value: "Beijing",
+          label: "北京"
+        },
+        {
+          value: "Shanghai",
+          label: "上海"
+        },
+        {
+          value: "Nanjing",
+          label: "南京"
+        },
+        {
+          value: "Chengdu",
+          label: "成都"
+        },
+        {
+          value: "Shenzhen",
+          label: "深圳"
+        },
+        {
+          value: "Guangzhou",
+          label: "广州"
+        }
+      ],
+      checkedThing: false,
+      department: [],
+      selfstyle: {
+        textAlign: "right",
+        width: "100%",
+        paddingRight: "10px"
+      },
+      rules: {
+        name: [
+          { required: true, message: "请输入版权方名称", trigger: "blur" },
+          { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" }
+        ],
+        region: [
+          { required: true, message: "请选择活动区域", trigger: "change" }
+        ],
+        date1: [
+          {
+            type: "date",
+            required: true,
+            message: "请选择日期",
+            trigger: "change"
+          }
+        ],
+        date2: [
+          {
+            type: "date",
+            required: true,
+            message: "请选择时间",
+            trigger: "change"
+          }
+        ],
+        type: [
+          {
+            type: "array",
+            required: true,
+            message: "请至少选择一个活动性质",
+            trigger: "change"
+          }
+        ],
+        resource: [
+          { required: true, message: "请选择活动资源", trigger: "change" }
+        ],
+        desc: [{ required: true, message: "请填写活动形式", trigger: "blur" }]
+      }
+    };
+  },
+  methods: {
+    // 新建视频分类
+    addVideoClass() {
+      this.dialogVisible = true;
+    },
+    save() {
+      this.dialogVisible = false;
+    },
+    // 新增关闭
+    close() {
+      this.dialogVisible = false;
+      for (let key in this.classForm) {
+        this.classForm[key] = null;
+      }
+      this.$refs["classForm"].resetFields();
+    },
+    submitForm(formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          alert("submit!");
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      history.go(-1);
+    },
+    getSelectDep(department) {
+      //   debugger
+      if (department.length === this.departments.length) {
+        this.checkedThing = true;
+      } else {
+        this.checkedThing = false;
+      }
+    },
+    selectAllThing() {
+      // debugger
+      this.department = [];
+      if (this.checkedThing) {
+        this.departments.map(item => {
+          this.department.push(item.label);
+        });
+      } else {
+        this.department = [];
+      }
+    }
+  }
+};
+</script>
+<style lang="less">
+@import "../../style/add";
+@import "../../../../style/dialog";
+</style>
\ No newline at end of file
--- a/src/page/content/display/content/add.vue
+++ b/src/page/content/display/content/add.vue
--- a/src/page/content/display/content/index.vue
+++ b/src/page/content/display/content/index.vue
@@ -23,7 +23,7 @@
        <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">重置</el-button>
+            <el-button size="mini" class="btn_form_search" @click="Reset">重置</el-button>
          </div>
        </el-form-item>
      </el-form>
@@ -201,6 +201,11 @@ export default {
      let param = _this.getSearchQuery();
      _this.getTableData(param);
    },
+    // 重置
+    Reset(){
+      this.form = {}
+      this.Search()
+    },
    Search() {
      let _this = this;
      _this.page.currentPage = 1;

--- a/src/page/content/display/copyright/index.vue
+++ b/src/page/content/display/copyright/index.vue
@@ -182,7 +182,7 @@ export default {
        // param
      )
        .then(res => {
-          let data = res.data.body;
+          let data = res.data.data;
          vm.page.pageSize = data.size;
          vm.page.total = data.total;
          vm.tableData = data.records;

--- a/src/page/content/learn/add.vue
+++ b/src/page/content/learn/add.vue
-<template>
-<h1>ddddd</h1>
-</template>
\ No newline at end of file
--- a/src/page/content/learn/content/add.vue
+++ b/src/page/content/learn/content/add.vue
+<template>
+  <div class="info">
+    <div class="info-header">新建学习内容</div>
+    <div class="info-container">
+      <div class="info-wrapper">
+        <el-form class="demo-form-inline" :inline="true" :model="ruleForm" label-position="top">
+          <el-form-item label="学习内容名称" class="w50" style="padding-right:100px;">
+            <el-input v-model="ruleForm.name"></el-input>
+          </el-form-item>
+          <el-form-item label="适用范围">
+            全平台
+            <!-- <el-input v-model="ruleForm.name" ></el-input> -->
+          </el-form-item>
+          <el-form-item label="学习内容宣传图" class="w100">
+            <img class="imgSize" src alt />
+          </el-form-item>
+          <el-form-item class="selectH100 w50" label="请选择预设视频分类">
+            <el-select
+              placeholder="请选择预设展板分类"
+              @focus="getAssetTypeData"
+              multiple
+              v-model="ruleForm.assetTypeIdList"
+              @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-select>
+          </el-form-item>
+           <el-form-item class="selectH100" label="请选择预设视频分类">
+            <el-select
+              placeholder="请选择预设视频分类"
+              @focus="getAssetTypeData"
+              multiple
+              v-model="ruleForm.assetTypeIdList"
+              @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-select>
+          </el-form-item>
+          <el-form-item label="展板备选清单" class="w100"></el-form-item>
+        </el-form>
+        <div class>
+          <el-table
+            border
+            style="width: 100%;height:300px;overflow:auto;"
+            height="100%"
+            ref="multipleTable"
+            :data="tableData"
+          >
+            <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 label="操作">
+              <template slot-scope="scope">
+                <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>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+    </div>
+    <div class="info-footer">
+      <div class="btn-group">
+        <!-- 确定、取消 -->
+        <el-button size="mini" type="primary" class="btn_form_search" @click="addSubmit">确定</el-button>
+        <el-button size="mini" class="btn_form_search" @click="close">取消</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      assetType: [],
+      checkedThing: false,
+      selfstyle: {
+        textAlign: "right",
+        width: "100%",
+        paddingRight: "10px"
+      },
+      tableData: [
+        {
+          id: "1",
+          name: "1"
+        },
+        {
+          id: "2",
+          name: "2"
+        },
+        {
+          id: "3",
+          name: "3"
+        }
+      ],
+      ruleForm: {
+        user: "",
+        region: ""
+      }
+    };
+  },
+  methods: {
+    getSelectDep(assetTypeIdList) {
+      if (assetTypeIdList.length === this.assetType.length) {
+        this.checkedThing = true;
+      } else {
+        this.checkedThing = false;
+      }
+    },
+    selectAllThing() {
+      // debugger
+      this.ruleForm.assetTypeIdList = [];
+      if (this.checkedThing) {
+        this.assetType.map(item => {
+          this.ruleForm.assetTypeIdList.push(item.id);
+        });
+      } else {
+        this.ruleForm.assetTypeIdList = [];
+      }
+    },
+    // 获取视频分类列表
+    getAssetTypeData() {
+      let vm = this;
+      vm.$https({
+        url: "assetType/getList",
+        method: "get",
+        authType: this.backToken
+      })
+        .then(res => {
+          let data = res.data.data;
+          this.assetType = data;
+          // this.value1[0]=data.expireDateEnd
+          //this.value1[1]=data.expireDateStart
+        })
+        .catch(function(err) {
+          console.log(err);
+        });
+    },
+    // 新增
+    addSubmit() {
+      // 至少选一个备选清单 提示
+      alert("请先至少选择一个展板备选清单");
+    },
+    close() {
+      history.go(-1);
+    },
+    moveUpward(row, index) {
+      if (index > 0) {
+        let upData = this.tableData[index - 1];
+        this.tableData.splice(index - 1, 1);
+        this.tableData.splice(index, 0, upData);
+      } else {
+        this.$message({
+          message: "已经是第一条，上移失败",
+          type: "warning"
+        });
+      }
+    },
+    moveDown(row, index) {
+      if (index + 1 == this.tableData.length) {
+        this.$message({
+          message: "已经是最后一条，下移失败",
+          type: "warning"
+        });
+      } else {
+        let downData = this.tableData[index + 1];
+        this.tableData.splice(index + 1, 1);
+        this.tableData.splice(index, 0, downData);
+      }
+    }
+  }
+};
+</script>
+<style lang="less">
+</style>
\ No newline at end of file
--- a/src/page/content/learn/content/details.vue
+++ b/src/page/content/learn/content/details.vue
+<template>
+  <div class="info">
+    <div class="info-header">学习内容详情</div>
+    <div class="info-container">
+      <div class="info-wrapper">
+        <el-collapse v-model="activeNames" @change="handleChange">
+          <el-collapse-item title="审核意见" name="1">
+            <el-form
+              class="demo-form-inline"
+              :inline="true"
+              :model="formInline"
+              label-position="top"
+            >
+              <el-form-item label="审核层级" class="w100">
+                <span class="w50 l-float">
+                  <strong>初审</strong> 2021/02/02
+                </span>
+                <span class="w50">
+                  <strong>复审</strong> 2021/02/23
+                </span>
+              </el-form-item>
+              <el-form-item label="审核结果" class="w50">驳回</el-form-item>
+              <el-form-item
+                label="驳回原因"
+              >各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给</el-form-item>
+            </el-form>
+          </el-collapse-item>
+          <el-collapse-item title="学习内容" name="2">
+            <el-form
+              class="demo-form-inline"
+              :inline="true"
+              :model="formInline"
+              label-position="top"
+            >
+              <el-form-item label="学习内容名称" class="w50">xxxxxxx</el-form-item>
+              <el-form-item label="学习内容宣传图" class="w50">
+                <img class="imgSize" src alt />
+              </el-form-item>
+            </el-form>
+          </el-collapse-item>
+          <el-collapse-item title="展板列表" name="3">
+              {{tableData}}
+            <div class="party-table">
+              <el-table
+                border
+                style="width: 100%;height:100%"
+                height="100%"
+                ref="multipleTable"
+                :data="tableData"
+              >
+                <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 label="操作">
+                  <template slot-scope="scope">
+                    <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>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
+    <div class="info-footer">
+      <div class="btn-group">
+        <!-- 确定、取消 -->
+        <el-button size="mini" type="primary" class="btn_form_search" @click="close">关闭</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      tableData: [
+        {
+          id: "1",
+          name: "1"
+        },
+        {
+          id: "2",
+          name: "2"
+        },
+        {
+          id: "3",
+          name: "3"
+        }
+      ],
+      activeNames: ["1"],
+      formInline: {
+        user: "",
+        region: ""
+      }
+    };
+  },
+  methods: {
+    close() {
+      history.go(-1);
+    },
+    handleChange(val) {
+      console.log(val);
+    },
+    moveUpward(row, index) {
+      if (index > 0) {
+        let upData = this.tableData[index - 1];
+        this.tableData.splice(index - 1, 1);
+        this.tableData.splice(index, 0, upData);
+      } else {
+        this.$message({
+          message: "已经是第一条，上移失败",
+          type: "warning"
+        });
+      }
+    },
+    moveDown(row, index) {
+      if (index + 1 == this.tableData.length) {
+        this.$message({
+          message: "已经是最后一条，下移失败",
+          type: "warning"
+        });
+      } else {
+        let downData = this.tableData[index + 1];
+        this.tableData.splice(index + 1, 1);
+        this.tableData.splice(index, 0, downData);
+      }
+    }
+  }
+};
+</script>
+<style lang="less">
+</style>
\ No newline at end of file
--- a/src/page/content/learn/index.vue
+++ b/src/page/content/learn/index.vue
@@ -23,7 +23,7 @@
        <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">重置</el-button>
+            <el-button size="mini" class="btn_form_search" @click="Reset">重置</el-button>
          </div>
        </el-form-item>
      </el-form>
@@ -35,6 +35,7 @@
    <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
@@ -45,11 +46,11 @@
          @selection-change="handleSelectionChange"
        >
          <el-table-column type="index" width="120" label="序号"></el-table-column>
-          <el-table-column show-overflow-tooltip label="版权方名称" prop="menuName"></el-table-column>
+          <el-table-column show-overflow-tooltip label="版权方名称" prop="name"></el-table-column>
-          <el-table-column show-overflow-tooltip label="视频分类" prop="menuUrl"></el-table-column>
+          <el-table-column show-overflow-tooltip label="视频分类" prop="assetTypeNames"></el-table-column>
-          <el-table-column label="创建时间" prop="sort"></el-table-column>
+          <el-table-column label="创建时间" prop="createTime"></el-table-column>
-          <el-table-column label="版权方有效期" prop="sort"></el-table-column>
+          <el-table-column label="版权方有效期" prop="expireDateEnd"></el-table-column>
-          <el-table-column show-overflow-tooltip label="备注" prop="menuName"></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>
@@ -140,7 +141,7 @@ export default {
  computed: {},
  mounted() {
    this.onSearch();
-    this.getPermis();
+    // this.getPermis();
  },
  components: {},
  methods: {
@@ -174,14 +175,15 @@ export default {
      let vm = this;
      vm.$https(
        {
-          url: "menu/getMenuList",
+          url: "copyrightOwner/getPageList",
-          method: "get",
+          method: "post",
          authType: this.backToken
        },
-        param
+        vm.$qs.stringify(param)
+        // param
      )
        .then(res => {
-          let data = res.data;
+          let data = res.data.data;
          vm.page.pageSize = data.size;
          vm.page.total = data.total;
          vm.tableData = data.records;
@@ -201,6 +203,12 @@ export default {
      let param = _this.getSearchQuery();
      _this.getTableData(param);
    },
+    // 重置
+    Reset(){
+      // this.$refs["form"].resetFields();
+      this.form = {}
+      this.Search()
+    },
    Search() {
      let _this = this;
      _this.page.currentPage = 1;
@@ -227,10 +235,14 @@ export default {
    },
    // 添加
    addPermis() {
-      this.$router.push({ path: "learnAdd", query: { type: "add" } });
+      this.$router.push({ path: "learnContentAdd", query: { type: "add" } });
      // $('.el-dialog__title').html('新建');
      // this.FormVisible1 = true;
    },
+    // 学习内容详情
+    learnDetails(){
+      this.$router.push({ path: "learnContentDetails", query: { id: "111" } });
+    },
    // 添加权限
    permisSave() {
      let _this = this;
@@ -288,8 +300,8 @@ export default {
    // 编辑弹框
    openEdit(row) {
      this.$router.push({
-        path: "learnUpdate",
+        path: "videoCopyrightUpdate",
-        query: { type: "Update" }
+        query: { type: "Update" ,id :row.id}
      });
      // alert('编辑')
      // $('.el-dialog__title').html('编辑');
@@ -310,17 +322,17 @@ export default {
        type: "warning"
      })
        .then(() => {
-          // _this.$https({
+          _this.$https({
-          //   method: 'delete',
+            method: 'delete',
-          //   url: 'menu/delete?menuId='+ row.id,
+            url: 'copyrightOwner/delete/'+ row.id,
-          //   authType: this.backToken
+            authType: this.backToken
-          // }).then((res) => {
+          }).then((res) => {
-          //     this.$message({type: 'success', message: '删除成功!'});
+              this.$message({type: 'success', message: '删除成功!'});
-          //     _this.Search();
+              _this.Search();
-          //   }, (error) => {
+            }, (error) => {
-          //     this.$message({type: 'fail', message: "删除失败!" + error.response.data});
+              this.$message({type: 'fail', message: "删除失败!" + error.response.data});
-          //   }
+            }
-          // )
+          )
        })
        .catch(() => {});
    },
@@ -380,57 +392,6 @@ export default {
    handleSelectionChange(selection) {
      let _this = this;
      _this.selection = selection;
-    },
-    getMultipleSelect() {
-      let _this = this;
-      let arr = [];
-      let str = "";
-      if (_this.selection) {
-        _this.selection.forEach(function(e) {
-          arr.push(e.id);
-        });
-        str = arr.join(",");
-      } else {
-        str = "";
-      }
-      return str;
-    },
-    // 批量删除
-    multipleDelete() {
-      let _this = this;
-      let str = _this.getMultipleSelect();
-      if (str) {
-        this.$confirm("此操作将删除选中菜单, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          _this
-            .$https({
-              url: "menu/batchDel?menuIds=" + str,
-              method: "DELETE",
-              authType: this.backToken
-            })
-            .then(
-              res => {
-                if (res.data.status == 201 || res.data.status == 200) {
-                  this.$message({
-                    type: "success",
-                    message: "删除成功!"
-                  });
-                }
-                //重新查询数据
-                _this.onSearch();
-              },
-              error => {}
-            );
-        });
-      } else {
-        this.$message({
-          type: "info",
-          message: "请至少选择一个选项！"
-        });
-      }
    }
  }
 };
@@ -439,6 +400,6 @@ export default {
 <style lang="less">
 // @import "../../../../style/common";
 // @import "../../style/list";
-@import '../../../style/table.less';
+@import '../../../../style/table.less';
-@import '../../../style/pagination.less';
+@import '../../../../style/pagination.less';
 </style>
--- a/src/page/content/learn/project/index.vue
+++ b/src/page/content/learn/project/index.vue
--- a/src/page/content/video/classify/index.vue
+++ b/src/page/content/video/classify/index.vue
 <template>
  <div class="listPage H100">
    <div class="search-container">
-      <el-form :inline="true" :model="form" class="search-form" onsubmit="return false;">
+      <el-form :inline="true" :model="form" ref="form" class="search-form" onsubmit="return false;">
        <el-form-item label="版权方名称">
          <el-input
            size="mini"
@@ -23,7 +23,7 @@
        <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">重置</el-button>
+            <el-button size="mini" class="btn_form_search" @click="Reset">重置</el-button>
          </div>
        </el-form-item>
      </el-form>
@@ -83,7 +83,7 @@
        </div>
    </div>
     <!--新增弹框-->
-      <el-dialog title="新建" class="newPermis" :visible.sync="FormVisible1" :before-close="close1">
+      <el-dialog title="新建" custom-class="party-dialog"  width="468px" :visible.sync="FormVisible1" :before-close="close1">
           <div class="dialog-content">
        <el-form
          :model="classForm"
@@ -254,7 +254,7 @@ export default {
        // param
      )
        .then(res => {
-          let data = res.data.body;
+          let data = res.data.data;
          vm.page.pageSize = data.size;
          vm.page.total = data.total;
          vm.tableData = data.records;
@@ -284,6 +284,12 @@ export default {
      };
      this.getTableData(searchObj);
    },
+    // 重置
+    Reset(){
+      // this.$refs["form"].resetFields();
+      this.form = {}
+      this.Search()
+    },
    // // 获取当前查询参数
    getSearchQuery() {
      let _this = this;
@@ -433,7 +439,7 @@ export default {
      )
        .then(res => {
-          let data = res.data.body;
+          let data = res.data.data;
          this.classForm = data
        })
        .catch(function(err) {

--- a/src/page/content/video/content/add--.vue
+++ b/src/page/content/video/content/add--.vue
@@ -175,7 +175,7 @@ export default {
        },
      )
        .then(res => {
-          let data = res.data.body;
+          let data = res.data.data;
          // this.assetType = data
          this.ruleForm = data
          this.value1 = [data.expireDateStart,data.expireDateEnd]
@@ -200,7 +200,7 @@ export default {
        },
      )
        .then(res => {
-          let data = res.data.body;
+          let data = res.data.data;
          this.assetType = data
          // this.value1[0]=data.expireDateEnd
          //this.value1[1]=data.expireDateStart

--- a/src/page/content/learn/details.vue
+++ b/src/page/content/learn/details.vue
--- a/src/page/content/video/content/index.vue
+++ b/src/page/content/video/content/index.vue
@@ -23,7 +23,7 @@
        <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">重置</el-button>
+            <el-button size="mini" class="btn_form_search" @click="Reset">重置</el-button>
          </div>
        </el-form-item>
      </el-form>
@@ -289,7 +289,7 @@ export default {
        // param
      )
        .then(res => {
-          let data = res.data.body;
+          let data = res.data.data;
          vm.page.pageSize = data.size;
          vm.page.total = data.total;
          vm.tableData = data.records;
@@ -309,6 +309,11 @@ export default {
      let param = _this.getSearchQuery();
      _this.getTableData(param);
    },
+    // 重置
+    Reset(){
+      this.form = {}
+      this.Search()
+    },
    Search() {
      let _this = this;
      _this.page.currentPage = 1;
@@ -429,7 +434,7 @@ export default {
        // param
      )
        .then(res => {
-          let data = res.data.body;
+          let data = res.data.data;
          this.editform = data
        })
        .catch(function(err) {

--- a/src/page/content/video/copyright/add.vue
+++ b/src/page/content/video/copyright/add.vue
@@ -22,7 +22,7 @@
        <span>若没有相应的视频分类，请点击</span>
        <el-button type="text" @click="addVideoClass">新建视频分类</el-button>
      </el-form-item>
-      <el-form-item label="请选择预设视频分类">
+      <el-form-item class="selectH100" label="请选择预设视频分类">
        <el-select  placeholder="请选择预设视频分类" @focus="getAssetTypeData" multiple v-model="ruleForm.assetTypeIdList" @change="getSelectDep">
          <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
          <el-option
@@ -38,8 +38,8 @@
      </el-form-item>
      <el-form-item>
        <div class=" btn-group">
-          <el-button type="primary" v-show="type === 'add'" @click="submitForm('ruleForm')">确定</el-button>
+          <el-button type="primary" v-show="type === 'add'" class="btn_form_search" @click="submitForm('ruleForm')">确定</el-button>
-          <el-button type="primary" v-show="type === 'Update'" @click="updateForm('ruleForm')">确定</el-button>
+          <el-button type="primary" v-show="type === 'Update'" class="btn_form_search" @click="updateForm('ruleForm')">确定</el-button>
          <el-button @click="resetForm('ruleForm')">取消</el-button>
        </div>
@@ -170,7 +170,7 @@ export default {
        },
      )
        .then(res => {
-          let data = res.data.body;
+          let data = res.data.data;
          // this.assetType = data
          this.ruleForm = data
          this.value1 = [data.expireDateStart,data.expireDateEnd]
@@ -195,7 +195,7 @@ export default {
        },
      )
        .then(res => {
-          let data = res.data.body;
+          let data = res.data.data;
          this.assetType = data
          // this.value1[0]=data.expireDateEnd
          //this.value1[1]=data.expireDateStart
@@ -323,7 +323,7 @@ export default {
      this.ruleForm.assetTypeIdList = [];
      if (this.checkedThing) {
        this.assetType.map(item => {
-          this.ruleForm.assetTypeIdList.push(item.label);
+          this.ruleForm.assetTypeIdList.push(item.id);
        });
      } else {
        this.ruleForm.assetTypeIdList = [];

--- a/src/page/content/video/copyright/index.vue
+++ b/src/page/content/video/copyright/index.vue
@@ -23,7 +23,7 @@
        <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">重置</el-button>
+            <el-button size="mini" class="btn_form_search" @click="Reset">重置</el-button>
          </div>
        </el-form-item>
      </el-form>
@@ -182,7 +182,7 @@ export default {
        // param
      )
        .then(res => {
-          let data = res.data.body;
+          let data = res.data.data;
          vm.page.pageSize = data.size;
          vm.page.total = data.total;
          vm.tableData = data.records;
@@ -202,6 +202,12 @@ export default {
      let param = _this.getSearchQuery();
      _this.getTableData(param);
    },
+    // 重置
+    Reset(){
+      // this.$refs["form"].resetFields();
+      this.form = {}
+      this.Search()
+    },
    Search() {
      let _this = this;
      _this.page.currentPage = 1;

--- a/src/page/content/video/remit/index.vue
+++ b/src/page/content/video/remit/index.vue
 <template>
-<h1>视频汇出</h1>
+  <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-input
+            size="mini"
+            placeholder="请输入版权方名称"
+            v-model="form.name"
+            @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>
+        <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>
+          </div>
+        </el-form-item>
+      </el-form>
+      <div class="page-tip">
+        <span class="page-tip-title">页面说明:</span>
+        <span class="page-tips">可使用版权方、视频分类、视频名称模糊搜索对需要汇出的视频进行快速检索，选定视频后将视频汇出到指定U盘。</span>
+      </div>
+    </div>
+    <div class="table-content">
+      <div class="btn-group">
+        <el-button type="primary" @click="multipleRemit()">汇出</el-button>
+      </div>
+      <div class="party-table">
+        <el-table
+          border
+          style="width: 100%;height:100%"
+          height="100%"
+          ref="multipleTable"
+          :data="tableData"
+          @selection-change="handleSelectionChange"
+        >
+          <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>
+      </div>
+      <div class="partyt-pagination">
+        <el-pagination
+          small
+          background
+          @current-change="handleCurrentChange"
+          :current-page="page.currentPage"
+          :page-size="page.pageSize"
+          layout="prev, pager, next, jumper"
+          :total="page.total"
+        ></el-pagination>
+      </div>
+    </div>
+  </div>
 </template>
+<script>
+export default {
+  data() {
+    var checkIsNull = (rule, value, callback) => {
+      if (value) {
+        if (value.trim() == "") {
+          callback(new Error("不允许只输入空格"));
+        } else {
+          callback();
+        }
+      }
+    };
+    return {
+      type: true,
+      value1: "",
+      page: { currentPage: 1, pageSize: 10, total: 0 },
+      tableData: [],
+      FormVisible: false,
+      FormVisible1: false,
+      formLabelWidth: "100px",
+      form: {
+        name: ""
+      },
+      editform: {
+        menuName: "",
+        menuUrl: "",
+        parentId: "",
+        sort: "",
+        id: ""
+      },
+      classForm: {
+        menuName: "",
+        menuUrl: "",
+        parentId: "",
+        sort: ""
+      },
+      typeList: [],
+      rules: {
+        sort: [
+          { required: true, message: "请输入顺序值", trigger: "change" },
+          { pattern: /^(\d{1,5})?$/, message: "排序值为低于5位数的纯数字" }
+        ],
+        menuName: [
+          { required: true, message: "请输入菜单名称", trigger: "change" },
+          { max: 20, message: "不能超过20个字符", trigger: "change" },
+          { validator: checkIsNull, trigger: "blur" }
+        ],
+        menuUrl: [
+          { required: true, message: "请输入菜单地址", trigger: "change" },
+          { validator: checkIsNull, trigger: "blur" }
+        ],
+        parentId: [
+          { required: true, message: "请输入父级菜单", trigger: "change" }
+        ]
+      },
+      value: "",
+      name: ""
+    };
+  },
+  computed: {},
+  mounted() {
+    this.onSearch();
+    // this.getPermis();
+  },
+  components: {},
+  methods: {
+    // 渲染父级权限
+    getPermis() {
+      let vm = this;
+      vm.$https({
+        method: "get",
+        url: "menu/getRoleMenu?roleId=" + sessionStorage.getItem("roleId"),
+        authType: this.backToken
+      }).then(
+        res => {
+          let data = res.data;
+          vm.typeList = data.map((e, i) => {
+            return {
+              id: e.id,
+              name:
+                e.menuName.indexOf("-") == -1
+                  ? e.menuName
+                  : e.menuName.split("-")[1]
+            };
+          });
+        },
+        error => {
+          console.log(error);
+        }
+      );
+    },
+    // 获得数据接口
+    getTableData(param) {
+      let vm = this;
+      vm.$https(
+        {
+          url: "assetType/getPageList",
+          method: "post",
+          authType: this.backToken
+        },
+        vm.$qs.stringify(param)
+        // param
+      )
+        .then(res => {
+          let data = res.data.data;
+          vm.page.pageSize = data.size;
+          vm.page.total = data.total;
+          vm.tableData = data.records;
+        })
+        .catch(function(err) {
+          console.log(err);
+        });
+    },
+    // 分页
+    handleCurrentChange(val) {
+      let _this = this;
+      _this.page.currentPage = val;
+      _this.onSearch();
+    },
+    onSearch() {
+      let _this = this;
+      let param = _this.getSearchQuery();
+      _this.getTableData(param);
+    },
+    // 重置
+    Reset(){
+      // this.$refs["form"].resetFields();
+      this.form = {}
+      this.Search()
+    },
+    Search() {
+      let _this = this;
+      _this.page.currentPage = 1;
+      let searchObj = {
+        _index: 1,
+        _size: _this.page.pageSize,
+        name: _this.form.name
+      };
+      this.getTableData(searchObj);
+    },
+    // // 获取当前查询参数
+    getSearchQuery() {
+      let _this = this;
+      let searchObj = {
+        _index: _this.page.currentPage,
+        _size: _this.page.pageSize
+      };
+      for (let key in _this.form) {
+        if (_this.form[key]) {
+          searchObj[key] = _this.form[key];
+        }
+      }
+      return searchObj;
+    },
+    // 批量操作
+    handleSelectionChange(selection) {
+      let _this = this;
+      _this.selection = selection;
+    },
+    getMultipleSelect() {
+      let _this = this;
+      let arr = [];
+      let str = "";
+      if (_this.selection) {
+        _this.selection.forEach(function(e) {
+          arr.push(e.id);
+        });
+        // str = arr.join(",");
+        str = arr;
+      } else {
+        // str = "";
+        str = [];
+      }
+      return str;
+    },
+    // 批量删除
+    multipleRemit() {
+      let _this = this;
+      let str = _this.getMultipleSelect();
+      //   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 => {}
+        //   );
+      } else {
+        this.$message({
+          type: "info",
+          message: "请至少选择一个选项！"
+        });
+      }
+      //   if (str) {
+      //     this.$confirm("此操作将删除选中菜单, 是否继续?", "提示", {
+      //       confirmButtonText: "确定",
+      //       cancelButtonText: "取消",
+      //       type: "warning"
+      //     }).then(() => {
+      //       _this
+      //         .$https({
+      //           url: "menu/batchDel?menuIds=" + str,
+      //           method: "DELETE",
+      //           authType: this.backToken
+      //         })
+      //         .then(
+      //           res => {
+      //             if (res.data.status == 201 || res.data.status == 200) {
+      //               this.$message({
+      //                 type: "success",
+      //                 message: "删除成功!"
+      //               });
+      //             }
+      //             //重新查询数据
+      //             _this.onSearch();
+      //           },
+      //           error => {}
+      //         );
+      //     });
+      //   } else {
+      //     this.$message({
+      //       type: "info",
+      //       message: "请至少选择一个选项！"
+      //     });
+      //   }
+    }
+  }
+};
+</script>
+<style lang="less">
+// @import "../../../../style/common";
+// @import "../../style/list";
+@import "../../../../style/dialog.less";
+@import "../../../../style/table.less";
+@import "../../../../style/pagination.less";
+</style>
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -348,42 +348,91 @@ const router = new Router({
        },
        // --学习
        {
-          path: '/learn',
+          path: '/learnProject',
+          name: '学习项目制作',
+          component: () => import('@/page/content/learn/project/index'),
+          meta:{
+            showBreadcrumb:true,
+            title:'学习项目制作',
+          }
+        },
+        {
+          path: '/learnContent',
          name: '学习内容制作',
-          component: () => import('@/page/content/learn/index'),
+          component: () => import('@/page/content/learn/content/index'),
          meta:{
            showBreadcrumb:true,
            title:'学习内容制作',
          }
        },
        {
-          path: '/learnAdd',
+          path: '/learnContentAdd',
          name: '新建学习内容',
-          component: () => import('@/page/content/learn/add'),
+          component: () => import('@/page/content/learn/content/add'),
          meta:{
            showBreadcrumb:true,
            title:'新建学习内容',
          }
        },
        {
-          path: '/learnUpdate',
+          path: '/learnContentUpdate',
-          name: '修改展板',
+          name: '修改学习内容',
-          component: () => import('@/page/content/learn/add'),
+          component: () => import('@/page/content/learn/content/add'),
          meta:{
            showBreadcrumb:true,
-            title:'修改展板',
+            title:'修改学习内容',
          }
        },
        {
-          path: '/learnDetails',
+          path: '/learnContentDetails',
-          name: '展板管理详情',
+          name: '学习内容详情',
-          component: () => import('@/page/content/learn/details'),
+          component: () => import('@/page/content/learn/content/details'),
          meta:{
            showBreadcrumb:true,
-            title:'展板管理详情',
+            title:'学习内容详情',
+          }
+        },
+        // 审核
+        {
+          path: '/checkVideo',
+          name: '视频审核',
+          component: () => import('@/page/check/video/index'),
+          meta:{
+            showBreadcrumb:true,
+            title:'视频审核',
+          }
+        },
+        {
+          path: '/checkDisplay',
+          name: '展板审核',
+          component: () => import('@/page/check/display/index'),
+          meta:{
+            showBreadcrumb:true,
+            title:'展板审核',
+          }
+        },
+        {
+          path: '/checkLearn',
+          name: '平台学习内容审核',
+          component: () => import('@/page/check/learn/index'),
+          meta:{
+            showBreadcrumb:true,
+            title:'平台学习内容审核',
+          }
+        },
+        {
+          path: '/checkLearnDetails',
+          name: '学习内容详情',
+          component: () => import('@/page/check/learn/details'),
+          meta:{
+            showBreadcrumb:true,
+            title:'学习内容详情',
          }
        },
        //新建页面
        {
          path: '/newServiceGuide',

--- a/src/style/global.css
+++ b/src/style/global.css
+.f14{font-size:14px}.f16{font-size:14px}.f18{font-size:18px}.f24{font-size:24px}.f0{font-size:0px}.inline-block{display:inline-block}.height100{height:100%}@media screen and (max-width:1600px){.search-container .el-input{width:180px}.search-container .btn-group .el-button{width:80px}.page-tips{width:365px}}@media (min-width:1601px) and (max-width:1800px){.search-container .el-input{width:220px}.search-container .btn-group .el-button{width:96px}.page-tips{width:460px}}@media (min-width:1801px){.search-container .el-input{width:280px}.search-container .btn-group .el-button{width:128px}.page-tips{width:480px}}.search-container{background:#FFFFFF;box-shadow:0 4px 8px 0 rgba(0,0,0,0.1);border-radius:8px;margin-bottom:20px;padding:20px 24px;height:80px;display:flex;justify-content:space-between}.search-container .el-form{margin-bottom:0}.search-container .el-form .el-input .el-input__inner{border-radius:22px;background-color:#F8F8F8;border-color:#EEEEEE}.search-container .el-form .el-range-editor.el-input__inner{width:280px;border-radius:22px;background-color:#F8F8F8}.search-container .el-form .el-range-editor.el-input__inner .el-range-separator{width:20px;padding:0 2px}.search-container .el-form .el-input__icon{width:40px;font-size:20px;color:#AC9374}.search-container .el-form .btn-group{padding-left:15px}.search-container .el-form .btn-group .el-button{height:40px}.search-container .page-tip{display:flex;font-size:14px;color:#333333}.search-container .page-tip .page-tip-title{font-weight:bold;padding-right:10px}.table-content{height:calc(100% - 100px);background:#FFFFFF;box-shadow:0 4px 8px 0 rgba(0,0,0,0.1);border-radius:8px;padding:20px 40px 0 40px}.table-content .btn-group{text-align:right;margin-bottom:12px}.table-content .btn-group .el-button{min-width:128px}.btn-group .el-button{height:36px;padding:0;border-radius:28px}.btn-group .el-button span{font-size:16px}.btn-group .el-button--primary{background-color:#AC9374;border-color:#AC9374;color:#FFFFFF}.btn-group .el-button--default{background:rgba(172,147,116,0.1);border:1px solid #AC9374;color:#AC9374}.party-form .el-input{width:280px}.party-form .el-input .el-input__inner{border-radius:22px;background-color:#F8F8F8;border:1px solid #EEEEEE}.party-form .el-textarea .el-textarea__inner{background-color:#F8F8F8;border-radius:8px}.party-form .el-range-editor.el-input__inner{width:280px;border-radius:22px}.party-form .mt16{margin-top:16px}.party-form .el-radio-group .el-radio__inner{width:24px;height:24px;border-color:#EEEEEE}.party-form .el-radio-group .el-radio__label{font-size:16px}.party-form .el-radio-group .el-radio.is-checked .el-radio__input.is-checked .el-radio__inner{background-color:transparent;border-color:#EEEEEE}.party-form .el-radio-group .el-radio.is-checked .el-radio__input.is-checked .el-radio__inner:after{width:10px;height:10px;background-color:#AC9374}.party-form .el-radio-group .el-radio.is-checked .el-radio__label{color:#333333}.party-form .el-checkbox-group .el-checkbox{margin-right:25px}.party-form .el-checkbox-group .el-checkbox .el-checkbox__inner{width:22px;height:22px}.party-form .el-checkbox-group .el-checkbox .el-checkbox__inner:hover{border-color:#EEEEEE}.party-form .el-checkbox-group .el-checkbox .el-checkbox__label{color:#333333}.party-form .el-checkbox-group .el-checkbox+.el-checkbox{margin-left:0}.party-form .el-checkbox-group .el-checkbox.is-checked .el-checkbox__inner{border-color:#EEEEEE;background-color:#F5F5F5}.party-form .el-checkbox-group .el-checkbox.is-checked .el-checkbox__inner:after{border:2px solid #AC9374;border-left:0;border-top:0;height:11px;left:7px;width:5px}.party-form .el-checkbox-group .el-checkbox.is-checked .el-checkbox__label{color:#333333}.page-form-box{background:#FFFFFF;box-shadow:0 4px 8px 0 rgba(0,0,0,0.1);border-radius:8px;height:100%}.page-form-box .page-form-box-header{height:64px;line-height:64px;border-bottom:1px solid #EEEEEE;font-size:20px;color:#333333;text-align:center;font-weight:bold}.page-form-box .page-form-box-content{height:calc(100% - 148px);padding:20px}.page-form-box .page-form-box-footer{height:84px;line-height:84px;text-align:center;border-top:1px solid #EEEEEE}.page-form-box .page-form-box-footer .el-button{width:160px;height:40px}.overview-detail .ecahrts-panel-box{height:calc(50% + 20px)}.overview-detail .rank-panel-box{height:calc(50% - 40px);margin-top:20px}.overview-detail .ecahrts-panel-box,.overview-detail .rank-panel-box{background:#FFFFFF;box-shadow:0 4px 8px 0 rgba(221,221,221,0.4);border-radius:8px}.overview-detail .panel-box-header{height:64px;line-height:64px;border-bottom:1px solid #EEEEEE;padding:0 24px}.overview-detail .panel-box-header .title{font-weight:bold;font-size:20px}.overview-detail .panel-box-header .tip{float:right;color:#333333}.overview-detail .panel-box-header .tip .tip-title{font-weight:bold;padding-right:10px}.overview-detail .panel-box-header .el-range-editor.el-input__inner{width:280px;border-radius:22px;background-color:#F8F8F8;margin-left:40px;padding-left:15px}.overview-detail .panel-box-header .el-range-editor.el-input__inner .el-range-input{background-color:#F8F8F8}.overview-detail .panel-box-header .el-range-editor.el-input__inner .el-range-separator{width:20px;padding:0 2px}.overview-detail .panel-box-header .el-range-editor.el-input__inner .el-icon-date{color:#AC9374;font-size:18px}.overview-detail .panel-box-content{height:calc(100% - 64px);overflow:hidden}.overview-detail .rank-box{width:50%}.overview-detail .rank-box.left{padding-right:10px}.overview-detail .rank-box.right{padding-left:10px}.party-icon-20{display:inline-block;width:20px;height:20px;background-repeat:no-repeat;background-size:cover}.party-icon-24{display:inline-block;width:24px;height:24px;background-repeat:no-repeat;background-size:cover}.icon-add{background-image:url("~@/assets/icons/add.png")}.icon-import{background-image:url("~@/assets/icons/import.png")}.icon-detail{background-image:url("~@/assets/icons/detail.png")}.icon-edit{background-image:url("~@/assets/icons/edit.png")}.icon-reset{background-image:url("~@/assets/icons/reset.png")}.icon-enable{background-image:url("~@/assets/icons/enable.png")}.icon-disable{background-image:url("~@/assets/icons/disable.png")}.icon-del{background-image:url("~@/assets/icons/del.png")}.icon-org{display:inline-block;width:16px;height:16px;background-repeat:no-repeat;background-size:cover;background-image:url("~@/assets/icons/org.png");margin-right:8px}.org-tree .el-tree-node__expand-icon{position:absolute;right:10px;top:14px;color:#000000;font-size:16px}.org-tree .el-tree-node__expand-icon.is-leaf{color:transparent}.org-tree .el-tree-node{background-color:#FFFFFF}.org-tree .el-tree-node__content{height:auto;position:relative;background-color:transparent  !important}.org-tree .el-tree-node__content:hover{background-color:transparent}.org-tree div[class*="tree-node-level"]{width:100%;color:#333333;border-radius:5px}.org-tree .tree-node-level1 span,.org-tree .tree-node-level2 span{font-size:16px}.org-tree .tree-node-level3 span{font-size:14px}.org-tree .tree-node-level1{height:56px;line-height:56px;border-bottom:1px solid #EEEEEE}.org-tree .tree-node-level2,.org-tree .tree-node-level3{height:40px;line-height:40px;margin:5px 0;border-radius:20px;padding-left:10px}.org-tree .tree-node-level2:hover{background-color:#FDFBF8}.org-tree .tree-node-level3:hover{background-color:#EEEEEE}/*# sourceMappingURL=./global.css.map */
\ No newline at end of file
--- a/src/style/global.css.map
+++ b/src/style/global.css.map
+{"version":3,"sources":["global.less"],"names":[],"mappings":"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"}
\ No newline at end of file
--- a/src/style/global.less
+++ b/src/style/global.less