zhangyu преди 5 години
родител
ревизия
928fd1a7db
променени са 1 файла, в които са добавени 30 реда и са изтрити 21 реда
  1. 30 21
      src/views/ledger/facility/batchlink.vue

+ 30 - 21
src/views/ledger/facility/batchlink.vue

@@ -85,6 +85,7 @@ export default {
       //   total: 0
       // },
       radio: {},
+      contentData: [],
       tableData: [],
       mergeCol: [],
       headerStyle: {
@@ -96,33 +97,38 @@ export default {
   },
   methods: {
     //获取表格数据
-    getTableData() {
+    getTableData(pageNum) {
       this.loading = true
-      this.tableData = []
-      let param = this.formatFilter()
+      let param = this.formatFilter(pageNum)
       equipCategoryProperty(param, res => {
         this.unlinkNumber = res.Total
-        this.linkNumber = res.Content.length
+        this.linkNumber += res.Content.length
         // this.page.total = res.Total
-        res.Content.forEach(item =>{
-          if(item.PropertyList && item.PropertyList.length){
-            item.PropertyList.forEach((Assets, index) => {
-              let obj = JSON.parse(JSON.stringify(Object.assign(item, {PropertyItem: Assets, disabled: false})))
-              delete obj.PropertyList
-              this.tableData.push(obj)
-              if(index == 0){
-                this.mergeCol.push(item.PropertyList.length)
-              } else {
-                this.mergeCol.push(false)
-              }
-            })
-          }
-        })
-        this.loading = false
+        this.contentData = this.contentData.concat(res.Content)
+        if (res.Total / (res.PageSize * res.PageNumber) > 1) {
+          this.getTableData(res.PageNumber + 1)
+        } else {
+          this.contentData.forEach(item =>{
+            if(item.PropertyList && item.PropertyList.length){
+              item.PropertyList.forEach((Assets, index) => {
+                let obj = JSON.parse(JSON.stringify(Object.assign(item, {PropertyItem: Assets, disabled: false})))
+                delete obj.PropertyList
+                this.tableData.push(obj)
+                if(index == 0){
+                  this.mergeCol.push(item.PropertyList.length)
+                } else {
+                  this.mergeCol.push(false)
+                }
+              })
+            }
+          })
+          this.loading = false
+        }
       })
     },
     //格式化条件
-    formatFilter() {
+    formatFilter(pageNum) {
+      pageNum = pageNum ? pageNum : 1
       let param = {
           data: {
           //   Cascade: [
@@ -140,7 +146,7 @@ export default {
           //   }
           // ],
           Orders: "createTime desc, EquipID asc",
-          PageNumber: 1,
+          PageNumber: pageNum,
           PageSize: 1000
         },
         category: this.params.deviceType
@@ -218,6 +224,9 @@ export default {
         }
         equipRproperty(params, res => {
           this.radio = {}
+          this.linkNumber = 0
+          this.contentData = []
+          this.tableData = []
           this.getTableData()
           this.$message.success('关联成功!')
         })