Merge branch 'master' into dev_fbl

src/config/httpServer.js

@@ -96,12 +96,16 @@ const httpServer = (opts, data, file, timeout) => {
       text: 'Loading',
       spinner: 'el-icon-loading'
     })
-    let markIndex = setTimeout(function () {
-      loadingInstance.close();
-    }, 10000)
+    // let markIndex = setTimeout(function () {
+    //   loadingInstance.close();
+    // }, 10000)
     axios(httpDefaultOpts).then((res) => {
-      loadingInstance.close();
-      clearTimeout(markIndex)
+      console.log(res)
+      if(res.data){
+        loadingInstance.close();
+        // clearTimeout(markIndex)
+      }
+     
       if (res.data.resultCode == '1109' && localStorage.getItem('backToken')) {
         //清除用户信息
         errorState(res.status, res.data)

src/page/accounts/components/checkTable.vue

@@ -8,7 +8,7 @@
     >
       <el-table-column label="序号" align="center" width="100">
         <template slot-scope="scope">
-          <span>{{ (currentPage - 1) * 10 * scope.$index + 1 }}</span>
+           <span>{{ (currentPage - 1) * 10 + scope.$index + 1 }}</span>
         </template>
       </el-table-column>
       <el-table-column

src/page/accounts/statistical.vue

@@ -41,7 +41,7 @@
     </div>
     <div class="table-content">
       <div class="btn-group">
-        <el-button type="primary" @click="handleAdd">新建统计账户</el-button>
+        <el-button type="primary" @click="handleAdd">新建统计账号</el-button>
       </div>
       <account-table
         :feildList="feildList"

src/page/accounts/stbAdmin.vue

@@ -42,7 +42,7 @@
     </div>
     <div class="table-content">
       <div class="btn-group">
-        <el-button type="primary" @click="handleAdd()">新建运维账户</el-button>
+        <el-button type="primary" @click="handleAdd()">新建运维账号</el-button>
       </div>
       <account-table
         :feildList="feildList"
@@ -110,6 +110,7 @@ export default {
     },
     handleReset() {
       this.form.userName = "";
+      this.form.status = ""
       this.getFirstPageList();
     },
     getPageList() {

src/page/accounts/unitAdmin.vue

@@ -52,7 +52,7 @@
     </div>
     <div class="table-content">
       <div class="btn-group">
-        <el-button type="primary" @click="handleAdd()">新建账户</el-button>
+        <el-button type="primary" @click="handleAdd()">新建账号</el-button>
       </div>
       <account-table
         :feildList="feildList"

src/page/accounts/users.vue

@@ -27,7 +27,7 @@
     </div>
     <div class="table-content">
       <div class="btn-group">
-        <el-button type="primary" @click="handleAdd()">新建账户</el-button>
+        <el-button type="primary" @click="handleAdd()">新建账号</el-button>
       </div>
       <account-table
         :feildList="feildList"

src/page/check/display/index.vue

 <template>
   <div class="listPage H100">
     <div class="search-container">
-      <el-form
-        :inline="true"
-        :model="form"
-        ref="form"
-        onsubmit="return false;"
-      >
-        <el-form-item label="">
+      <el-form :inline="true" :model="form" ref="form" onsubmit="return false;">
+        <el-form-item label>
           <el-input
             placeholder="请输入视频名称、提交人"
             v-model="form.name"
@@ -25,22 +20,14 @@
         </el-form-item>
         <el-form-item>
           <div class="btn-group">
-            <el-button
-              type="primary"
-              @click="Search"
-              >查询</el-button
-            >
-            <el-button @click="Reset"
-              >重置</el-button
-            >
+            <el-button type="primary" @click="Search">查询</el-button>
+            <el-button @click="Reset">重置</el-button>
           </div>
         </el-form-item>
       </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">
@@ -53,7 +40,7 @@
           :data="tableData"
           @selection-change="handleSelectionChange"
         >
-           <el-table-column type="index" width="120" label="序号">
+          <el-table-column type="index" width="120" label="序号">
             <template slot-scope="scope">
               <span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
             </template>
@@ -61,7 +48,7 @@
           <el-table-column label="展板名称" prop="name"></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="operation">
+          <el-table-column label="审核项" prop="operation">
             <template slot-scope="scope">
               <span class="input-item">{{keyMap[scope.row.operation]}}</span>
             </template>
@@ -71,16 +58,21 @@
               <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
-              >
+              <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">
               <div class="table-btn-group">
                 <el-tooltip content="详情" placement="top">
-                  <el-button circle @click="openDetails(scope.row)">
+                  <el-button
+                    :disabled="
+                scope.row.operation === 'REMOVE' &&
+                scope.row.status === 'APPROVED_FINAL'
+              "
+                    circle
+                    @click="openDetails(scope.row)"
+                  >
                     <i class="icon-table icon-detail"></i>
                   </el-button>
                 </el-tooltip>
@@ -88,7 +80,7 @@
             </template>
           </el-table-column>
           <el-table-column label="审核" width="220" header-align="center" align="center">
-            <template slot-scope="scope" >
+            <template slot-scope="scope">
               <!-- <div class="table-btn-group">
                
                 <el-tooltip content="通过" placement="top">
@@ -101,8 +93,8 @@
                     <i class="icon-table icon-disable"></i>
                   </el-button>
                 </el-tooltip>
-              </div> -->
-               <div class="table-btn-group">
+              </div>-->
+              <div class="table-btn-group">
                 <el-button
                   round
                   class="passed"
@@ -127,7 +119,7 @@
         </el-table>
       </div>
       <div class="partyt-pagination">
-        <el-pagination    
+        <el-pagination
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pageSize"
@@ -160,9 +152,7 @@
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer btn-group">
-        <el-button size="mini" type="primary" @click="permisSave"
-          >确定</el-button
-        >
+        <el-button size="mini" type="primary" @click="permisSave">确定</el-button>
         <!-- <el-button size="mini" v-show="!type" type="primary" @click="permisEdit">确定</el-button> -->
         <el-button size="mini" @click="close1">取 消</el-button>
       </div>
@@ -186,11 +176,7 @@
           :rules="rules"
         >
           <el-form-item label="展板名称" :label-width="formLabelWidth">
-            <el-input
-              size="small"
-              v-model="editForm.name"
-              auto-complete="off"
-            ></el-input>
+            <el-input size="small" v-model="editForm.name" auto-complete="off"></el-input>
           </el-form-item>
           <el-form-item label="版权方" :label-width="formLabelWidth">
             <el-input
@@ -202,33 +188,25 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="宣传图" :label-width="formLabelWidth">
-            <img class="imgSize" :src="editForm.cover" alt="" />
+            <img class="imgSize" :src="editForm.cover" alt />
           </el-form-item>
           <el-form-item label="二维码" :label-width="formLabelWidth">
-            <img class="imgSize" :src="editForm.qrcodeUrl" alt="" />
+            <img class="imgSize" :src="editForm.qrcodeUrl" alt />
           </el-form-item>
           <el-form-item label="简介" :label-width="formLabelWidth">
             <el-input type="textarea" v-model="editForm.remarks"></el-input>
           </el-form-item>
           <el-form-item label="展板视频" :label-width="formLabelWidth">
             <div class="video-box">
-              <div
-                class="video-item"
-                v-for="(item, index) in editForm.videoList"
-                :key="index"
-              >
-                <video :src="item.fileUrl" controls />
+              <div class="video-item" v-for="(item, index) in editForm.videoList" :key="index">
+                <video :src="item.fileUrl" controls  controlsList='nodownload noremote footbar' />
                 <span>{{ item.fileName }}</span>
               </div>
             </div>
           </el-form-item>
           <el-form-item label="展板音频" :label-width="formLabelWidth">
             <div class="audio-box">
-              <div
-                class="audio-item"
-                v-for="(item, index) in editForm.audioList"
-                :key="index"
-              >
+              <div class="audio-item" v-for="(item, index) in editForm.audioList" :key="index">
                 <audio :src="item.fileUrl" controls />
                 <span>{{ item.fileName }}</span>
               </div>
@@ -275,39 +253,39 @@ export default {
       formLabelWidth: "100px",
       form: {
         name: "",
-        type: "EXHIBITION_BOARD",
+        type: "EXHIBITION_BOARD"
       },
       editForm: {
         name: "",
         cover: "",
-        sort: "",
+        sort: ""
       },
       classForm: {
         status: "",
         remarks: "",
-        id: "",
+        id: ""
       },
       typeList: [],
       rules: {
         sort: [
           { required: true, message: "请输入顺序值", trigger: "change" },
-          { pattern: /^(\d{1,5})?$/, message: "排序值为低于5位数的纯数字" },
+          { pattern: /^(\d{1,5})?$/, message: "排序值为低于5位数的纯数字" }
         ],
         menuName: [
           { required: true, message: "请输入菜单名称", trigger: "change" },
           { max: 20, message: "不能超过20个字符", trigger: "change" },
-          { validator: checkIsNull, trigger: "blur" },
+          { validator: checkIsNull, trigger: "blur" }
         ],
         menuUrl: [
           { required: true, message: "请输入菜单地址", trigger: "change" },
-          { validator: checkIsNull, trigger: "blur" },
+          { validator: checkIsNull, trigger: "blur" }
         ],
         parentId: [
-          { required: true, message: "请输入父级菜单", trigger: "change" },
-        ],
+          { required: true, message: "请输入父级菜单", trigger: "change" }
+        ]
       },
       value: "",
-      name: "",
+      name: ""
     };
   },
   computed: {},
@@ -323,9 +301,9 @@ export default {
       vm.$https({
         method: "get",
         url: "menu/getRoleMenu?roleId=" + sessionStorage.getItem("roleId"),
-        authType: this.backToken,
+        authType: this.backToken
       }).then(
-        (res) => {
+        res => {
           let data = res.data;
           vm.typeList = data.map((e, i) => {
             return {
@@ -333,11 +311,11 @@ export default {
               name:
                 e.menuName.indexOf("-") == -1
                   ? e.menuName
-                  : e.menuName.split("-")[1],
+                  : e.menuName.split("-")[1]
             };
           });
         },
-        (error) => {
+        error => {
           console.log(error);
         }
       );
@@ -349,18 +327,18 @@ export default {
         {
           url: "audit/getPageAllList",
           method: "get",
-          authType: this.backToken,
+          authType: this.backToken
         },
         // vm.$qs.stringify(param)
         param
       )
-        .then((res) => {
+        .then(res => {
           let data = res.data.data;
           vm.page.pageSize = data.size;
           vm.page.total = data.total;
           vm.tableData = data.records;
         })
-        .catch(function (err) {
+        .catch(function(err) {
           console.log(err);
         });
     },
@@ -383,7 +361,7 @@ export default {
         _size: _this.page.pageSize,
         name: _this.form.name,
         status: _this.form.status,
-        type: "EXHIBITION_BOARD",
+        type: "EXHIBITION_BOARD"
       };
       this.getTableData(searchObj);
     },
@@ -398,7 +376,7 @@ export default {
       let _this = this;
       let searchObj = {
         _index: _this.page.currentPage,
-        _size: _this.page.pageSize,
+        _size: _this.page.pageSize
       };
       for (let key in _this.form) {
         if (_this.form[key]) {
@@ -418,24 +396,24 @@ export default {
     // 请填写驳回原因视频分类确认保存
     permisEdit() {
       let _this = this;
-      _this.$refs.classForm.validate((valid) => {
+      _this.$refs.classForm.validate(valid => {
         if (valid) {
           _this
             .$https(
               {
                 url: "videoContentCat/update",
                 method: "put",
-                authType: this.backToken,
+                authType: this.backToken
               },
               _this.$qs.stringify(_this.classForm)
               // _this.classForm
             )
             .then(
-              (res) => {
+              res => {
                 if (res.data.resultCode == 200 || res.data.resultCode == 201) {
                   _this.$message({
                     type: "success",
-                    message: "新建成功！",
+                    message: "新建成功！"
                   });
                   //跳回用户列表
                   _this.onSearch();
@@ -447,14 +425,14 @@ export default {
                 } else {
                   _this.$message({
                     type: "error",
-                    message: res.data.msg,
+                    message: res.data.msg
                   });
                 }
               },
-              (error) => {
+              error => {
                 _this.$message({
                   type: "error",
-                  message: error,
+                  message: error
                 });
               }
             );
@@ -463,7 +441,7 @@ export default {
     },
     // 请填写驳回原因关闭
     close() {
-      this.editForm = {}
+      this.editForm = {};
       this.FormVisible = false;
       // for (let key in this.classForm) {
       //   this.classForm[key] = null;
@@ -505,17 +483,17 @@ export default {
             url: "audit/updateAuditAllById",
             headers: { "Content-Type": "application/json" },
             method: "put",
-            authType: this.backToken,
+            authType: this.backToken
           },
           // _this.$qs.stringify(_this.classForm)
           _this.classForm
         )
         .then(
-          (res) => {
+          res => {
             if (res.data.resultCode == 200 || res.data.resultCode == 201) {
               _this.$message({
                 type: "success",
-                message: "操作成功！",
+                message: "操作成功！"
               });
               //跳回用户列表
               _this.onSearch();
@@ -527,14 +505,14 @@ export default {
             } else {
               _this.$message({
                 type: "error",
-                message: res.data.msg,
+                message: res.data.msg
               });
             }
           },
-          (error) => {
+          error => {
             _this.$message({
               type: "error",
-              message: error,
+              message: error
             });
           }
         );
@@ -551,15 +529,15 @@ export default {
         {
           url: "videoContentCat/get/" + id,
           method: "get",
-          authType: this.backToken,
+          authType: this.backToken
         }
         // param
       )
-        .then((res) => {
+        .then(res => {
           let data = res.data.data;
           this.classForm = data;
         })
-        .catch(function (err) {
+        .catch(function(err) {
           console.log(err);
         });
     },
@@ -576,11 +554,11 @@ export default {
         {
           url: "exhibitionBoard/get/" + id,
           method: "get",
-          authType: this.backToken,
+          authType: this.backToken
         }
         // param
       )
-        .then((res) => {
+        .then(res => {
           let resData = res.data.data;
           this.editForm = resData;
           // this.ruleForm = data;
@@ -602,7 +580,7 @@ export default {
 
           // }
         })
-        .catch(function (err) {
+        .catch(function(err) {
           console.log(err);
         });
     },
@@ -612,24 +590,24 @@ export default {
       this.$confirm("此操作将永久删除, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning",
+        type: "warning"
       })
         .then(() => {
           _this
             .$https({
               method: "delete",
               url: "videoContentCat/delete/" + row.id,
-              authType: this.backToken,
+              authType: this.backToken
             })
             .then(
-              (res) => {
+              res => {
                 this.$message({ type: "success", message: "删除成功!" });
                 _this.Search();
               },
-              (error) => {
+              error => {
                 this.$message({
                   type: "fail",
-                  message: "删除失败!" + error.response.data,
+                  message: "删除失败!" + error.response.data
                 });
               }
             );
@@ -698,7 +676,7 @@ export default {
       let arr = [];
       let str = "";
       if (_this.selection) {
-        _this.selection.forEach(function (e) {
+        _this.selection.forEach(function(e) {
           arr.push(e.id);
         });
         str = arr.join(",");
@@ -715,36 +693,36 @@ export default {
         this.$confirm("此操作将删除选中菜单, 是否继续?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning",
+          type: "warning"
         }).then(() => {
           _this
             .$https({
               url: "menu/batchDel?menuIds=" + str,
               method: "DELETE",
-              authType: this.backToken,
+              authType: this.backToken
             })
             .then(
-              (res) => {
+              res => {
                 if (res.data.status == 201 || res.data.status == 200) {
                   this.$message({
                     type: "success",
-                    message: "删除成功!",
+                    message: "删除成功!"
                   });
                 }
                 //重新查询数据
                 _this.onSearch();
               },
-              (error) => {}
+              error => {}
             );
         });
       } else {
         this.$message({
           type: "info",
-          message: "请至少选择一个选项！",
+          message: "请至少选择一个选项！"
         });
       }
-    },
-  },
+    }
+  }
 };
 </script>
 
@@ -765,10 +743,15 @@ export default {
 @import "../../../style/pagination.less";
 .video-box {
   width: 100%;
-  .video-item { width: 100%;}
-   video {width: 100%;height: 200px;}
+  .video-item {
+    width: 100%;
+  }
+  video {
+    width: 100%;
+    height: 200px;
+  }
 }
-audio:focus{
+audio:focus {
   outline: none;
 }
 </style>

src/page/check/learn/index.vue

@@ -64,16 +64,23 @@
               </template>
             </el-table-column>
             <el-table-column label="操作" header-align="center" align="center">
-              <template slot-scope="scope" width="220">
-                 <div class="table-btn-group">
+            <template slot-scope="scope" width="220">
+              <div class="table-btn-group">
                 <el-tooltip content="详情" placement="top">
-                  <el-button circle @click="openDetails(scope.row)">
+                  <el-button
+                    :disabled="
+                scope.row.operation === 'REMOVE' &&
+                scope.row.status === 'APPROVED_FINAL'
+              "
+                    circle
+                    @click="openDetails(scope.row)"
+                  >
                     <i class="icon-table icon-detail"></i>
                   </el-button>
                 </el-tooltip>
               </div>
-              </template>
-            </el-table-column>
+            </template>
+          </el-table-column>
              <el-table-column label="审核"  width="220" header-align="center" align="center">
               <template slot-scope="scope">
                  <div class="table-btn-group">

src/page/check/video/index.vue

@@ -61,11 +61,18 @@
               <span v-else-if="scope.row.status === 'APPROVED_FINAL'">通过</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" header-align="center" align="center">
+            <el-table-column label="操作" header-align="center" align="center">
             <template slot-scope="scope" width="220">
               <div class="table-btn-group">
                 <el-tooltip content="详情" placement="top">
-                  <el-button circle @click="openDetails(scope.row)">
+                  <el-button
+                    :disabled="
+                scope.row.operation === 'REMOVE' &&
+                scope.row.status === 'APPROVED_FINAL'
+              "
+                    circle
+                    @click="openDetails(scope.row)"
+                  >
                     <i class="icon-table icon-detail"></i>
                   </el-button>
                 </el-tooltip>
@@ -156,7 +163,7 @@
             :height="height"
             :width="width"
             align="center"
-            :controls="controls"
+            controls controlsList='nodownload noremote footbar'
           >
             <source :src="item.fileUrl" />
           </video>

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

@@ -42,7 +42,7 @@
             <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="备注" class="w100">
+        <el-form-item label="备注" class="w100" prop="remarks">
           <el-input type="textarea" v-model="ruleForm.remarks"></el-input>
         </el-form-item>
       </el-form>
@@ -93,7 +93,10 @@ export default {
         ],
         value1:[
           { required: true, message: "请填写版权方有效期", trigger: "change" }
-        ]
+        ],
+        remarks: [
+          { min: 1, max: 100, message: "请输入1到100个字" },
+        ],
       }
     };
   },

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

@@ -14,7 +14,7 @@
       :height="height"
       :width="width"
       align="center"
-      :controls="controls"
+      controls controlsList='nodownload noremote footbar'
     >
       <source :src="item.fileUrl"  />
     </video>

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

@@ -29,6 +29,7 @@ export default {
   },
   data() {
     return {
+      fullscreenLoading: false,
       loading:false,
       filedata:[],
       fileArr: [],
@@ -37,8 +38,24 @@ export default {
     };
   },
   methods: {
+     openFullScreen2() {
+        const loading = this.$loading({
+          lock: true,
+          text: '上传中，请稍候。。。',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        
+      },
     submitUpload() {  // 导入
-    this.loading = true
+    // this.openFullScreen2()
+     const loading = this.$loading({
+          lock: true,
+          text: '上传中，请稍候。。。',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+    // this.loading = true
         let tempData =  this.filedata
         this.filedata = new FormData()  //  用FormData存放上传文件
         this.$refs.upload.submit()  // 会循环调用uploadFile方法，多个文件调用多次
@@ -56,9 +73,10 @@ export default {
         .then(res => {
           let resData = res.data;
           console.log(res)
-          this.loading = false
+          
+          // this.loading = false
           if (resData.resultCode == "200") {
-         
+            loading.close();
              _this.$message.success('上传成功！')
             const data = resData.data.fileList;
             let newArray = data.map((item) => item.id);

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

@@ -60,6 +60,7 @@ export default {
     handleRemove(file, fileList) {
       this.$emit("imgUrl", "");
       this.imageUrl=""
+      this.fileList=[]
     },
     handlePictureCardPreview(file) {
       this.dialogImageUrl = file.url;

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

@@ -70,6 +70,7 @@ export default {
       console.log(file, fileList);
       this.$emit("qrcodeUrl", "");
       this.imageUrl=""
+      this.fileList=[]
     },
     handlePictureCardPreview(file) {
       this.dialogImageUrl = file.url;

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

@@ -112,7 +112,7 @@
           <el-form-item label="展板分类名称" prop="name">
             <el-input v-model="classForm.name"></el-input>
           </el-form-item>
-          <el-form-item label="备注">
+          <el-form-item label="备注" prop="remarks">
             <el-input type="textarea" v-model="classForm.remarks"></el-input>
           </el-form-item>
         </el-form>
@@ -149,6 +149,9 @@ export default {
           { required: true, message: "请输入展板分类名称", trigger: "blur" },
           { min: 1, max: 20, message: "请输入1到20个字" },
         ],
+        remarks: [
+          { min: 1, max: 100, message: "请输入1到100个字" },
+        ],
       },
       value: "",
       name: "",
@@ -227,12 +230,13 @@ export default {
             .then(
               (res) => {
                 if (res.data.resultCode === '200') {
+                  
                   _this.$message.success("新建成功！");
                   //跳回用户列表
                   _this.onSearch();
                   _this.close()
                 } else {
-                  _this.$message.error(res.data.msg);
+                  _this.$message.error(res.data.message);
                 }
               },
               (error) => {
@@ -267,7 +271,7 @@ export default {
                   _this.onSearch();
                   _this.close()
                 } else {
-                  _this.$message.error(res.data.msg);
+                  _this.$message.error(res.data.message);
                 }
               },
               (error) => {

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

@@ -120,11 +120,11 @@
                 </el-select>
               </el-form-item>
               <el-form-item></el-form-item>
-              <el-form-item label="导览音频"  prop="audioIdList" required>
+              <el-form-item label="导览音频"  prop="audioIdList" >
                 <div style="color:red;">（可上传汉语、蒙语、藏语、维吾尔语、英语五种语言音频资料，命名方式为展板名称+语言）</div>
                 <upload-audio :fileList="ruleForm.audioList" @audioList="audioList"></upload-audio>
               </el-form-item>
-              <el-form-item label="参考资料" prop="datumIdList" required>
+              <el-form-item label="参考资料" prop="datumIdList" >
                 <div style="color:red;">
                   （可支持word、PDF、ppt、视频类型文件及图片上传）
                 </div>
@@ -207,9 +207,16 @@ export default {
         videoContentId: [
           { required: true, message: "请选择视频", trigger: "change" }
         ],
+        audioIdList:[
+          { required: true, message: "请上传音频", trigger: "blur" }
+        ],
+        datumIdList:[
+           { required: true, message: "请上传参考资料", trigger: "blur" }
+        ],
         remarks: [
-          { required: true, message: "请输入展板简介", trigger: "change" }
+          { min: 1, max: 100, message: "请输入1到100个字" },
         ],
+
       },
       
     };

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

@@ -94,22 +94,22 @@
             <template slot-scope="scope" >
                <div class="table-btn-group">
                 <el-tooltip content="修改" placement="top">
-                  <el-button circle :disabled="scope.row.published" @click="openEdit(scope.row)">
+                  <el-button circle :disabled="(scope.row.published)||(scope.row.auditStatus === 'TBC')||(scope.row.auditStatus === 'TBCA')" @click="openEdit(scope.row)">
                     <i class="icon-table icon-edit"></i>
                   </el-button>
                 </el-tooltip>
                 <el-tooltip content="删除"  placement="top">
-                  <el-button circle :disabled="scope.row.published" @click="handleDelete(scope.row)">
+                  <el-button circle :disabled="(scope.row.published)||(scope.row.auditStatus === 'TBC')||(scope.row.auditStatus === 'TBCA')" @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.auditStatus !== 'APPROVED_FINAL')||(scope.row.auditStatus === 'REFUSED')"  v-show="!scope.row.published" @click="handlePublish(scope.row,true)">
+                  <el-button circle :disabled="(scope.row.auditStatus === 'TBC')||(scope.row.auditStatus === 'TBCA')"  v-show="!scope.row.published" @click="handlePublish(scope.row,true)">
                     <i class="icon-table icon-enable"></i>
                   </el-button>
                 </el-tooltip>
                  <el-tooltip content="下架" placement="top">
-                  <el-button circle :disabled="(scope.row.auditStatus !== 'APPROVED_FINAL')||(scope.row.auditStatus === 'REFUSED')"  v-show="scope.row.published" @click="handlePublish(scope.row,false)">
+                  <el-button circle :disabled="(scope.row.auditStatus === 'TBC')||(scope.row.auditStatus === 'TBCA')"  v-show="scope.row.published" @click="handlePublish(scope.row,false)">
                     <i class="icon-table icon-disable"></i>
                   </el-button>
                 </el-tooltip>

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

@@ -30,7 +30,7 @@
             ></el-date-picker>
           </el-form-item>
          
-          <el-form-item class="w50" label="请选择展板分类" prop="boardCatIdList">
+          <el-form-item class="w50" label="请选择预设展板分类" prop="boardCatIdList">
             <el-select
               placeholder="请选择预设展板分类"
               @focus="getAssetTypeData"
@@ -52,7 +52,7 @@
             <span style="color:red">若没有相应的展板分类，请点击</span>
             <el-button type="text" @click="addBoardClass">新建展板分类</el-button>
           </el-form-item>
-          <el-form-item label="备注" class="w100">
+          <el-form-item label="备注" class="w100" prop="remarks">
             <el-input type="textarea" v-model="ruleForm.remarks"></el-input>
           </el-form-item>
         </el-form>
@@ -74,10 +74,10 @@
               id="ruleo"
               class="party-form"
             >
-              <el-form-item label="视展板分类名称" prop="name">
+              <el-form-item label="展板分类名称" prop="name">
                 <el-input v-model="classForm.name"></el-input>
               </el-form-item>
-              <el-form-item label="备注">
+              <el-form-item label="备注" prop="remarks">
                 <el-input type="textarea" v-model="classForm.remarks"></el-input>
               </el-form-item>
             </el-form>
@@ -151,6 +151,9 @@ export default {
           { required: true, message: "请输入展板分类名称", trigger: "blur" },
           { min: 1, max: 20, message: "请输入1到20个字" },
         ],
+         remarks:[
+          { min: 1, max: 100, message: "请输入1到100个字" },
+        ]
       },
       rules: {
         name: [
@@ -162,6 +165,9 @@ export default {
         ],
         value1:[
           { required: true, message: "请填写版权方有效期", trigger: "change" }
+        ],
+         remarks:[
+          { min: 1, max: 100, message: "请输入1到100个字" },
         ]
       }
     };

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

 <template>
-  <div class="listPage H100">
+  <div class="listPage H100 learn-box">
     <div class="search-container">
       <el-form :inline="true" :model="form" onsubmit="return false;">
         <el-form-item>
@@ -129,7 +129,7 @@
                   </el-button>
                 </el-tooltip> -->
                 <el-tooltip content="修改" placement="top">
-                  <el-button circle @click="openEdit(scope.row)">
+                  <el-button :disabled="(scope.row.published)||(scope.row.auditStatus === 'TBC')||(scope.row.auditStatus === 'TBCA')" circle @click="openEdit(scope.row)">
                     <i class="icon-table icon-edit"></i>
                   </el-button>
                 </el-tooltip>
@@ -139,12 +139,12 @@
                   </el-button>
                 </el-tooltip>
                 <el-tooltip content="启用" placement="top">
-                  <el-button circle :disabled="(scope.row.auditStatus !== 'APPROVED_FINAL')||(scope.row.auditStatus === 'REFUSED')" v-show="!scope.row.published" @click="handlePublish(scope.row, 'True')">
+                  <el-button circle :disabled="(scope.row.auditStatus === 'TBC')||(scope.row.auditStatus === 'TBCA')" v-show="!scope.row.published" @click="handlePublish(scope.row, 'True')">
                     <i class="icon-table icon-enable"></i>
                   </el-button>
                 </el-tooltip>
                 <el-tooltip content="禁用" placement="top">
-                  <el-button circle :disabled="(scope.row.auditStatus !== 'APPROVED_FINAL')||(scope.row.auditStatus === 'REFUSED')" v-show="scope.row.published" @click="handlePublish(scope.row, 'False')">
+                  <el-button circle :disabled="(scope.row.auditStatus === 'TBC')||(scope.row.auditStatus === 'TBCA')" v-show="scope.row.published" @click="handlePublish(scope.row, 'False')">
                     <i class="icon-table icon-disable"></i>
                   </el-button>
                 </el-tooltip>
@@ -585,9 +585,11 @@ export default {
 // @import "../../style/list";
 @import "../../../../style/table.less";
 @import "../../../../style/pagination.less";
-@media screen and (max-width: 1024px) {
+.learn-box {
+  @media screen and (max-width: 1024px) {
     .page-tip {
       display: none !important;
     }
 }
+}
 </style>

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

@@ -109,7 +109,7 @@
           <el-form-item label="学习项目名称" prop="name">
             <el-input oninput="value = value.trim()" v-model="classForm.name"></el-input>
           </el-form-item>
-          <el-form-item label="备注">
+          <el-form-item label="备注" prop="remarks">
             <el-input type="textarea" v-model="classForm.remarks"></el-input>
           </el-form-item>
         </el-form>
@@ -158,12 +158,19 @@ export default {
           { required: true, message: "请输入学习项目名称", trigger: "blur" },
           { min: 1, max: 20, message: "请输入1到20个字" },
         ],
+        remarks:[
+          { min: 1, max: 100, message: "请输入1到100个字" },
+        ]
       },
       rules: {
         name: [
           { required: true, message: "请输入学习项目名称", trigger: "blur" },
           { min: 1, max: 20, message: "请输入1到20个字" },
         ],
+        // remarks:[
+        //   { required: true, message: "请输入学习项目名称", trigger: "blur" },
+        //   { min: 1, max: 2, message: "请输入1到20个字" },
+        // ]
       },
       value: "",
       name: "",
@@ -274,7 +281,7 @@ export default {
             )
             .then(
               (res) => {
-                if (res.data.resultCode == 200 || res.data.resultCode == 201) {
+                if (res.data.resultCode === "200" || res.data.resultCode === "201") {
                   _this.$message({
                     type: "success",
                     message: res.data.message,
@@ -289,7 +296,7 @@ export default {
                 } else {
                   _this.$message({
                     type: "error",
-                    message: res.data.msg,
+                    message: res.data.message,
                   });
                 }
               },

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

@@ -203,20 +203,11 @@ export default {
       typeList: [],
       rules: {
         name: [
-          { required: true, message: "请输入分类名称", trigger: "change" },
-          // { pattern: /^(\d{1,5})?$/, message: "排序值为低于5位数的纯数字" }
+         { required: true, message: "请输入分类名称", trigger: "change" },
+         { min: 1, max: 20, message: "请输入1到20个字" },
         ],
-        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" }
+        remarks: [
+          { min: 1, max: 100, message: "请输入1到100个字" },
         ]
       },
       value: "",

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

@@ -97,7 +97,7 @@
               <el-form-item label="视频分类名称" prop="name">
                 <el-input v-model="classForm.name"></el-input>
               </el-form-item>
-              <el-form-item label="备注" class="w100">
+              <el-form-item label="备注" class="w100" prop="remarks">
                 <el-input type="textarea" v-model="classForm.remarks"></el-input>
               </el-form-item>
             </el-form>
@@ -174,9 +174,12 @@ export default {
       },
       rule:{
         name: [
-          { required: true, message: "请输入视频分类名称", trigger: "blur" },
+          // { required: true, message: "请输入视频分类名称", trigger: "blur" },
           { min: 1, max: 20, message: "请输入1到20个字" },
         ],
+        remarks: [
+          { min: 1, max: 100, message: "请输入1到100个字" },
+        ],
       },
       rules: {
         name: [

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

@@ -84,8 +84,8 @@
           <el-table-column label="操作" header-align="center" width="220" align="center">
             <template slot-scope="scope" >
               <div class="table-btn-group">
-                <el-tooltip content="修改" placement="top">
-                  <el-button circle @click="openEdit(scope.row)">
+                <el-tooltip  content="修改" placement="top">
+                  <el-button :disabled="(scope.row.auditStatus === 'TBC')||(scope.row.auditStatus === 'TBCA')" circle @click="openEdit(scope.row)">
                     <i class="icon-table icon-edit"></i>
                   </el-button>
                 </el-tooltip>
@@ -99,8 +99,8 @@
                     <i class="icon-table icon-disable"></i>
                   </el-button>
                 </el-tooltip>-->
-                <el-tooltip content="删除" placement="top">
-                  <el-button circle @click="handleDelete(scope.row)">
+                <el-tooltip  content="删除" placement="top">
+                  <el-button :disabled="(scope.row.auditStatus === 'TBC')||(scope.row.auditStatus === 'TBCA')" circle @click="handleDelete(scope.row)">
                     <i class="icon-table icon-del"></i>
                   </el-button>
                 </el-tooltip>

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

@@ -9,7 +9,7 @@
            </div>
         <el-form
           :model="ruleForm"
-          :rules="rules"
+          :rules="rule"
           ref="ruleForm"
           label-width="140px"
           class="demo-form-inline party-form"
@@ -51,7 +51,7 @@
             <span style="color:red">若没有相应的视频分类，请点击</span>
             <el-button type="text" @click="addVideoClass">新建视频分类</el-button>
           </el-form-item>
-          <el-form-item label="备注" class="w100">
+          <el-form-item label="备注" class="w100" prop="remarks">
             <el-input type="textarea" v-model="ruleForm.remarks"></el-input>
           </el-form-item>
         </el-form>
@@ -76,7 +76,7 @@
               <el-form-item label="视频分类名称" prop="name">
                 <el-input v-model="classForm.name"></el-input>
               </el-form-item>
-              <el-form-item label="备注">
+              <el-form-item label="备注" prop="remarks">
                 <el-input type="textarea" v-model="classForm.remarks"></el-input>
               </el-form-item>
             </el-form>
@@ -144,6 +144,15 @@ export default {
         width: "100%",
         paddingRight: "10px"
       },
+      rule:{
+        name: [
+          { required: true, message: "请输入版权方名称", trigger: "blur" },
+          { min: 1, max: 20, message: "请输入1到20个字" },
+        ],
+        remarks:[
+          { min: 1, max: 100, message: "请输入1到100个字" },
+        ]
+      },
       rules: {
         name: [
           { required: true, message: "请输入版权方名称", trigger: "blur" },
@@ -154,6 +163,9 @@ export default {
         ],
         value1:[
           { required: true, message: "请填写版权方有效期", trigger: "change" }
+        ],
+        remarks:[
+          { min: 1, max: 100, message: "请输入1到100个字" },
         ]
       }
     };

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

@@ -54,7 +54,9 @@
     </div>
     <div class="table-content">
       <div class="btn-group">
-        <el-button type="primary" @click="multipleRemit()">汇出</el-button>
+        <el-button type="primary" @click="downloadCipher()">导出加密秘钥</el-button>
+        <el-button type="primary" @click="multipleRemitGet()">汇出</el-button>
+        <!-- <el-button type="primary" @click="multipleRemit()">汇出</el-button> -->
       </div>
       <div class="party-table">
         <el-table
@@ -78,7 +80,6 @@
       </div>
       <div class="partyt-pagination">
         <el-pagination
-          background
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pageSize"
@@ -90,6 +91,7 @@
   </div>
 </template>
 <script>
+import axios from 'axios'
 export default {
   data() {
     var checkIsNull = (rule, value, callback) => {
@@ -102,6 +104,8 @@ export default {
       }
     };
     return {
+      nowDate: "", // 当前日期
+      fullscreenLoading: false,
       copyrightOwner:[],
       videoContentCat:[],
       type: true,
@@ -157,6 +161,21 @@ export default {
   },
   components: {},
   methods: {
+    formatDate() {
+      let date = new Date();
+      let year = date.getFullYear(); // 年
+      let month = date.getMonth() + 1; // 月
+      let day = date.getDate(); // 日
+      let week = date.getDay(); // 星期
+      let weekArr = [ "星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六" ];
+      let hour = date.getHours(); // 时
+      hour = hour < 10 ? "0" + hour : hour; // 如果只有一位，则前面补零
+      let minute = date.getMinutes(); // 分
+      minute = minute < 10 ? "0" + minute : minute; // 如果只有一位，则前面补零
+      let second = date.getSeconds(); // 秒
+      second = second < 10 ? "0" + second : second; // 如果只有一位，则前面补零
+      this.nowDate = `${year}${month}${day}}`;
+    },
        // 获取展板分类列表
     getAssetCopyrightData(){
        let vm = this;
@@ -343,6 +362,189 @@ export default {
           message: "请至少选择一个选项！"
         });
       }
+    },
+    openFullScreen2() {
+      this.formatDate()
+        const loading = this.$loading({
+          lock: true,
+          text: '下载中，请稍候。。。',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        // setTimeout(() => {
+        //   loading.close();
+        // }, 2000);
+      },
+      // 导出机顶盒文件加密秘钥
+      downloadCipher(){
+          const loading = this.$loading({
+          lock: true,
+          text: '下载中，请稍候。。。',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        
+        
+         axios({
+        method: "get",
+        url: 'http://111.203.232.175:8088/mall/asset/downloadCipher',
+        params: {
+         
+          // idList:str
+        },
+        headers: {
+            "Authorization":  localStorage.getItem("backToken") || "",
+        },
+        responseType: "blob",
+    }).then(res => {
+        console.log(res)
+        loading.close();
+        let blobUrl = window.URL.createObjectURL(res.data);
+        const aElement = document.createElement("a");
+        aElement.href = blobUrl; 
+        // aElement.download = res.data.fileName;
+        aElement.download =  '密钥.zip';
+        aElement.click();
+        window.URL.revokeObjectURL(blobUrl);
+       
+    })
+      },
+    // get测试
+       multipleRemitGet() {
+        
+          let _this = this;
+        let str = _this.getMultipleSelect();
+        if(str){
+          const loading = this.$loading({
+          lock: true,
+          text: '下载中，请稍候。。。',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
+        
+        
+         axios({
+        method: "get",
+        url: 'http://111.203.232.175:8088/mall/asset/download',
+        params: {
+          // idList: "1382697227765313538"
+          idList:str
+        },
+        headers: {
+            "Authorization":  localStorage.getItem("backToken") || "",
+        },
+        responseType: "blob",
+    }).then(res => {
+        console.log(res)
+        loading.close();
+        let blobUrl = window.URL.createObjectURL(res.data);
+        const aElement = document.createElement("a");
+        aElement.href = blobUrl; 
+        // aElement.download = res.data.fileName;
+        aElement.download = _this.nowDate + '视频集.zip';
+        aElement.click();
+        window.URL.revokeObjectURL(blobUrl);
+       
+    })
+        }else{
+          this.$message({
+          type: "info",
+          message: "请至少选择一个选项！"
+        });
+        }
+         
+      // let _this = this;
+      // let str = _this.getMultipleSelect();
+
+      //   console.log(str);
+      //   _this.$https({
+      //       url: "asset/download",
+      //       method: "get",
+      //       authType: this.backToken,
+      //   //      dataType: 'json',
+      //   // responseType: 'arraybuffer' // 该条件是重点
+      //       responseType: 'blob'
+      //     },
+      //     {idList:'1382697227765313538'}
+      
+      //     )
+      //     .then(
+      //       res => {
+      //         let blobUrl = window.URL.createObjectURL(res.data);
+      //   const aElement = document.createElement("a");
+      //   aElement.href = blobUrl; 
+      //   aElement.download = 'aaaa.zip';
+      //   aElement.click();
+      //   window.URL.revokeObjectURL(blobUrl);
+
+
+        // const content = res
+        // const blob = new Blob([content])
+        // const fileName = 'electron-mat.zip'
+        // if ('download' in document.createElement('a')) { // 非IE下载
+        //   const elink = document.createElement('a')
+        //   elink.download = fileName
+        //   elink.style.display = 'none'
+        //   elink.href = URL.createObjectURL(blob)
+        //   document.body.appendChild(elink)
+        //   elink.click()
+        //   URL.revokeObjectURL(elink.href) // 释放URL 对象
+        //   document.body.removeChild(elink)
+        // } else { // IE10+下载
+        //   // navigator.msSaveBlob(blob, fileName)
+        // }
+
+        //   const blob = new Blob([res.data], { type: 'application/zip' })
+        // const url = window.URL.createObjectURL(blob)
+        // window.location.href = url
+
+
+
+        // if(typeof(res.data) == 'string'){
+        //     var blob = new Blob([res.data], { type: 'application/zip' })
+        //     if (window.navigator.msSaveOrOpenBlob) {//msSaveOrOpenBlob方法返回bool值
+        //       navigator.msSaveBlob(blob, 'fileName');//本地保存
+        //     } else {
+        //       var link = document.createElement('a');//a标签下载
+        //       link.href = window.URL.createObjectURL(blob);
+        //       link.download = 'fileName';
+        //       link.click();
+        //       window.URL.revokeObjectURL(link.href);
+        //     }
+        //   }else{
+        //   }
+
+      //   console.log(res)
+      //   const blob = new Blob([res.data], { type: 'application/zip' })
+      // const url = window.URL.createObjectURL(blob)
+      // const link = document.createElement('a') // 创建a标签
+      // link.href = url
+      // // link.download = data.fileName // 设置下载的文件名
+      // document.body.appendChild(link)
+      // link.click() //执行下载
+      // document.body.removeChild(link) //释放标签
+
+          // const downloadElement = document.createElement('a')
+          // const contentDisposition = res.headers['content-disposition']
+          // const patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*')
+          // const result = patt.exec(contentDisposition)
+          // const filename = decodeURI(result[1])
+          // const href = window.URL.createObjectURL(blob) // 创建下载的链接
+          // downloadElement.href = href
+          // downloadElement.download = filename // 下载后文件名
+          // document.body.appendChild(downloadElement)
+          // downloadElement.click() // 点击下载
+          // document.body.removeChild(downloadElement) // 下载完成移除元素
+          // window.URL.revokeObjectURL(href) // 释放blob对象 
+          //   },
+          //   error => {}
+          // );
+      // } else {
+      //   this.$message({
+      //     type: "info",
+      //     message: "请至少选择一个选项！"
+      //   });
+      // }
 
       //   if (str) {
       //     this.$confirm("此操作将删除选中菜单, 是否继续?", "提示", {