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

config/index.js

@@ -12,7 +12,8 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       '/mall': {
-        target: "http://192.168.110.67/mall",
+        target: "http://111.203.232.175:8088/mall",
+        // target: "http://192.168.110.67/mall",
         // target: "http://192.168.204.66:8088/mall",
         changeOrigin: true,
         pathRewrite: {

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

@@ -17,6 +17,7 @@
       >
         <el-form-item label="版本号：" prop="appVersion">
           <el-input
+            maxlength="20" 
             v-model="formItem.appVersion"
             clearable
             placeholder="请输入版本号"
@@ -24,14 +25,16 @@
         </el-form-item>
         <el-form-item label="版本信息：" prop="versionInfo">
           <el-input
+            maxlength="100" 
             type="textarea"
             v-model="formItem.versionInfo"
           ></el-input>
         </el-form-item>
-        <el-form-item label="更新内容：" prop="updateContent">
+        <el-form-item label="更新内容：" prop="updateLog">
           <el-input
+            maxlength="100" 
             type="textarea"
-            v-model="formItem.updateContent"
+            v-model="formItem.updateLog"
           ></el-input>
         </el-form-item>
         <el-upload
@@ -54,7 +57,7 @@
     <div slot="footer" class="dialog-footer btn-group">
       <el-button size="mini" @click="close">取 消</el-button>
       <el-button size="mini" type="primary" @click="submitForm('formItem')">确定</el-button>
-      
+
     </div>
   </el-dialog>
 </template>
@@ -63,7 +66,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 +78,7 @@ export default {
         versionInfo: [
           { required: true, message: "请输入版本信息", trigger: "blur" },
         ],
-        updateContent: [
+        updateLog: [
           { required: true, message: "请输入更新内容", trigger: "blur" },
         ],
       },
@@ -89,7 +92,7 @@ export default {
       this.$nextTick(() => {
         this.$refs.formItem.clearValidate()
       });
-      
+
     },
     // 关闭
     close() {
@@ -128,7 +131,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
@@ -174,4 +177,4 @@ export default {
   }
 }
 
-</style>
+</style>
\ No newline at end of file

src/page/STB/appversion/index.vue

@@ -22,7 +22,7 @@
       <div class="page-tip">
         <span class="page-tip-title">页面说明:</span>
         <span class="page-tips"
-          >可查看系统使用过的所有app版本信息，可设置其中一个版本为当前使用版本。可产看安装包详情信息。可上传新的安装包，“*”为必填项。</span
+          >可查看系统使用过的所有app版本信息，可设置其中一个版本为当前使用版本。可查看安装包详情信息。可上传新的安装包，“*”为必填项。</span
         >
       </div>
     </div>
@@ -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/components/dialog.vue → src/page/STB/base/components/addDialog.vue

@@ -30,12 +30,30 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="机构地理位置：" prop="areaName">
+        <el-form-item label="机构地理位置：" prop="areaName" required>
           <el-input
             v-model="formItem.areaName"
             disabled
           ></el-input>
         </el-form-item>
+        <el-form-item label="账号有效期" prop="permanent">
+          <el-radio-group v-model="formItem.permanent">
+            <el-radio :label="true">永久有效</el-radio>
+            <el-radio :label="false">设置有效期</el-radio>
+          </el-radio-group>
+          <div v-if="!formItem.permanent">
+            <el-date-picker
+              class="mt16"
+              v-model="formItem.date"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            >
+            </el-date-picker>
+          </div>
+        </el-form-item>
       </el-form>
     </div>
     <div slot="footer" class="dialog-footer btn-group">
@@ -57,6 +75,9 @@ export default {
         orgId: [
           { required: true, message: "请选择所属单位", trigger: "change" },
         ],
+        permanent: [
+          { required: true, message: "请选择账号有效期", trigger: "change" },
+        ],
       },
     };
   },
@@ -70,7 +91,10 @@ export default {
       // 新增
       this.orgOptions = item;
       this.title = "新增";
-      this.formItem = {};
+      this.formItem = {
+        permanent: true,
+        date: "",
+      };
     },
     // 关闭
     close() {
@@ -98,12 +122,22 @@ export default {
       let _this = this;
       _this.$refs.formItem.validate((valid) => {
         if (valid) {
+           if (!this.formItem.permanent && !this.formItem.date) {
+            this.$message.error("请选择有效期");
+            return false;
+          }
           let searchObj = {};
           for (let key in _this.formItem) {
             if (this.formItem[key]) {
               searchObj[key] = _this.formItem[key]
             }
           }
+          if (!this.formItem.permanent) {
+            searchObj.effectiveDate = this.formItem.date[0];
+            searchObj.exiredDate = this.formItem.date[1];
+          }
+          delete searchObj.date
+          console.log(searchObj)
           _this
             .$https(
               {

src/page/STB/base/components/editDialog.vue

+<template>
+  <el-dialog
+    custom-class="party-dialog"
+    title="修改"
+    width="468px"
+    :visible.sync="formVisible"
+    :before-close="close"
+  >
+    <div class="dialog-content">
+      <el-form
+        :model="formItem"
+        class="party-form"
+        ref="formItem"
+        label-width="125px"
+        label-position="top"
+        :rules="rules"
+      >
+        <el-form-item label="所属单位：" prop="orgId">
+          <el-input v-model="formItem.organName" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="机构地理位置：" prop="areaName">
+          <el-input v-model="formItem.areaName" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="账号有效期" prop="permanent">
+          <el-radio-group v-model="formItem.permanent">
+            <el-radio :label="true">永久有效</el-radio>
+            <el-radio :label="false">设置有效期</el-radio>
+          </el-radio-group>
+          <div v-if="!formItem.permanent">
+            <el-date-picker
+              class="mt16"
+              v-model="formItem.date"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            >
+            </el-date-picker>
+          </div>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div slot="footer" class="dialog-footer btn-group">
+      <el-button @click="close">取 消</el-button>
+      <el-button type="primary" @click="submitForm('formItem')">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      formVisible: false,
+      formItem: {
+          date:'',
+          permanent:true
+      },
+      rules: {
+        permanent: [
+          { required: true, message: "请选择账号有效期", trigger: "change" },
+        ],
+      },
+    };
+  },
+  mounted() {},
+  methods: {
+    backFn(item) {
+      this.formItem = {
+        date:'',
+        permanent:true
+      },
+      this.formVisible = true;
+      for (let key in item) {
+        this.formItem[key] = item[key];
+      }
+      // 编辑
+      if (this.formItem.exiredDate) {
+        this.formItem.date = [this.formItem.effectiveDate, this.formItem.exiredDate];
+        this.formItem.permanent = false
+      }
+      this.formItem = {...this.formItem}
+      console.log(this.formItem);
+    },
+    // 关闭
+    close() {
+      this.formVisible = false;
+      for (let key in this.formItem) {
+        this.formItem[key] = null;
+      }
+      this.$refs["formItem"].resetFields();
+    },
+    // 保存编辑信息
+    submitForm() {
+      let _this = this;
+    if (!this.formItem.permanent && !this.formItem.date) {
+    this.$message.error("请选择有效期");
+    return false;
+    }
+    let searchObj = {};
+    for (let key in _this.formItem) {
+    if (this.formItem[key]) {
+        searchObj[key] = _this.formItem[key];
+    }
+    }
+    if (!this.formItem.permanent) {
+    searchObj.effectiveDate = this.formItem.date[0];
+    searchObj.exiredDate = this.formItem.date[1];
+    }else{
+      delete searchObj.effectiveDate;
+      delete searchObj.exiredDate;
+    }
+    searchObj.orgName = searchObj.organName
+    delete searchObj.organName;
+    delete searchObj.date;
+    console.log(searchObj);
+    _this
+    .$https(
+        {
+        url: "tUser/boxUpdate",
+        method: "put",
+        authType: this.backToken,
+        },
+        searchObj
+    )
+    .then(
+              (res) => {
+                if (res.data.resultCode === "200") {
+                  _this.$message.success(res.data.message);
+                  _this.formVisible = false;
+                  _this.$emit("refreshFn");
+                } else {
+                  _this.$message.error(res.data.message);
+                }
+              },
+              (error) => {
+                console.log(error);
+              }
+            );
+
+    },
+  },
+};
+</script>
+
+<style lang="less">
+</style>
\ No newline at end of file

src/page/STB/base/components/index.js

+import addDialog from './addDialog.vue'
+import editDialog from './editDialog.vue'
+import stbTable from './table.vue'
+export {
+    addDialog,
+    editDialog,
+    stbTable
+}

src/page/STB/base/components/table.vue

+<template>
+  <div class="party-table">
+    <el-table
+      border
+      :data="list"
+      style="width: 100%; height: 100%"
+      height="100%"
+    >
+      <el-table-column label="序号" align="center" width="100">
+        <template slot-scope="scope">
+          <span>{{ (currentPage - 1) * 10 + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        align="center"
+        v-for="(item, index) in feildList"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :width="item.width"
+      >
+        <template slot-scope="scope">
+          <div v-if="item.isEdit" class="table-btn-group">
+            <el-tooltip
+              content="修改"
+              placement="top"
+            >
+              <el-button circle @click="handleOperate(scope.row, 'edit')">
+                <i class="icon-table icon-edit"></i>
+              </el-button>
+            </el-tooltip>
+          </div>
+          <div v-else>
+            <span v-if="item.prop === 'exiredDate'">
+              {{ scope.row[item.prop] || '永久有效' }}
+            </span>
+            <span v-else>{{ scope.row[item.prop] }}</span>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+
+export default {
+  data() {
+    return {
+       
+    };
+  },
+  computed:{
+     userId(){
+       return localStorage.getItem('userId') || ''
+     }
+  },
+  props: {
+    currentPage: {
+      type: Number,
+      default: 1,
+    },
+    list: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+    feildList: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  methods: {
+    handleOperate(row, type) {
+      this.handlEmitMsg(row, type);
+    },
+    handlEmitMsg(row, type) {
+      this.$emit("action", {
+        row: row,
+        type: type,
+      });
+    },
+  },
+};
+</script>
+<style lang="less">
+@import "~@/style/table.less";
+</style>
\ No newline at end of file

src/page/STB/base/index.vue

@@ -38,19 +38,20 @@
       <div class="btn-group">
         <el-button type="primary" @click="addBox">新建机顶盒账号</el-button>
       </div>
-      <party-table :currentPage="page._index" :feildList="feildList" :list="tableData"/>
-      <party-pagination :page="page" @changePage="handleCurrentChange"/>
+      <stb-table :currentPage="page._index" :feildList="feildList" :list="tableData" @action="handleAction"/>
+      <party-pagination :page="page" @changePage="handleCurrentChange" />
     </div>
-    <custom-dialog ref="formItem" @refreshFn="onSearch" />
+    <add-dialog ref="formItem" @refreshFn="onSearch" />
+    <edit-dialog ref="editform" @refreshFn="onSearch" />
   </div>
 </template>
 <script>
-import { partyPagination,partyTable} from "@/components/index";
-import customDialog from "./components/dialog.vue";
+import { partyPagination} from "@/components/index";
+import { addDialog, editDialog ,stbTable } from "./components/index";
 import { getAreas } from "@/config/area.js";
 import { getOrgListWithOutPage } from "@/config/organ.js";
 export default {
-  components: { partyPagination, customDialog,partyTable },
+  components: { partyPagination, addDialog,editDialog,stbTable },
   data() {
     return {
       page: { 
@@ -60,7 +61,9 @@ export default {
       },
       feildList: [
         { prop: "mac", label: "MAC地址" },
-        { prop: "organName", label: "所属单位" }
+        { prop: "organName", label: "所属单位" },
+        { prop: "exiredDate", label: "到期时间" },
+        { prop: "", label: "操作", isEdit: true, width: 180 },
       ],
       orgOptions: [], // 单位信息
       areaOptions: [], //区域信息
@@ -94,6 +97,7 @@ export default {
     // 查询
     onSearch() {
       this.page._index = 1
+      this.requestForm = JSON.parse(JSON.stringify(this.form))
       this.getTableData()
     },
     // 获得数据接口
@@ -102,8 +106,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(
         {
@@ -143,9 +147,25 @@ export default {
       this.page._index = val;
       this.getTableData();
     },
+    handleAction(params) {
+      this.activeRow = params.row;
+      switch (params.type) {
+        case "detail":
+          this.handleDetail();
+          break;
+        case "edit":
+          this.handleEdit();
+          break;
+        default:
+          break;
+      }
+    },
+    // 编辑
+    handleEdit() {
+      this.$refs.editform.backFn(this.activeRow);
+    },
   },
 };
 </script>
 <style lang="less">
-// @import "~@/style/table.less";
 </style>
\ No newline at end of file

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,12 @@ 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");
+      if(vm.radioPage !== undefined){
+        this.updateCurrent(this.pageList[vm.radioPage].id, "tAppDirPic/update");
+      }
+      if(vm.radioRun!== undefined){
+        this.updateCurrent(this.runList[vm.radioRun].id, "tAppRunPic/update");
+      }
     },
     updateCurrent(id, url) {
       let vm = this;
@@ -413,4 +417,4 @@ export default {
     }
   }
 }
-</style>
+</style>
\ No newline at end of file

src/page/accounts/statisticalDialog/edit.vue

 <template>
   <el-dialog
     custom-class="party-dialog"
-    title="新建统计账号"
+    title="编辑统计账号"
     :visible.sync="dialogVisible"
     width="468px"
     :before-close="handleClose"

src/page/check/display/index.vue

@@ -5,12 +5,10 @@
         :inline="true"
         :model="form"
         ref="form"
-        class="search-form"
         onsubmit="return false;"
       >
         <el-form-item label="">
           <el-input
-            size="mini"
             placeholder="请输入视频名称、提交人"
             v-model="form.name"
             @keyup.enter.native="Search"
@@ -28,13 +26,11 @@
         <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 @click="Reset"
               >重置</el-button
             >
           </div>
@@ -57,11 +53,11 @@
           :data="tableData"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column
-            type="index"
-            width="120"
-            label="序号"
-          ></el-table-column>
+           <el-table-column type="index" width="120" label="序号">
+            <template slot-scope="scope">
+              <span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
           <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>
@@ -132,7 +128,6 @@
       </div>
       <div class="partyt-pagination">
         <el-pagination    
-          background
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pageSize"
@@ -184,7 +179,7 @@
         <el-form
           :model="editForm"
           disabled
-          class="party-form"
+          class="party-form demo-form-inline"
           ref="editForm"
           label-width="80px"
           label-position="top"
@@ -209,6 +204,9 @@
           <el-form-item label="宣传图" :label-width="formLabelWidth">
             <img class="imgSize" :src="editForm.cover" alt="" />
           </el-form-item>
+          <el-form-item label="二维码" :label-width="formLabelWidth">
+            <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>

src/page/check/learn/index.vue

 <template>
   <div class="listPage H100">
     <div class="search-container">
-      <el-form :inline="true" :model="form" ref="form" class="search-form" onsubmit="return false;">
+      <el-form :inline="true" :model="form" ref="form" onsubmit="return false;">
         <el-form-item label="">
           <el-input
-            size="mini"
             placeholder="请输入学习内容名称、提交人"
             v-model="form.name"
             @keyup.enter.native="Search"
@@ -21,8 +20,8 @@
         </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>
+            <el-button type="primary" @click="Search">查询</el-button>
+            <el-button  @click="Reset">重置</el-button>
           </div>
         </el-form-item>
       </el-form>
@@ -43,7 +42,11 @@
           :data="tableData"
           @selection-change="handleSelectionChange"
         >
-        <el-table-column type="index" width="120" label="序号"></el-table-column>
+         <el-table-column type="index" width="120" label="序号">
+            <template slot-scope="scope">
+              <span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
             <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>
@@ -111,7 +114,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

 <template>
   <div class="listPage H100">
     <div class="search-container">
-      <el-form :inline="true" :model="form" ref="form" class="search-form" onsubmit="return false;">
+      <el-form :inline="true" :model="form" ref="form" onsubmit="return false;">
         <el-form-item label>
           <el-input
-            size="mini"
             placeholder="请输入视频名称、提交人"
             v-model="form.name"
             @keyup.enter.native="Search"
@@ -21,8 +20,8 @@
         </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>
+            <el-button type="primary" @click="Search">查询</el-button>
+            <el-button @click="Reset">重置</el-button>
           </div>
         </el-form-item>
       </el-form>
@@ -41,7 +40,11 @@
           :data="tableData"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column type="index" width="120" label="序号"></el-table-column>
+           <el-table-column type="index" width="120" label="序号">
+            <template slot-scope="scope">
+              <span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
           <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>
@@ -97,7 +100,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"
@@ -16,7 +12,7 @@
     <i class="el-icon-plus fileUpload"></i>
 
   </el-upload>
-   <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
+   <el-button style="margin-left: 10px;" size="small" type="success" v-loading="loading" @click="submitUpload">上传到服务器</el-button>
 </div>
 
 </template>
@@ -31,6 +27,7 @@ export default {
   },
   data() {
     return {
+      loading:false,
       filedata: [],
       fileArr: [],
     };
@@ -40,6 +37,7 @@ export default {
   },
   methods: {
     submitUpload() {
+      this.loading = true
         this.filedata = new FormData()  //  用FormData存放上传文件
         this.$refs.upload.submit()  // 会循环调用uploadFile方法，多个文件调用多次
         let _this = this;
@@ -55,8 +53,9 @@ export default {
         .then(res => {
           let resData = res.data;
           console.log(res)
-
+           this.loading = false
           if (resData.resultCode == "200") {
+            _this.$message.success('上传成功！')
             const data = resData.data.fileList
             let newArray = data.map((item) => item.id)
             let editArray =[]
@@ -90,10 +89,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"
@@ -19,6 +15,7 @@
       style="margin-left: 10px"
       size="small"
       type="success"
+      v-loading="loading"
       @click="submitUpload"
       >上传到服务器</el-button
     >
@@ -35,6 +32,7 @@ export default {
   },
   data() {
     return {
+      loading:false,
       filedata: [],
       fileArr: [],
     };
@@ -43,6 +41,7 @@ export default {
   },
   methods: {
     submitUpload() {
+      this.loading = true
       this.filedata = new FormData(); //  用FormData存放上传文件
       this.$refs.upload.submit(); // 会循环调用uploadFile方法，多个文件调用多次
 
@@ -57,8 +56,10 @@ export default {
           this.filedata
         )
         .then((res) => {
+          this.loading = false
           let resData = res.data;
           if (resData.resultCode == "200") {
+            _this.$message.success('上传成功！')
             const data = resData.data.fileList;
             let newArray = data.map((item) => item.id);
             let editArray =[]
@@ -90,10 +91,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"
@@ -16,7 +13,7 @@
     <i class="el-icon-plus fileUpload"></i>
 
   </el-upload>
-   <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
+   <el-button style="margin-left: 10px;" size="small" type="success" v-loading="loading" @click="submitUpload">上传到服务器</el-button>
 </div>
 
 </template>
@@ -31,6 +28,7 @@ export default {
   },
   data() {
     return {
+      loading:false,
       filedata:[],
       fileArr: [],
       fileList:[],
@@ -39,6 +37,7 @@ export default {
   },
   methods: {
     submitUpload() {  // 导入
+    this.loading = true
         let tempData =  this.filedata
         this.filedata = new FormData()  //  用FormData存放上传文件
         this.$refs.upload.submit()  // 会循环调用uploadFile方法，多个文件调用多次
@@ -56,17 +55,10 @@ export default {
         .then(res => {
           let resData = res.data;
           console.log(res)
-
+          this.loading = false
           if (resData.resultCode == "200") {
-            // console.log(resData.data.fileList)
-            // const data = resData.data.fileList
-            // console.log(data)
-            // let newArray = data.map((item) => {
-            //     return item.id;
-            // })
-            
-            // this.$emit('videoList', newArray)
-
+         
+             _this.$message.success('上传成功！')
             const data = resData.data.fileList;
             let newArray = data.map((item) => item.id);
             let editArray =[]
@@ -101,10 +93,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"
@@ -65,4 +65,4 @@ export default {
 </script>
 
 <style>
-</style>
+</style>
\ No newline at end of file

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

@@ -7,7 +7,7 @@
         ref="form"
         onsubmit="return false;"
       >
-        <el-form-item label="分类名称">
+        <el-form-item >
           <el-input
             placeholder="请输入分类名称"
             v-model="form.nameOrCode"
@@ -15,7 +15,7 @@
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="版权方有效期">
+        <el-form-item>
           <el-date-picker
             value-format="yyyy-MM-dd"
             v-model="form.dateRange"

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

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

-<template>
-  <el-form :model="dealForm" >
-       <el-form-item
-      prop="uploadFile"
-      label="上传文件">
-      <el-upload
-        ref="fileUpload"
-        :auto-upload="false"
-        :limit="3"
-        :on-change="fileOnChange"
-        :before-upload="fileBeforeUpload"
-        :before-remove="fileBeforeRemove"
-        size="mini"
-        class="upload-file"
-        action="/"
-        multiple>
-        <el-button
-          class="upload-button"
-          size="small"
-          type="primary">请选择文件</el-button>
-          <!--<div
-          slot="tip"
-          class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>-->
-      </el-upload>
-    </el-form-item>
-    <el-form-item
-      prop="uploadImg"
-      label="上传图片">
-      <!--:on-remove="imgRemoveList"-->
-      <el-upload
-        ref="imgUpload"
-        :auto-upload="false"
-        :limit="3"
-        :on-change="imgOnChange"
-        :before-upload="imgBeforeUpload"
-        :before-remove="imgBeforeRemove"
-        size="mini"
-        class="upload-img"
-        action="/"
-        accept=".jpg,.jpeg,.png"
-        list-type="picture-card"
-        multiple>
-        <!--<i class="el-icon-plus"/>-->
-        <i class="icon-tupian"/>
-        <!--<div class="el-upload__text">将文件拖到此处</div>-->
-        <div
-          slot="tip"
-          class="el-upload__tip">只能上传jpg/png文件，大小不超过20M</div>
-      </el-upload>
-    </el-form-item>
-     <el-button @click="saveDealEvent">提交</el-button>
-  </el-form>
-</template>
-
-<script>
-export default {
-  data() {
-    let validateLicense = (rule, value, callback) => {
-      if (!(this.imgSizeIsSatisfy.length === 0)) {
-        callback(new Error('上传图片大小不能超过 5MB!'));
-      } else {
-        callback();
-      }
-    };
-    let fileValidate = (rule, value, callback) => {
-      if (!(this.fileSizeIsSatisfy.length === 0)) {
-        callback(new Error('上传图片大小不能超过 10MB!'));
-      } else {
-        callback();
-      }
-    };
-    return {
-      dealForm: {
-        solutions: '111',
-        dealStatus: 'ww',
-        dealFunction: 'qq'
-      },
-      dealFormRules: {
-        uploadImg: [{ validator: validateLicense }],
-        uploadFile: [{ validator: fileValidate }]
-      },
-      uploadFile: [],
-      uploadImg: [],
-      imgSizeIsSatisfy: [],
-      fileSizeIsSatisfy: []
-    };
-  },
-  methods: {
-    imgBeforeUpload(file) {
-      this.uploadImg.push(file);
-      return false;
-      // 返回false，停止上传
-    },
-    fileBeforeUpload(file) {
-      this.uploadFile.push(file);
-      return false;
-    },
-    saveDealEvent() {
-    //   this.$refs.dealForm.validate(valid => {
-    //     if (valid) {
-          this.$confirm('确认提交吗？', '提示', {})
-            .then(() => {
-              // 创建一个formData对象
-              const formData = new FormData();
-              // 把表单双向绑定的数据添加到formData对象里面
-              Object.keys(this.dealForm).forEach(key => {
-                formData.append(key, this.dealForm[key]);
-              });
-              console.log(formData)
-              // 添加eventId到formData对象里面
-            //   formData.append('eventId', this.evtId);
-              // 手动上传文件列表
-              this.$refs.fileUpload.submit();
-              this.$refs.imgUpload.submit();
-              // 把要上传的文件添加到formData对象里面
-              for (let i = 0; i < this.uploadFile.length; i++) {
-                formData.append('fileFiles', this.uploadFile[i]);
-              }
-              for (let i = 0; i < this.uploadImg.length; i++) {
-                formData.append('imgFiles', this.uploadImg[i]);
-              }
-              console.log(formData,'formData')
-          
-           
-       let vm = this;
-      vm.$https(
-        {
-          url: "videoContent/dddddgetPageList",
-          method: "post",
-          authType: this.backToken
-        },
-        // vm.$qs.stringify(this.dealForm)
-         vm.$qs.stringify(formData)
-        // param
-      )
-        .then(res => {
-         
-        })
-        .catch(function(err) {
-          console.log(err);
-        });
-            //   // 提交表单
-            //   saveDealEvent(formData).then(res => {
-            //     // 提交后置空
-            //     this.dealForm = {};
-            //     this.uploadFile = [];
-            //     this.uploadImg = [];
-            //     this.$refs['dealForm'].resetFields();
-            //     this.$message({
-            //       message: '提交成功',
-            //       type: 'success'
-            //     });
-            //   });
-            })
-            .catch(e => {
-              console.log(e);
-            });
-    //     }
-    //   });
-    },
-    imgOnChange(file, fileList) {
-        console.log(file,'eeeee')
-        this.dealForm.imgFile =file
-        this.imgSizeIsSatisfy.push(file.name);
-        this.$refs.dealForm.validateField('uploadImg');
-      const isLt2M = file.size / 1024 / 1024 < 5;
-    //   if (!isLt2M) {
-    //     this.imgSizeIsSatisfy.push(file.name);
-    //     this.$refs.dealForm.validateField('uploadImg');
-    //   }
-    },
-    imgBeforeRemove(file) {
-      if (!(this.imgSizeIsSatisfy.indexOf(file.name) === -1)) {
-        let temp = this.imgSizeIsSatisfy.indexOf(file.name);
-        this.imgSizeIsSatisfy.splice(temp, 1);
-        this.$refs.dealForm.validateField('uploadImg');
-      }
-    },
-    fileOnChange(file, fileList) {
-      const isLt2M = file.size / 1024 / 1024 < 10;
-      if (!isLt2M) {
-        this.fileSizeIsSatisfy.push(file.name);
-        this.$refs.dealForm.validateField('uploadFile');
-      }
-    },
-    fileBeforeRemove(file) {
-      if (!(this.fileSizeIsSatisfy.indexOf(file.name) === -1)) {
-        let temp = this.fileSizeIsSatisfy.indexOf(file.name);
-        this.fileSizeIsSatisfy.splice(temp, 1);
-        this.$refs.dealForm.validateField('uploadFile');
-      }
-    }
-  }
-}
-</script>
-
-<style>
-
-</style>
\ No newline at end of file

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

@@ -26,6 +26,8 @@
                 <el-select
                   placeholder="请选择展板版权方"
                   v-model="ruleForm.boardCopyrightOwnerId"
+                  clearable
+                  @change="clearBoardCat"
                 >
                   <el-option
                     v-for="item in boardCopyrightOwnerId"
@@ -39,6 +41,8 @@
                 <el-select
                   placeholder="请选择展板分类"
                   v-model="ruleForm.exhibitionBoardCatId"
+                  @focus="getExhibitionBoardCatId"
+                  clearable
                 >
                   <el-option
                     v-for="item in exhibitionBoardCatId"
@@ -73,6 +77,8 @@
                 <el-select
                   placeholder="请选择视频版权方"
                   v-model="ruleForm.videoContentCopyrightOwnerId"
+                  @change="clearVideoCat"
+                  clearable
                 >
                   <el-option
                     v-for="item in copyrightOwner"
@@ -86,6 +92,9 @@
                 <el-select
                   placeholder="请选择视频分类"
                   v-model="ruleForm.videoContentCatId"
+                  @focus="getVideoContentCatData"
+                  @change="clearVideo"
+                  clearable
                 >
                   <el-option
                     v-for="item in videoContentCat"
@@ -95,10 +104,12 @@
                   ></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"
+                  clearable
                   >
                   <el-option
                     v-for="item in videoContentId"
@@ -109,10 +120,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>
@@ -160,9 +175,11 @@ export default {
       formLabelWidth: "100px",
       ruleForm: {
         name: "",
+        exhibitionBoardCatId:'',
         boardCopyrightOwnerId:"",
         videoContentCopyrightOwnerId: "",
         videoContentCatId: "",
+        videoContentId:"",
         audioIdList: [],
         datumIdList: [],
         datumList:[],
@@ -201,15 +218,24 @@ export default {
   },
   methods: {
     init() {
-      this.getVideoContentCatData();
+      // this.getVideoContentCatData();
       this.getVideoContentCopyrightData();
-      this.getExhibitionBoardCatId();
+      // this.getExhibitionBoardCatId();
       this.getBoardCopyrightOwnerId();
-      this.getVideoData();
+      // this.getVideoData();
       if (this.$route.query.type === "Update") {
         this.getInfo(this.$route.query.id);
       }
     },
+    // 更换展板版权方，展板分类清空
+    clearBoardCat(){
+      this.ruleForm.exhibitionBoardCatId = ''
+    },
+    // 更换视频版权方，视频分类清空
+    clearVideoCat(){
+      this.ruleForm.videoContentCatId = ''
+      this.ruleForm.videoContentId = ''
+    },
     //  获取版权方详情
     getInfo(id) {
       let vm = this;
@@ -343,42 +369,69 @@ export default {
     },
     //获取展板分类
     getExhibitionBoardCatId(){
-        let vm = this;
-        vm.$https({
+      let vm = this;
+      if(this.ruleForm.boardCopyrightOwnerId){
+         vm.$https({
             url: "exhibitionBoardCat/getList",
-            method: "get",
+            method: "post",
             authType: this.backToken
-        }).then(res => {
-            this.exhibitionBoardCatId = res.data.data;
+        },this.$qs.stringify({copyrightOwnerId:this.ruleForm.boardCopyrightOwnerId})).then(res => {
+            this.exhibitionBoardCatId = res.data.data
         }).catch(function(err) {
-            console.log(err);
-        });
+          console.log(err);
+      });
+      }else{
+        this.$message.warning("请先选择展板版权方！")
+      }
+        
+       
     },
     // 获取视频分类列表
     getVideoContentCatData() {
       let vm = this;
-      vm.$https({
+      if(this.ruleForm.videoContentCopyrightOwnerId){
+        vm.$https({
         url: "videoContentCat/getList",
         method: "get",
         authType: this.backToken
-      }).then(res => {
+      },{copyrightOwnerId:this.ruleForm.videoContentCopyrightOwnerId}).then(res => {
           this.videoContentCat = res.data.data;
       }).catch(function(err) {
           console.log(err);
       });
+      }else{
+        this.$message.warning("请先选择视频版权方！")
+        
+      }
+      
+    },
+    // 视频版权方或视频分类发生变化时，重置视频的值
+    clearVideo(){
+      this.ruleForm.videoContentId = ''
     },
      // 获取视频列表
     getVideoData() {
-      let vm = this;
-      vm.$https({
-        url: "videoContent/getList",
-        method: "get",
-        authType: this.backToken
-      }).then(res => {
-          this.videoContentId = res.data.data;
-      }).catch(function(err) {
-          console.log(err);
-      });
+      const param = {
+        videoContentCatId:this.ruleForm.videoContentCatId,
+        videoContentCopyrightOwnerId:this.ruleForm.videoContentCopyrightOwnerId
+      }
+      if((this.ruleForm.videoContentCatId)&&(this.ruleForm.videoContentCopyrightOwnerId)){
+        let vm = this;
+        vm.$https({
+          url: "videoContent/getList",
+          method: "get",
+          authType: this.backToken
+        },
+        param).then(res => {
+            this.videoContentId = res.data.data;
+        }).catch(function(err) {
+            console.log(err);
+        });
+      }else{
+        this.$message.warning("请先选择视频版权方和视频分类！")
+        this.videoContentId = []
+      }
+      
     },
     // 关闭
     close() {

src/page/content/display/content/details.vue

@@ -62,7 +62,10 @@
               <el-form-item label="展板图片" class="w50">
                 <img class="imgSize" :src="contentData.cover" />
               </el-form-item>
-              <el-form-item label="展板简介">{{
+               <el-form-item label="展板二维码" class="">
+                <img class="imgSize" :src="contentData.qrcodeUrl" />
+              </el-form-item>
+              <el-form-item label="展板简介" class="w100">{{
                 contentData.remarks
               }}</el-form-item>
             </el-form>

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

@@ -3,7 +3,7 @@
     <msg-dialog ref="msgDialog" :msgInfo="msgInfo" />
     <div class="search-container">
       <el-form :inline="true" :model="form" onsubmit="return false;">
-        <el-form-item label="展板名称">
+        <el-form-item >
           <el-input
             placeholder="请输入展板名称"
             v-model="form.nameOrCode"
@@ -11,7 +11,7 @@
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="版权方有效期">
+        <el-form-item >
           <el-date-picker
             value-format="yyyy-MM-dd"
             v-model="form.dateRange"
@@ -21,7 +21,7 @@
             end-placeholder="结束日期"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item label="展板版权方">
+        <el-form-item >
           <el-select v-model="form.boardCopyrightOwnerId" placeholder="请选择展板版权方">
             <el-option
               v-for="item in copyRightList"
@@ -31,7 +31,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="展板分类">
+        <el-form-item >
           <el-select v-model="form.exhibitionBoardCatId" placeholder="请选择展板分类">
             <el-option
               v-for="item in classifyList"
@@ -179,7 +179,7 @@ export default {
       vm.$https(
         {
           url: "exhibitionBoardCat/getList",
-          method: "get",
+          method: "post",
           authType: this.backToken,
         })
         .then((res) => {

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

@@ -7,7 +7,7 @@
         ref="form"
         onsubmit="return false;"
       >
-        <el-form-item label="版权方名称">
+        <el-form-item >
           <el-input
             placeholder="请输入版权方名称"
             v-model="form.nameOrCode"
@@ -15,7 +15,7 @@
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="版权方有效期">
+        <el-form-item >
           <el-date-picker
             value-format="yyyy-MM-dd"
             v-model="form.dateRange"
@@ -67,7 +67,7 @@
           <el-table-column label="版权方名称" prop="name"></el-table-column>
           <el-table-column
             label="展板分类"
-            prop="videoContentCatNames"
+            prop="boardCatNames"
           ></el-table-column>
           <el-table-column label="创建时间" prop="createTime"></el-table-column>
           <el-table-column
@@ -228,12 +228,13 @@ export default {
     },
     // 添加
     addPermis() {
-      this.FormVisible = true;
-      this.type = true;
-      this.classForm = {
-        ownerType: "EXHIBITION_BOARD",
-        valueDate: [],
-      }
+      this.$router.push({ path: "displayCopyrightAdd", query: { type: "add" } });
+      // this.FormVisible = true;
+      // this.type = true;
+      // this.classForm = {
+      //   ownerType: "EXHIBITION_BOARD",
+      //   valueDate: [],
+      // }
     },
     // 新建视频分类确认保存
     permisSave() {
@@ -328,11 +329,15 @@ export default {
     },
     // 编辑弹框
     openEdit(row) {
-      this.type = false;
-      this.FormVisible = true;
-      this.classForm = JSON.parse(JSON.stringify(row));
-      this.classForm.valueDate =[row.expireDateStart,row.expireDateEnd]
-      this.classForm = {...this.classForm}
+       this.$router.push({
+        path: "displayCopyrightUpdate",
+        query: { type: "Update", id: row.id }
+      });
+      // this.type = false;
+      // this.FormVisible = true;
+      // this.classForm = JSON.parse(JSON.stringify(row));
+      // this.classForm.valueDate =[row.expireDateStart,row.expireDateEnd]
+      // this.classForm = {...this.classForm}
     },
     // 删除
     handleDelete(row) {

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

@@ -37,38 +37,40 @@
           <el-form-item label="学习内容宣传图" prop="cover" class="w100">
             <upload-img ref="uploadImg" @imgUrl="imgUrl"></upload-img>
           </el-form-item>
-          <el-form-item class="w50" label="展板类别" prop="exhibitionBoardCatIdList">
+           <el-form-item label="展板版权方" class="w50" prop="copyrightOwnerIdList">
             <el-select
-              placeholder="请选择展板类别"
+              placeholder="请选择版权方"
               multiple
-              v-model="ruleForm.exhibitionBoardCatIdList"
-              @change="getSelectDep"
+              v-model="ruleForm.copyrightOwnerIdList"
+              @change="getSelectDep2"
             >
-              <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
+              <el-checkbox :style="selfstyle" v-model="checkedThing2" @change="selectAllThing2">全选</el-checkbox>
               <el-option
-                v-for="item in videoContentCat"
+                v-for="item in assetType2"
                 :label="item.name"
                 :value="item.id"
                 :key="item.id"
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="版权方" prop="copyrightOwnerIdList">
+          <el-form-item  label="展板类别" prop="exhibitionBoardCatIdList">
             <el-select
-              placeholder="请选择版权方"
+              placeholder="请选择展板类别"
               multiple
-              v-model="ruleForm.copyrightOwnerIdList"
-              @change="getSelectDep2"
+              v-model="ruleForm.exhibitionBoardCatIdList"
+              @focus="getAssetTypeData"
+              @change="getSelectDep"
             >
-              <el-checkbox :style="selfstyle" v-model="checkedThing2" @change="selectAllThing2">全选</el-checkbox>
+              <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
               <el-option
-                v-for="item in assetType2"
+                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" prop="exhibitionBoardIdList">
                     <div class="party-table">
             <el-table
@@ -80,7 +82,8 @@
               :data="tableData"
             >
               <el-table-column type="selection" width="55"></el-table-column>
-              <el-table-column type="index" width="120" label="序号"></el-table-column>
+               <el-table-column type="index" width="120" label="序号">
+          </el-table-column>
               <el-table-column show-overflow-tooltip label="展板名称" prop="name"></el-table-column>
               <el-table-column show-overflow-tooltip label="展板类别" prop="exhibitionBoardCatName"></el-table-column>
               <el-table-column show-overflow-tooltip label="展板版权方" prop="boardCopyrightOwnerName"></el-table-column>
@@ -284,7 +287,7 @@ export default {
     },
     init() {
       this.getLearnProject();
-      this.getAssetTypeData();
+      // this.getAssetTypeData();
       this.getAssetTypeData2();
       if (this.$route.query.type === "Update") {
         this.getInfo(this.$route.query.id);
@@ -347,9 +350,9 @@ export default {
       let vm = this;
       vm.$https({
         url: "exhibitionBoardCat/getList",
-        method: "get",
+        method: "post",
         authType: this.backToken
-      })
+      },{copyrightOwnerId:this.ruleForm.exhibitionBoardCatIdList.toString})
         .then(res => {
           let data = res.data.data;
           vm.videoContentCat = data;
@@ -485,6 +488,7 @@ export default {
       } else {
         this.checkedThing = false;
       }
+      this.getTableParam()
     },
     //
     getSelectDep2(exhibitionBoardCatIdList) {
@@ -493,11 +497,19 @@ export default {
       } else {
         this.checkedThing2 = false;
       }
-      const param = {
-        boardCopyrightOwnerIdList: this.ruleForm.copyrightOwnerIdList,
-        exhibitionBoardCatIdList: this.ruleForm.exhibitionBoardCatIdList
+      this.getTableParam()
+    },
+    // 筛选展板备选清单选项条件
+    getTableParam(){
+       const param = {
+        boardCopyrightOwnerIdList: this.ruleForm.copyrightOwnerIdList.toString(),
+        exhibitionBoardCatIdList: this.ruleForm.exhibitionBoardCatIdList.toString()
       };
-      this.getTableData(param);
+      if((param.boardCopyrightOwnerIdList.length>0)&&(param.exhibitionBoardCatIdList.length>0)){
+        this.getTableData(param);
+      }else{
+        this.tableData = []
+      }
     },
     // 根据展板类别，版权方获取展板备选清单
     getTableData(param, type) {

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

@@ -57,7 +57,11 @@
                 ref="multipleTable"
                 :data="tableData"
               >
-                <el-table-column type="index" width="120" label="序号"></el-table-column>
+                 <el-table-column type="index" width="120" label="序号">
+            <template slot-scope="scope">
+              <span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
                 <el-table-column show-overflow-tooltip label="版权方名称" prop="name"></el-table-column>
                 <el-table-column label="操作">
                   <template slot-scope="scope">

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

@@ -48,11 +48,11 @@
           ref="multipleTable"
           :data="tableData"
         >
-          <el-table-column
-            type="index"
-            width="120"
-            label="序号"
-          ></el-table-column>
+           <el-table-column type="index" width="120" label="序号">
+            <template slot-scope="scope">
+              <span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
           <el-table-column
             show-overflow-tooltip
             label="学习内容名称"
@@ -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/learn/project/index.vue

@@ -48,11 +48,11 @@
           ref="multipleTable"
           :data="tableData"
         >
-          <el-table-column
-            type="index"
-            width="120"
-            label="序号"
-          ></el-table-column>
+           <el-table-column type="index" width="120" label="序号">
+            <template slot-scope="scope">
+              <span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="学习项目名称" prop="name"></el-table-column>
           <el-table-column label="创建时间" prop="createTime"></el-table-column>
           <el-table-column

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

 <template>
   <div class="listPage H100">
     <div class="search-container">
-      <el-form :inline="true" :model="form" ref="form" class="search-form" onsubmit="return false;">
-        <el-form-item label="版权方名称">
+      <el-form :inline="true" :model="form" ref="form"  onsubmit="return false;">
+        <el-form-item>
           <el-input
-            size="mini"
-            placeholder="请输入版权方名称"
-            v-model="form.name"
+            placeholder="请输入视频分类名称"
+            v-model="form.nameOrCode"
             @keyup.enter.native="Search"
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="版权方有效期">
+        <el-form-item>
           <el-date-picker
             value-format="yyyy-MM-dd"
             v-model="value1"
@@ -46,7 +45,11 @@
           :data="tableData"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column type="index" width="120" label="序号"></el-table-column>
+           <el-table-column type="index" width="120" label="序号">
+            <template slot-scope="scope">
+              <span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
+            </template>
+          </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>
@@ -71,8 +74,6 @@
       </div>
       <div class="partyt-pagination">
         <el-pagination
-          small
-          background
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pageSize"
@@ -293,7 +294,7 @@ export default {
       let searchObj = {
         _index: 1,
         _size: _this.page.pageSize,
-        name: _this.form.name,
+        nameOrCode: _this.form.nameOrCode,
         startDate:this.value1?this.value1[0]:"",
         endDate:this.value1?this.value1[1]:"",
       };

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

@@ -65,7 +65,11 @@
           :data="tableData"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column type="index" width="120" label="序号"></el-table-column>
+           <el-table-column type="index" width="120" label="序号">
+            <template slot-scope="scope">
+              <span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
           <el-table-column show-overflow-tooltip label="视频名称" prop="name"></el-table-column>
           <el-table-column show-overflow-tooltip label="版权方" prop="videoContentCopyrightOwnerName"></el-table-column>
           <el-table-column label="视频分类" prop="videoContentCatName"></el-table-column>
@@ -112,8 +116,6 @@
       </div>
       <div class="partyt-pagination">
         <el-pagination
-          small
-          background
           @current-change="handleCurrentChange"
           :current-page="page.currentPage"
           :page-size="page.pageSize"
@@ -513,10 +515,47 @@ export default {
           console.log(err);
         });
     },
-    // 删除
-    handleDelete(row) {
-      let _this = this;
-      this.$confirm("此操作将永久删除, 是否继续?", "提示", {
+    // 根据视频内容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(dataMsg + "此操作将永久删除, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -525,7 +564,7 @@ export default {
           _this
             .$https({
               method: "delete",
-              url: "videoContent/delete/" + row.id,
+              url: "videoContent/delete/" + id,
               authType: this.backToken
             })
             .then(
@@ -548,6 +587,10 @@ export default {
         })
         .catch(() => {});
     },
+    // 删除
+    handleDelete(row) {
+      this.getUseBoard(row.id)
+    },
 
     // 批量操作
     handleSelectionChange(selection) {

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

 <template>
   <div class="info">
-    <div class="info-header">新建版权方</div>
+    <div class="info-header">{{ type === 'Update'?'修改':'新建'}}视频版权方</div>
     <div class="info-container">
       <div class="info-wrapper">
           <div class="pageTips">

src/page/content/video/copyright/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-item label="版权方名称">
+      <el-form :inline="true" :model="form" onsubmit="return false;">
+        <el-form-item >
           <el-input
-            size="mini"
             placeholder="请输入版权方名称"
             v-model="form.nameOrCode"
             @keyup.enter.native="Search"
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="版权方有效期">
+        <el-form-item >
           <el-date-picker
             value-format="yyyy-MM-dd"
             v-model="value1"
@@ -46,7 +45,11 @@
           :data="tableData"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column type="index" width="120" label="序号"></el-table-column>
+          <el-table-column type="index" width="120" label="序号">
+            <template slot-scope="scope">
+              <span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
           <el-table-column show-overflow-tooltip label="版权方名称" prop="name"></el-table-column>
           <el-table-column show-overflow-tooltip label="视频分类" prop="videoContentCatNames"></el-table-column>
           <el-table-column label="创建时间" prop="createTime"></el-table-column>
@@ -74,8 +77,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

@@ -66,9 +66,13 @@
           @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="videoContentCopyrightOwnerName"></el-table-column>
-          <el-table-column label="版权方" prop="exhibitionBoardName"></el-table-column>
+           <el-table-column type="index" width="120" label="序号">
+            <template slot-scope="scope">
+              <span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="视频名称" prop="fileName"></el-table-column>
+          <el-table-column label="版权方" prop="videoContentCopyrightOwnerName"></el-table-column>
           <el-table-column label="视频类别" prop="videoContentCatName"></el-table-column>
         </el-table>
       </div>
@@ -297,7 +301,7 @@ export default {
       }
       return str;
     },
-    // 批量删除
+    // 汇出
     multipleRemit() {
       let _this = this;
       let str = _this.getMultipleSelect();
@@ -306,10 +310,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 => {
@@ -328,9 +333,7 @@ export default {
           document.body.appendChild(downloadElement)
           downloadElement.click() // 点击下载
           document.body.removeChild(downloadElement) // 下载完成移除元素
-          window.URL.revokeObjectURL(href) // 释放blob对象
-          
-            
+          window.URL.revokeObjectURL(href) // 释放blob对象 
             },
             error => {}
           );

src/page/system/log/platformlog.vue

@@ -79,7 +79,7 @@ export default {
         { prop: "operator", label: "操作者" },
         { prop: "operationType", label: "操作类型" },
         { prop: "operationObject", label: "操作对象" },
-        { prop: "operationIp", label: "设备Ip" },
+        { prop: "operationIp", label: "设备IP" },
       ],
       list: [],
       page: {

src/page/system/log/userlog.vue

@@ -84,7 +84,7 @@ export default {
         { prop: "operator", label: "操作者" },
         { prop: "operationType", label: "操作类型" },
         { prop: "operationObject", label: "操作对象" },
-        { prop: "operationIp", label: "设备Ip" },
+        { prop: "operationIp", label: "设备IP" },
       ],
       list: [],
       page: {

src/page/system/organ.vue

@@ -270,17 +270,21 @@ export default {
           let resData = res.data;
           if (res.status == 200) {
             if (resData.resultCode == 200) {
+              _this.$message({
+                type: "success",
+                message: resData.message,
+              });
               _this.getOrgTree();
             } else {
-              _this.$message.error(resData.msg || resData.message);
+              _this.$message.error(resData.msg || resData.message || "");
             }
           } else {
-            _this.$message.error(resData.msg || resData.message);
+            _this.$message.error(resData.msg || resData.message || "");
           }
         })
         .catch((err) => {
           console.log(err);
-          _this.$message.error(err.msg || err.message);
+          _this.$message.error(err.msg || err.message || "");
         });
     },
   },

src/router/index.js

@@ -308,6 +308,24 @@ const router = new Router({
             title: '展板版权方管理',
           }
         },
+        {
+          path: '/displayCopyrightAdd',
+          name: '新建展板版权方',
+          component: () => import('@/page/content/display/copyright/Add'),
+          meta: {
+            showBreadcrumb: true,
+            title: '新建展板版权方',
+          }
+        },
+        {
+          path: '/displayCopyrightUpdate',
+          name: '修改展板版权方',
+          component: () => import('@/page/content/display/copyright/Add'),
+          meta: {
+            showBreadcrumb: true,
+            title: '修改展板版权方',
+          }
+        },
         {
           path: '/displayClassify',
           name: '展板分类管理',