master

src/page/accounts/stbAdmin.vue

@@ -73,9 +73,9 @@ export default {
       statusOption: statusOption,
       feildList: [
         { prop: "userName", label: "运维人员姓名" },
-        { prop: "orgName", label: "运维区域" },
+        { prop: "areaName", label: "运维区域" },
         { prop: "exiredDate", label: "到期时间" },
-        { prop: "type", label: "账号类型" },
+        // { prop: "type", label: "账号类型" },
         { prop: "statusName", label: "账号状态" },
         { prop: "", label: "操作", isEdit: true, width: 280 },
       ],

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

@@ -24,19 +24,18 @@ export default {
   props:{
     fileList:{
       type:Array,
-      default:[]
+      default:[
+        {
+          name: "",
+          url: "",
+        },
+      ]
     },
   },
   data() {
     return {
       dialogImageUrl: "",
       dialogVisible: false,
-      fileList: [
-        {
-          name: "",
-          url: "",
-        },
-      ],
     };
   },
   computed: {

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

@@ -24,7 +24,12 @@ export default {
   props:{
     fileList:{
       type:Array,
-      default:[]
+      default:[
+        {
+          name: "",
+          url: "",
+        },
+      ]
     },
   },
   data() {

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

@@ -192,7 +192,7 @@ export default {
     // 分页
     handleCurrentChange(val) {
       this.page._index = val;
-      this.onSearch();
+      this.getTableData();
     },
     // 重置
     Reset() {

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

@@ -287,6 +287,9 @@ export default {
     height: 180px;
     margin: 0 10px;
   }
+  .info-container {
+    height: calc(100% - 250px);
+  }
   /deep/.el-collapse-item__wrap {
     padding: 16px;
   }

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

@@ -32,7 +32,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="展板分类">
-          <el-select v-model="form.boardCatId" placeholder="请选择展板分类">
+          <el-select v-model="form.exhibitionBoardCatId" placeholder="请选择展板分类">
             <el-option
               v-for="item in classifyList"
               :key="item.id"
@@ -205,7 +205,7 @@ export default {
         _size: this.page._size,
         nameOrCode: this.form.nameOrCode,
         boardCopyrightOwnerId:this.form.boardCopyrightOwnerId,
-        boardCatId:this.form.boardCatId,
+        exhibitionBoardCatId:this.form.exhibitionBoardCatId,
         startDate: this.form.dateRange.length ? this.form.dateRange[0] : "",
         endDate: this.form.dateRange.length ? this.form.dateRange[1] : "",
       };
@@ -229,7 +229,7 @@ export default {
     // 分页
     handleCurrentChange(val) {
       this.page._index = val;
-      this.onSearch();
+      this.getTableData();
     },
     
     // 重置

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

@@ -219,7 +219,7 @@ export default {
     // 分页
     handleCurrentChange(val) {
       this.page._index = val;
-      this.onSearch();
+      this.getTableData();
     },
     // 重置
     Reset() {