Commit 889143bd authored by 王晓倩's avatar 王晓倩

解决列表页的分页问题

parent c182677a
......@@ -91,8 +91,7 @@
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="deviceAlarmList" @selection-change="handleSelectionChange" >
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table v-loading="loading" :data="deviceAlarmList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange" >
<el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="设备编号" align="center" prop="deviceCode" />
<el-table-column label="设备类型" align="center" prop="deviceType" />
......@@ -135,8 +134,8 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
:page.sync="pageNum"
:limit.sync="pageSize"
@pagination="getList" />
<!-- 添加工单信息对话框 -->
......@@ -202,6 +201,8 @@ export default {
showSearch: true,
// 总条数
total: 0,
pageNum: 1,
pageSize: 10,
// 报警信息表格数据
deviceAlarmList: [],
// 报警类型字典
......@@ -225,8 +226,6 @@ export default {
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
deviceCode: null,
orderId: null,
alarmType: null,
......@@ -307,7 +306,7 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
......
......@@ -22,7 +22,7 @@
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="dataList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="设备编号" align="center" prop="deviceCode" />
......@@ -58,8 +58,8 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
:page.sync="pageNum"
:limit.sync="pageSize"
@pagination="getList"
/>
......@@ -89,6 +89,8 @@ export default {
showSearch: true,
// 总条数
total: 0,
pageNum: 1,
pageSize: 10,
// 设备监控表格数据
dataList: [],
// 弹出层标题
......@@ -97,8 +99,6 @@ export default {
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
deviceNum: null,
standardConditionAccumulation: null,
workingConditionAccumulation: null,
......@@ -158,7 +158,7 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
......
......@@ -22,8 +22,7 @@
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table v-loading="loading" :data="dataList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
<el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="设备编号" align="center" prop="deviceCode" />
<el-table-column label="设备类型" align="center" prop="deviceType" >
......@@ -42,24 +41,13 @@
<el-table-column label="上报时间" align="center" prop="reportTime" />
<el-table-column label="设备状态" align="center" prop="deviceStatus" >
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="showDetail(scope.row)"
v-hasPermi="['system:data:export']"
>详情</el-button>
</template>
</el-table-column> -->
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
:page.sync="pageNum"
:limit.sync="pageSize"
@pagination="getList"
/>
......@@ -89,6 +77,8 @@ export default {
showSearch: true,
// 总条数
total: 0,
pageNum: 1,
pageSize: 10,
// 设备监控表格数据
dataList: [],
// 弹出层标题
......@@ -97,8 +87,6 @@ export default {
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
deviceNum: null,
standardConditionAccumulation: null,
workingConditionAccumulation: null,
......@@ -158,7 +146,7 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
......@@ -172,15 +160,6 @@ export default {
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 工单详细信息跳转 */
showDetail(row) {
this.$router.push({
path: '/reportData/reportdetail',
query:{
orderId : row.orderId
}
}) //带参跳转
},
}
};
</script>
......@@ -82,7 +82,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="deviceInfoList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="deviceInfoList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
<el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="所属管道" align="center" prop="pipeName" />
<el-table-column label="设备编号" align="center" prop="deviceCode" />
......@@ -127,8 +127,8 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
:page.sync="pageNum"
:limit.sync="pageSize"
@pagination="getList"
/>
......@@ -308,6 +308,8 @@
showSearch: true,
// 总条数
total: 0,
pageNum: 1,
pageSize: 10,
// 设备信息表格数据
deviceInfoList: [],
// 弹出层标题
......@@ -325,8 +327,6 @@
typeOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
enterpriseId: null,
deviceName: null,
deviceCode: null,
......@@ -453,7 +453,7 @@
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
......
......@@ -118,7 +118,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="deviceList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="设备监控id" align="center" prop="monitorId" />
<el-table-column label="设备" align="center" prop="deviceName" />
......@@ -150,8 +150,8 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
:page.sync="pageNum"
:limit.sync="pageSize"
@pagination="getList"
/>
......@@ -295,6 +295,8 @@ export default {
showSearch: true,
// 总条数
total: 0,
pageNum: 1,
pageSize: 10,
// 设备监控表格数据
deviceList: [],
// 弹出层标题
......@@ -303,8 +305,6 @@ export default {
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
deviceId: null,
deviceThreshold: null,
relationPipeId: null,
......@@ -362,7 +362,7 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
......
......@@ -82,7 +82,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="pipeList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="pipeList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
<el-table-column label="管道名称" align="center" prop="pipeName" />
<el-table-column label="管道编号" align="center" prop="pipeCode" />
<el-table-column label="管道类型" align="center" prop="pipeType" >
......@@ -132,8 +132,8 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
:page.sync="pageNum"
:limit.sync="pageSize"
@pagination="getList"
/>
......@@ -269,6 +269,8 @@
showSearch: true,
// 总条数
total: 0,
pageNum: 1,
pageSize: 10,
// 管道信息表格数据
pipeList: [],
// 弹出层标题
......@@ -287,8 +289,6 @@
pressureOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
enterpriseId: null,
pipeName: null,
pipeAddr: null,
......@@ -405,7 +405,7 @@
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
......
......@@ -41,8 +41,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="inspectionPlanList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center"/>-->
<el-table v-loading="loading" :data="inspectionPlanList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
<el-table-column label="序号" type="index" align="center" prop="planName"/>
<el-table-column label="巡检计划名称" align="center" prop="planName"/>
<el-table-column label="计划时间" align="center" prop="startTime" width="280">
......@@ -103,8 +102,8 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
:page.sync="pageNum"
:limit.sync="pageSize"
@pagination="getList"
/>
......@@ -216,6 +215,8 @@
showSearch: true,
// 总条数
total: 0,
pageNum: 1,
pageSize: 10,
// 巡检计划表格数据
inspectionPlanList: [],
// 计划状态字典
......@@ -241,8 +242,6 @@
open2: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
planName: null,
orderId: null,
startTime: null,
......@@ -349,7 +348,7 @@
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
......
......@@ -72,7 +72,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="infoList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" align="center" />
<el-table-column label="企业名称" align="center" prop="unitName" />
......@@ -113,8 +113,8 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
:page.sync="pageNum"
:limit.sync="pageSize"
@pagination="getList"
/>
......@@ -194,6 +194,8 @@ export default {
showSearch: true,
// 总条数
total: 0,
pageNum: 1,
pageSize: 10,
// 企业基本信息表格数据
infoList: [],
// 弹出层标题
......@@ -203,8 +205,6 @@ export default {
fileList: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
unitName: null,
orgCode: null,
orgFilePath: null,
......@@ -296,7 +296,7 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
......
......@@ -39,7 +39,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="hiddenTroubleList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="hiddenTroubleList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
<el-table-column label="隐患名称" align="center" prop="troubleName" />
<el-table-column label="隐患类型" align="center" prop="troubleType" >
<template slot-scope="scope">
......@@ -112,8 +112,8 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
:page.sync="pageNum"
:limit.sync="pageSize"
@pagination="getList"
/>
......@@ -291,6 +291,8 @@ export default {
showSearch: true,
// 总条数
total: 0,
pageNum: 1,
pageSize: 10,
// 隐患信息表格数据
hiddenTroubleList: [],
// 隐患类型字典
......@@ -324,8 +326,6 @@ export default {
open2: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
troubleName: null,
troubleType: null,
deviceId: null,
......@@ -488,7 +488,7 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
......
......@@ -57,7 +57,7 @@
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="basicsInfoList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="basicsInfoList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
<el-table-column label="工单编号" align="center" prop="orderId" />
<el-table-column label="工单类型" align="center" prop="orderType" >
<template slot-scope="scope">
......@@ -118,8 +118,8 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
:page.sync="pageNum"
:limit.sync="pageSize"
@pagination="getList"
/>
......@@ -194,6 +194,8 @@ export default {
showSearch: true,
// 总条数
total: 0,
pageNum: 1,
pageSize: 10,
// 工单基础信息表格数据
basicsInfoList: [],
// 弹出层标题
......@@ -210,8 +212,6 @@ export default {
ordertypeOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
orderId: null,
orderType: null,
orderName: null,
......@@ -280,7 +280,7 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
......
......@@ -57,7 +57,7 @@
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="basicsInfoList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="basicsInfoList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
<el-table-column label="工单编号" align="center" prop="orderId" />
<el-table-column label="工单类型" align="center" prop="orderType" >
<template slot-scope="scope">
......@@ -116,8 +116,8 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
:page.sync="pageNum"
:limit.sync="pageSize"
@pagination="getList"
/>
......@@ -207,6 +207,8 @@
showSearch: true,
// 总条数
total: 0,
pageNum: 1,
pageSize: 10,
// 工单基础信息表格数据
basicsInfoList: [],
// 弹出层标题
......@@ -226,8 +228,6 @@
fileIndex: 0,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
orderId: null,
orderType: null,
orderName: null,
......@@ -305,7 +305,7 @@
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment