|
@@ -40,16 +40,20 @@
|
|
|
|
|
|
<!-- table区域-begin -->
|
|
|
<div>
|
|
|
+
|
|
|
<a-table
|
|
|
ref="table"
|
|
|
size="middle"
|
|
|
- :scroll="{ x: true }"
|
|
|
+ :scroll="{x:true}"
|
|
|
bordered
|
|
|
rowKey="id"
|
|
|
:columns="columns"
|
|
|
:dataSource="dataSource"
|
|
|
:pagination="ipagination"
|
|
|
+ :loading="loading"
|
|
|
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
|
|
|
class="j-table-force-nowrap"
|
|
|
+ @change="handleTableChange"
|
|
|
>
|
|
|
<template slot="htmlSlot" slot-scope="text">
|
|
|
<div v-html="text"></div>
|
|
@@ -191,8 +195,8 @@ export default {
|
|
|
return year + '-' + month + '-' + strDate + ' ' + hour + ':' + minute + ':' + second
|
|
|
},
|
|
|
/** 查询设备运行状态时间段列表 */
|
|
|
- loadData(arg) {
|
|
|
- },
|
|
|
+ // loadData(arg) {
|
|
|
+ // },
|
|
|
// 后端好了需要删掉
|
|
|
getTest() {
|
|
|
var _this = this;
|
|
@@ -247,11 +251,12 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
})
|
|
|
- getAction(_this.url.list, _this.queryParams).then((response) => {
|
|
|
- _this.dataSource = response.result
|
|
|
+ this.loadData()
|
|
|
+ // getAction(_this.url.list, _this.queryParams).then((response) => {
|
|
|
+ // _this.dataSource = response.result
|
|
|
|
|
|
- _this.loading = false
|
|
|
- })
|
|
|
+ // _this.loading = false
|
|
|
+ // })
|
|
|
}
|
|
|
})
|
|
|
},
|