|
@@ -9,9 +9,10 @@
|
|
|
<a-form layout="inline" @keyup.enter.native="searchQuery">
|
|
|
<a-row :gutter="24">
|
|
|
<a-col :lg="18" :md="12">
|
|
|
- <a-form-item label="账号">
|
|
|
+ <a-form-item label="报警时间">
|
|
|
<!--<a-input placeholder="请输入账号查询" v-model="queryParam.username"></a-input>-->
|
|
|
- <j-input placeholder="输入账号模糊查询" v-model="queryParam.username"></j-input>
|
|
|
+ <!-- <j-input placeholder="输入账号模糊查询" v-model="queryParam.Time"></j-input> -->
|
|
|
+ <j-date placeholder="请选择报警时间" v-model="queryParam.Time" :show-time="true" date-format="YY/MM/DD HH:mm:ss" style="width: 100%" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :lg="6" :md="12">
|
|
@@ -34,6 +35,7 @@
|
|
|
:dataSource="dataSource"
|
|
|
:pagination="ipagination"
|
|
|
:loading="loading"
|
|
|
+ @change="tableChange"
|
|
|
class="j-table-force-nowrap alarm-list-table">
|
|
|
<!-- :scroll="{x:true}" -->
|
|
|
<template>
|
|
@@ -54,6 +56,18 @@
|
|
|
mixins: [JeecgListMixin],
|
|
|
data () {
|
|
|
return {
|
|
|
+ ipagination:{
|
|
|
+ current: 1,
|
|
|
+ pageSize: 10,
|
|
|
+ pageSizeOptions: ['10', '20', '30'],
|
|
|
+ showTotal: (total, range) => {
|
|
|
+ return range[0] + "-" + range[1] + " 共" + total + "条"
|
|
|
+ },
|
|
|
+ showQuickJumper: false,
|
|
|
+ showSizeChanger: true,
|
|
|
+ total: 0,
|
|
|
+
|
|
|
+ },
|
|
|
visible: false,
|
|
|
queryParam: {},
|
|
|
columns: [
|
|
@@ -171,6 +185,7 @@
|
|
|
}
|
|
|
var params = this.getQueryParams();//查询条件
|
|
|
this.loading = true;
|
|
|
+ console.log(9999,params)
|
|
|
getAction(this.url.list, params).then((res) => {
|
|
|
if (res.success) {
|
|
|
//update-begin---author:zhangyafei Date:20201118 for:适配不分页的数据列表------------
|
|
@@ -179,6 +194,8 @@
|
|
|
if(res.result.total)
|
|
|
{
|
|
|
this.ipagination.total = res.result.total;
|
|
|
+ this.ipagination.current = res.result.current;
|
|
|
+ this.ipagination.pageSize = res.result.size;
|
|
|
}else{
|
|
|
this.ipagination.total = 0;
|
|
|
}
|
|
@@ -190,6 +207,11 @@
|
|
|
this.loading = false
|
|
|
})
|
|
|
},
|
|
|
+ tableChange(pagination){
|
|
|
+ this.ipagination.current = pagination.current
|
|
|
+ this.ipagination.pageSize = pagination.pageSize
|
|
|
+ this.loadData()
|
|
|
+ },
|
|
|
}
|
|
|
}
|
|
|
</script>
|