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

src/config/httpServer.js

@@ -66,7 +66,7 @@ const httpServer = (opts, data, file, timeout) => {
   let httpDefaultOpts = {
     method: opts.method,
     url: baseUrl + opts.url,
-    timeout: timeout ? timeout : 20000,
+    timeout: timeout ? timeout : 10800000,
     params: Object.assign(Public, data),
     data: data,
     headers: opts.headers || {},

src/page/STB/appversion/components/addDialog.vue

@@ -28,10 +28,10 @@
             v-model="formItem.versionInfo"
           ></el-input>
         </el-form-item>
-        <el-form-item label="更新内容：" prop="updateContent">
+        <el-form-item label="更新内容：" prop="updateLog">
           <el-input
             type="textarea"
-            v-model="formItem.updateContent"
+            v-model="formItem.updateLog"
           ></el-input>
         </el-form-item>
         <el-upload
@@ -63,7 +63,7 @@
 export default {
   data() {
     return {
-      uploadUrl:'http://192.168.110.67/mall/file/upload/allType',
+      uploadUrl:'http://111.203.232.175:8088/mall/file/upload/allType',
       formVisible: false,
       headers:{Authorization: localStorage.getItem('backToken')},
       formItem: {},
@@ -75,7 +75,7 @@ export default {
         versionInfo: [
           { required: true, message: "请输入版本信息", trigger: "blur" },
         ],
-        updateContent: [
+        updateLog: [
           { required: true, message: "请输入更新内容", trigger: "blur" },
         ],
       },
@@ -128,7 +128,7 @@ export default {
           let param = {
             appVersion: this.formItem.appVersion,
             versionInfo: this.formItem.versionInfo,
-            updateContent: this.formItem.updateContent,
+            updateLog: this.formItem.updateLog,
             apkUrl: this.formItem.apkUrl,
           }
           _this

src/page/STB/appversion/index.vue

@@ -111,6 +111,7 @@ export default {
     // 查询
     onSearch() {
       this.page._index = 1;
+      this.requestForm = JSON.parse(JSON.stringify(this.form))
       this.getTableData();
     },
     // 获得数据接口
@@ -119,8 +120,8 @@ export default {
       let param = {
         _index: this.page._index,
         _size: this.page._size,
-        startDate: this.form.dateRange.length ? this.form.dateRange[0] : "",
-        endDate: this.form.dateRange.length ? this.form.dateRange[1] : "",
+        startDate: this.requestForm.dateRange.length ? this.requestForm.dateRange[0] : "",
+        endDate: this.requestForm.dateRange.length ? this.requestForm.dateRange[1] : "",
       };
       vm.$https(
         {

src/page/STB/base/index.vue

@@ -94,6 +94,7 @@ export default {
     // 查询
     onSearch() {
       this.page._index = 1
+      this.requestForm = JSON.parse(JSON.stringify(this.form))
       this.getTableData()
     },
     // 获得数据接口
@@ -102,8 +103,8 @@ export default {
       let param = {
         _index: this.page._index,
         _size: this.page._size,
-        areaId: this.form.areaId.length ? this.form.areaId[this.form.areaId.length - 1] : '',
-        organId: this.form.orgId
+        areaId: this.requestForm.areaId.length ? this.requestForm.areaId[this.requestForm.areaId.length - 1] : '',
+        organId: this.requestForm.orgId
       };
       vm.$https(
         {

src/page/STB/interactive/index.vue

@@ -54,7 +54,7 @@
           </div>
           <div class="img-box" v-if="!item.images.length">暂无数据</div>
           <div class="author">
-            <div>{{ item.username }}</div>
+            <div>{{ item.name }}</div>
             <div>{{ item.createTime }}</div>
           </div>
         </div>

src/page/STB/operation/index.vue

@@ -138,6 +138,7 @@ export default {
     // 查询
     onSearch() {
       this.page._index = 1;
+      this.requestForm = JSON.parse(JSON.stringify(this.form))
       this.getTableData();
     },
     // 获得数据接口
@@ -146,11 +147,11 @@ export default {
       let param = {
         _index: this.page._index,
         _size: this.page._size,
-        areaId: this.form.areaId.length
-          ? this.form.areaId[this.form.areaId.length - 1]
+        areaId: this.requestForm.areaId.length
+          ? this.requestForm.areaId[this.requestForm.areaId.length - 1]
           : "",
-        organId: this.form.orgId,
-        status: this.form.status,
+        organId: this.requestForm.orgId,
+        status: this.requestForm.status,
       };
       vm.$https(
         {

src/page/STB/pageCustom/index.vue

@@ -11,7 +11,7 @@
             <div class="title">app目录界面设置</div>
             <div class="btn-group">
               <el-upload
-                action="http://192.168.110.67/mall/file/image/upload"
+                action="http://111.203.232.175:8088/mall/file/image/upload"
                 :on-success="uploadPageImg"
                 :before-upload="handleBeforeUpload"
                 :headers ="headers"
@@ -43,7 +43,7 @@
             <div class="title">app运行画面设置</div>
             <div class="btn-group">
               <el-upload
-                action="http://192.168.110.67/mall/file/image/upload"
+                action="http://111.203.232.175:8088/mall/file/image/upload"
                 :on-success="uploadRunImg"
                 :before-upload="handleBeforeUpload"
                 :headers ="headers"
@@ -108,7 +108,7 @@ export default {
         },
         on: {
           click: function () {
-            console.log(vm);
+            
             if (this.$el[0].parentNode.className.indexOf("top") > 0) {
               vm.radioPage = this.realIndex;
             }
@@ -237,8 +237,8 @@ export default {
     },
     // 修改当前项
     submitForm() {
-      vm.radioPage && this.updateCurrent(this.pageList[vm.radioPage].id, "tAppDirPic/update");
-      vm.radioRun && this.updateCurrent(this.runList[vm.radioRun].id, "tAppRunPic/update");
+      this.updateCurrent(this.pageList[vm.radioPage].id, "tAppDirPic/update");
+      this.updateCurrent(this.runList[vm.radioRun].id, "tAppRunPic/update");
     },
     updateCurrent(id, url) {
       let vm = this;

src/page/check/display/index.vue

@@ -132,7 +132,6 @@
       </div>
       <div class="partyt-pagination">
         <el-pagination    
-          background
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pageSize"

src/page/check/learn/index.vue

@@ -111,7 +111,6 @@
       </div>
        <div class="partyt-pagination">
         <el-pagination
-          background
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pageSize"

src/page/check/video/index.vue

@@ -97,7 +97,6 @@
       </div>
       <div class="partyt-pagination">
         <el-pagination
-          background
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pageSize"

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

 <template>
 <div>
-<!-- accept="application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" -->
-  <!-- :show-file-list="false" -->
-  <!-- :file-list="fileList" -->
-  <!-- action="http://192.168.110.67/mall/file/video/content/upload" -->
   <el-upload
     ref="upload"
     :multiple="true"
@@ -90,10 +86,10 @@ export default {
 </script>
 
 <style>
-.fileUpload {
+.el-upload .fileUpload {
   width: 148px;
   height: 148px;
-  line-height: 148px;
+  line-height: 148px!important;
   margin: 0 auto;
   border: 1px dashed #c0ccda;
   font-size: 24px;

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

 <template>
   <div>
-    <!-- accept="application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" -->
-    <!-- :show-file-list="false" -->
-    <!-- :file-list="fileList" -->
-    <!-- action="http://192.168.110.67/mall/file/video/content/upload" -->
     <el-upload
       ref="upload"
       :multiple="true"
@@ -90,10 +86,10 @@ export default {
 </script>
 
 <style>
-.fileUpload {
+.el-upload .fileUpload {
   width: 148px;
   height: 148px;
-  line-height: 148px;
+  line-height: 148px!important;
   margin: 0 auto;
   border: 1px dashed #c0ccda;
   font-size: 24px;

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

 <template>
 <div>
-<!-- accept="application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" -->
-  <!-- :show-file-list="false" -->
-  <!-- :file-list="fileList" -->
-  <!-- action="http://192.168.110.67/mall/file/video/content/upload" -->
+
   <el-upload
     ref="upload"
     :multiple="true"
@@ -101,10 +98,10 @@ export default {
 </script>
 
 <style>
-.fileUpload {
+.el-upload .fileUpload {
   width: 148px;
   height: 148px;
-  line-height: 148px;
+  line-height: 148px!important;
   margin: 0 auto;
   border: 1px dashed #c0ccda;
   font-size: 24px;

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

 <template>
   <div>
     <el-upload
-      action="http://192.168.110.67/mall/file/image/upload"
+      action="http://111.203.232.175:8088/mall/file/image/upload"
       list-type="picture-card"
       :on-preview="handlePictureCardPreview"
       :on-remove="handleRemove"

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

 <template>
   <div>
     <el-upload
-      action="http://192.168.110.67/mall/file/image/upload"
+      action="http://111.203.232.175:8088/mall/file/image/upload"
       list-type="picture-card"
       :on-preview="handlePictureCardPreview"
       :on-remove="handleRemove"

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

@@ -73,6 +73,7 @@
                 <el-select
                   placeholder="请选择视频版权方"
                   v-model="ruleForm.videoContentCopyrightOwnerId"
+                  @change="clearVideo"
                 >
                   <el-option
                     v-for="item in copyrightOwner"
@@ -86,6 +87,7 @@
                 <el-select
                   placeholder="请选择视频分类"
                   v-model="ruleForm.videoContentCatId"
+                  @change="clearVideo"
                 >
                   <el-option
                     v-for="item in videoContentCat"
@@ -95,8 +97,9 @@
                   ></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="请选择视频" prop="videoContentId">
+              <el-form-item label="请选择视频" prop="videoContentId" class="w100">
                 <el-select
+                  @focus="getVideoData"
                   placeholder="请选择视频"
                   v-model="ruleForm.videoContentId"
                   >
@@ -109,10 +112,14 @@
                 </el-select>
               </el-form-item>
               <el-form-item></el-form-item>
-              <el-form-item label="导览音频" class="w50" prop="audioIdList" required>
+              <el-form-item label="导览音频"  prop="audioIdList" required>
+                <div style="color:red;">（可上传汉语、蒙语、藏语、维吾尔语、英语五种语言音频资料，命名方式为展板名称+语言）</div>
                 <upload-audio :fileList="ruleForm.audioList" @audioList="audioList"></upload-audio>
               </el-form-item>
               <el-form-item label="参考资料" prop="datumIdList" required>
+                <div style="color:red;">
+                  （可支持word、excel、PDF、ppt、视频类型文件及图片上传）
+                </div>
                   <upload-datum :fileList="ruleForm.datumList" @datumList="datumList"></upload-datum>
               </el-form-item>
             </el-form>
@@ -163,6 +170,7 @@ export default {
         boardCopyrightOwnerId:"",
         videoContentCopyrightOwnerId: "",
         videoContentCatId: "",
+        videoContentId:"",
         audioIdList: [],
         datumIdList: [],
         datumList:[],
@@ -205,7 +213,7 @@ export default {
       this.getVideoContentCopyrightData();
       this.getExhibitionBoardCatId();
       this.getBoardCopyrightOwnerId();
-      this.getVideoData();
+      // this.getVideoData();
       if (this.$route.query.type === "Update") {
         this.getInfo(this.$route.query.id);
       }
@@ -366,19 +374,33 @@ export default {
       }).catch(function(err) {
           console.log(err);
       });
+    },
+    // 视频版权方或视频分类发生变化时，重置视频的值
+    clearVideo(){
+      this.ruleForm.videoContentId = ''
     },
      // 获取视频列表
     getVideoData() {
+      const param = {
+        videoContentCatId:this.ruleForm.videoContentCatId,
+        videoContentCopyrightOwnerId:this.ruleForm.videoContentCopyrightOwnerId
+      }
+      if((this.ruleForm.videoContentCatId.length>0)&&(this.ruleForm.videoContentCopyrightOwnerId.length>0)){
         let vm = this;
         vm.$https({
           url: "videoContent/getList",
           method: "get",
           authType: this.backToken
-      }).then(res => {
+        },
+        param).then(res => {
             this.videoContentId = res.data.data;
         }).catch(function(err) {
             console.log(err);
         });
+      }else{
+        this.videoContentId = []
+      }
+      
     },
     // 关闭
     close() {

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

@@ -485,6 +485,7 @@ export default {
       } else {
         this.checkedThing = false;
       }
+      this.getTableParam()
     },
     //
     getSelectDep2(exhibitionBoardCatIdList) {
@@ -493,11 +494,19 @@ export default {
       } else {
         this.checkedThing2 = false;
       }
+      this.getTableParam()
+    },
+    // 筛选展板备选清单选项条件
+    getTableParam(){
        const param = {
         boardCopyrightOwnerIdList: this.ruleForm.copyrightOwnerIdList,
         exhibitionBoardCatIdList: this.ruleForm.exhibitionBoardCatIdList
       };
+      if((param.boardCopyrightOwnerIdList.length>0)&&(param.exhibitionBoardCatIdList.length>0)){
         this.getTableData(param);
+      }else{
+        this.tableData = []
+      }
     },
     // 根据展板类别，版权方获取展板备选清单
     getTableData(param, type) {

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

@@ -148,19 +148,6 @@
                     <i class="icon-table icon-disable"></i>
                   </el-button>
                 </el-tooltip>
-                
-                 <!-- <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> -->
               </div>
             </template>
           </el-table-column>

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

@@ -71,8 +71,6 @@
       </div>
       <div class="partyt-pagination">
         <el-pagination
-          small
-          background
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pageSize"

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

@@ -112,8 +112,6 @@
       </div>
       <div class="partyt-pagination">
         <el-pagination
-          small
-          background
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pageSize"
@@ -513,10 +511,47 @@ export default {
           console.log(err);
         });
     },
-    // 删除
-    handleDelete(row) {
+    // 根据视频内容id查询被引用的展板
+    getUseBoard(id){
+       this
+            .$https({
+              method: "get",
+              url: "videoContent/getExhibitionBoardById/" + id,
+              authType: this.backToken
+            })
+            .then(
+              res => {
+                if(res.data.resultCode === "200"){
+                  // console.log(res.data.data,'wwwww')
+                let data = res.data.data
+                if(data){
+                  data = '当前视频已被展板（' + res.data.data + ')所使用，'
+                }else{
+                  data =  '当前视频无引用展板，'
+                }
+                console.log(data)
+                this.openDel(id,data)
+                
+              }else{
+                this.$message({ type: "error", message: res.data.message });
+              }
+                
+              },
+              error => {
+                this.$message({
+                  type: "fail",
+                  message: "删除失败!" + error.response.data
+                });
+              }
+            );
+    },
+    //
+    // 删除弹出确认窗口
+    openDel(id,data){
+      // alert(data)
+       const dataMsg = data
        let _this = this;
-      this.$confirm("此操作将永久删除, 是否继续?", "提示", {
+      this.$confirm(dataMsg + "此操作将永久删除, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -525,7 +560,7 @@ export default {
           _this
             .$https({
               method: "delete",
-              url: "videoContent/delete/" + row.id,
+              url: "videoContent/delete/" + id,
               authType: this.backToken
             })
             .then(
@@ -548,6 +583,10 @@ export default {
         })
         .catch(() => {});
     },
+    // 删除
+    handleDelete(row) {
+      this.getUseBoard(row.id)
+    },
 
     // 批量操作
     handleSelectionChange(selection) {

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

@@ -74,8 +74,6 @@
       </div>
       <div class="partyt-pagination">
         <el-pagination
-          small
-          background
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pageSize"

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

@@ -297,7 +297,7 @@ export default {
       }
       return str;
     },
-    // 批量删除
+    // 汇出
     multipleRemit() {
       let _this = this;
       let str = _this.getMultipleSelect();
@@ -306,10 +306,11 @@ export default {
         console.log(str);
         _this.$https({
             url: "asset/download",
-            method: "get",
+            method: "post",
             authType: this.backToken
           },
-          {idList:str}
+          // {idList:str}
+          _this.$qs.stringify({idList:str})
           )
           .then(
             res => {
@@ -329,8 +330,6 @@ export default {
           downloadElement.click() // 点击下载
           document.body.removeChild(downloadElement) // 下载完成移除元素
           window.URL.revokeObjectURL(href) // 释放blob对象 
-          
-            
             },
             error => {}
           );