Browse Source

设备运行

zbb 1 year ago
parent
commit
c5f7532a60
2 changed files with 10 additions and 10 deletions
  1. 3 3
      package-lock.json
  2. 7 7
      src/pages/index/components/equipment_running.vue

+ 3 - 3
package-lock.json

@@ -7132,9 +7132,9 @@
7132 7132
       }
7133 7133
     },
7134 7134
     "loglevel": {
7135
-      "version": "1.8.1",
7136
-      "resolved": "https://registry.npmmirror.com/loglevel/-/loglevel-1.8.1.tgz",
7137
-      "integrity": "sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg==",
7135
+      "version": "1.9.1",
7136
+      "resolved": "https://registry.npmmirror.com/loglevel/-/loglevel-1.9.1.tgz",
7137
+      "integrity": "sha512-hP3I3kCrDIMuRwAwHltphhDM1r8i55H33GgqjXbrisuJhF4kRhW1dNuxsRklp4bXl8DSdLaNLuiL4A/LWRfxvg==",
7138 7138
       "dev": true
7139 7139
     },
7140 7140
     "longest": {

+ 7 - 7
src/pages/index/components/equipment_running.vue

@@ -75,11 +75,11 @@ export default {
75 75
       columns: [
76 76
         {
77 77
           label: '设备名称',
78
-          key: 'resourceName'
78
+          key: 'deviceName'
79 79
         },
80 80
         {
81 81
           label: '状态',
82
-          key: 'resourceType'
82
+          key: 'deviceState'
83 83
         }
84 84
       ],
85 85
       modelPieColor: ["#2E8B57","#9078f8"],
@@ -126,11 +126,11 @@ export default {
126 126
       this.getTableData()
127 127
     },
128 128
     getTableData() {
129
-      const {pageNum, pageSize, searchWords} = this
130
-      // api.sbyxjcList({current: pageNum, size: pageSize}).then(res => {
131
-      //   this.tableData = res.data.records || []
132
-      //   this.total = res.data.total
133
-      // })
129
+      const {pageNum, pageSize} = this
130
+      api1.sbyxjcList({current: pageNum, size: pageSize}).then(res => {
131
+        this.tableData = res.data.records || []
132
+        this.total = res.data.total
133
+      })
134 134
     },
135 135
   }
136 136
 }