Skip to content

G
gassafety
Commit ce600de5 authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

分页问题修改 gengdidi

parent beb3e59d
Hide whitespace changes
Inline Side-by-side
Showing with 407 additions and 172 deletions
gassafety-admin/src/main/java/com/zehong/web/controller/dataMonitoring/TDeviceAlarmController.java
View file @ ce600de5
......@@ -2,6 +2,7 @@ package com.zehong.web.controller.dataMonitoring;
import java.util.List;
import com.github.pagehelper.PageInfo;
import com.zehong.system.domain.form.DeviceAlarmForm;
import com.zehong.system.domain.vo.DeviceAlarmVo;
import org.springframework.security.access.prepost.PreAuthorize;
......@@ -44,14 +45,14 @@ public class TDeviceAlarmController extends BaseController
public TableDataInfo list(DeviceAlarmForm deviceAlarmForm) throws Exception
{
startPage();
List<DeviceAlarmVo> list = null;
PageInfo<DeviceAlarmVo> page = null;
try {
list = tDeviceAlarmService.selectTDeviceAlarmList(deviceAlarmForm);
page = tDeviceAlarmService.selectTDeviceAlarmPage(deviceAlarmForm);
} catch (Exception e) {
e.printStackTrace();
throw new Exception("查询报警信息列表出错");
}
return getDataTable(list);
return getDataTable(page);
}
/**
......
gassafety-admin/src/main/java/com/zehong/web/controller/dataMonitoring/TDeviceReportDataController.java
View file @ ce600de5
......@@ -2,6 +2,7 @@ package com.zehong.web.controller.dataMonitoring;
import java.util.List;
import com.github.pagehelper.PageInfo;
import com.zehong.system.domain.form.DeviceReportDataForm;
import com.zehong.system.domain.vo.DeviceReportDataVo;
import org.springframework.security.access.prepost.PreAuthorize;
......@@ -44,8 +45,8 @@ public class TDeviceReportDataController extends BaseController
public TableDataInfo list(DeviceReportDataForm deviceReportDataForm)
{
startPage();
List<DeviceReportDataVo> list = tDeviceReportDataService.selectTDeviceReportDataList(deviceReportDataForm);
return getDataTable(list);
PageInfo<DeviceReportDataVo> page = tDeviceReportDataService.selectTDeviceReportDataPage(deviceReportDataForm);
return getDataTable(page);
}
/**
......@@ -56,8 +57,8 @@ public class TDeviceReportDataController extends BaseController
public TableDataInfo realtimeList(DeviceReportDataForm deviceReportDataForm)
{
startPage();
List<DeviceReportDataVo> list = tDeviceReportDataService.selectRealtimeDataList(deviceReportDataForm);
return getDataTable(list);
PageInfo<DeviceReportDataVo> page = tDeviceReportDataService.selectRealtimeDataPage(deviceReportDataForm);
return getDataTable(page);
}
/**
......
gassafety-admin/src/main/java/com/zehong/web/controller/device/TDeviceInfoController.java
View file @ ce600de5
package com.zehong.web.controller.device;
import com.github.pagehelper.PageInfo;
import com.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
......@@ -37,8 +38,8 @@ public class TDeviceInfoController extends BaseController
public TableDataInfo list(TDeviceInfo tDeviceInfo)
{
startPage();
List<DeviceInfoVo> list = tDeviceInfoService.selectTDeviceInfoList(tDeviceInfo);
return getDataTable(list);
PageInfo<DeviceInfoVo> page = tDeviceInfoService.selectTDeviceInfoPage(tDeviceInfo);
return getDataTable(page);
}
/**
......
gassafety-admin/src/main/java/com/zehong/web/controller/device/TMonitorDeviceController.java
View file @ ce600de5
......@@ -2,6 +2,7 @@ package com.zehong.web.controller.device;
import java.util.List;
import com.github.pagehelper.PageInfo;
import com.zehong.system.domain.form.RelationTMonitorDevice;
import com.zehong.system.domain.form.TMonitorDeviceFrom;
import com.zehong.system.service.ITDeviceInfoService;
......@@ -52,13 +53,13 @@ public class TMonitorDeviceController extends BaseController
public TableDataInfo list(TMonitorDevice tMonitorDevice)
{
startPage();
List<TMonitorDevice> list = tMonitorDeviceService.selectTMonitorDeviceList(tMonitorDevice);
for(TMonitorDevice device: list){
PageInfo<TMonitorDevice> page = tMonitorDeviceService.selectTMonitorDevicePage(tMonitorDevice);
for(TMonitorDevice device: page.getList()){
device.setDeviceName(itDeviceInfoService.selectTDeviceInfoById(device.getDeviceId().intValue()).getDeviceName());
device.setRelationDeviceName(itDeviceInfoService.selectTDeviceInfoById(device.getRelationDeviceId().intValue()).getDeviceName());
device.setRelationPipeName(tPipeService.selectTPipeById(device.getRelationPipeId().intValue()).getPipeName());
}
return getDataTable(list);
return getDataTable(page);
}
/**
......
gassafety-admin/src/main/java/com/zehong/web/controller/device/TPipeController.java
View file @ ce600de5
package com.zehong.web.controller.device;
import com.github.pagehelper.PageInfo;
import com.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
......@@ -36,8 +37,8 @@ public class TPipeController extends BaseController
public TableDataInfo list(TPipe tPipe)
{
startPage();
List<PipeVo> list = tPipeService.selectTPipeList(tPipe);
return getDataTable(list);
PageInfo<PipeVo> page = tPipeService.selectTPipePage(tPipe);
return getDataTable(page);
}
......
gassafety-admin/src/main/java/com/zehong/web/controller/deviceInspection/TInspectionPlanController.java
View file @ ce600de5
package com.zehong.web.controller.deviceInspection;
import java.util.List;
import com.zehong.system.domain.form.InspectionPlanForm;
import com.zehong.system.domain.vo.InspectionPlanVo;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.github.pagehelper.PageInfo;
import com.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.core.page.TableDataInfo;
import com.zehong.common.enums.BusinessType;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.system.domain.TInspectionPlan;
import com.zehong.system.domain.form.InspectionPlanForm;
import com.zehong.system.domain.vo.InspectionPlanVo;
import com.zehong.system.service.ITInspectionPlanService;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.common.core.page.TableDataInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 巡检计划Controller
......@@ -44,8 +38,8 @@ public class TInspectionPlanController extends BaseController
public TableDataInfo list(InspectionPlanForm inspectionPlanForm)
{
startPage();
List<TInspectionPlan> list = tInspectionPlanService.selectTInspectionPlanList(inspectionPlanForm);
return getDataTable(list);
PageInfo<TInspectionPlan> page = tInspectionPlanService.selectTInspectionPlanPage(inspectionPlanForm);
return getDataTable(page);
}
/**
......
gassafety-admin/src/main/java/com/zehong/web/controller/riskManagement/THiddenTroubleController.java
View file @ ce600de5
......@@ -2,6 +2,7 @@ package com.zehong.web.controller.riskManagement;
import java.util.List;
import com.github.pagehelper.PageInfo;
import com.zehong.system.domain.form.HiddenTroubleForm;
import com.zehong.system.domain.vo.HiddenTroubleVo;
import org.springframework.security.access.prepost.PreAuthorize;
......@@ -44,8 +45,8 @@ public class THiddenTroubleController extends BaseController
public TableDataInfo list(HiddenTroubleForm hiddenTroubleForm)
{
startPage();
List<HiddenTroubleVo> list = tHiddenTroubleService.selectTHiddenTroubleList(hiddenTroubleForm);
return getDataTable(list);
PageInfo<HiddenTroubleVo> page = tHiddenTroubleService.selectTHiddenTroublePage(hiddenTroubleForm);
return getDataTable(page);
}
/**
......
gassafety-admin/src/main/java/com/zehong/web/controller/workOrder/TWorkOrderController.java
View file @ ce600de5
package com.zehong.web.controller.workOrder;
import java.util.List;
import com.zehong.common.utils.DateUtils;
import com.zehong.common.utils.StringUtils;
import com.zehong.system.domain.form.TWorkOrderForm;
import com.zehong.system.domain.vo.WorkOrderVo;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.github.pagehelper.PageInfo;
import com.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.core.page.TableDataInfo;
import com.zehong.common.enums.BusinessType;
import com.zehong.common.utils.DateUtils;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.system.domain.TWorkOrder;
import com.zehong.system.domain.form.TWorkOrderForm;
import com.zehong.system.domain.vo.WorkOrderVo;
import com.zehong.system.service.ITWorkOrderService;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.common.core.page.TableDataInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 工单基础信息Controller
......@@ -46,14 +39,14 @@ public class TWorkOrderController extends BaseController
public TableDataInfo list(TWorkOrderForm tWorkOrderForm) throws Exception
{
startPage();
List<WorkOrderVo> list = null;
PageInfo<WorkOrderVo> page = null;
try {
list = tWorkOrderService.selectTWorkOrderList(tWorkOrderForm);
page = tWorkOrderService.selectTWorkOrderPage(tWorkOrderForm);
} catch (Exception e) {
e.printStackTrace();
throw new Exception("查询工单基础信息列表失败");
}
return getDataTable(list);
return getDataTable(page);
}
/**
......
gassafety-system/src/main/java/com/zehong/system/service/ITDeviceAlarmService.java
View file @ ce600de5
package com.zehong.system.service;
import java.util.List;
import com.github.pagehelper.PageInfo;
import com.zehong.system.domain.TDeviceAlarm;
import com.zehong.system.domain.form.DeviceAlarmForm;
import com.zehong.system.domain.vo.DeviceAlarmVo;
......@@ -27,7 +29,7 @@ public interface ITDeviceAlarmService
* @param deviceAlarmForm 报警信息
* @return 报警信息集合
*/
public List<DeviceAlarmVo> selectTDeviceAlarmList(DeviceAlarmForm deviceAlarmForm) throws Exception;
public PageInfo<DeviceAlarmVo> selectTDeviceAlarmPage(DeviceAlarmForm deviceAlarmForm) throws Exception;
/**
* 新增报警信息
......
gassafety-system/src/main/java/com/zehong/system/service/ITDeviceInfoService.java
View file @ ce600de5
......@@ -3,6 +3,7 @@ package com.zehong.system.service;
import java.util.List;
import java.util.Map;
import com.github.pagehelper.PageInfo;
import com.zehong.system.domain.TDeviceInfo;
import com.zehong.system.domain.vo.DeviceInfoVo;
......@@ -30,6 +31,14 @@ public interface ITDeviceInfoService
*/
public List<DeviceInfoVo> selectTDeviceInfoList(TDeviceInfo tDeviceInfo);
/**
* 查询设备信息列表
*
* @param tDeviceInfo 设备信息
* @return 设备信息集合
*/
public PageInfo<DeviceInfoVo> selectTDeviceInfoPage(TDeviceInfo tDeviceInfo);
/**
* 构建前端所需要下拉树结构
*
......
gassafety-system/src/main/java/com/zehong/system/service/ITDeviceReportDataService.java
View file @ ce600de5
package com.zehong.system.service;
import java.util.List;
import com.github.pagehelper.PageInfo;
import com.zehong.system.domain.TDeviceReportData;
import com.zehong.system.domain.form.DeviceReportDataForm;
import com.zehong.system.domain.vo.DeviceReportDataVo;
......@@ -29,6 +31,14 @@ public interface ITDeviceReportDataService
*/
public List<DeviceReportDataVo> selectTDeviceReportDataList(DeviceReportDataForm deviceReportDataForm);
/**
* 查询设备监控列表
*
* @param deviceReportDataForm 设备监控
* @return 设备监控集合
*/
public PageInfo<DeviceReportDataVo> selectTDeviceReportDataPage(DeviceReportDataForm deviceReportDataForm);
/**
* 查询设备监控实时数据
*
......@@ -37,6 +47,14 @@ public interface ITDeviceReportDataService
*/
public List<DeviceReportDataVo> selectRealtimeDataList(DeviceReportDataForm deviceReportDataForm);
/**
* 查询设备监控实时数据
*
* @param deviceReportDataForm 设备监控
* @return 设备监控
*/
public PageInfo<DeviceReportDataVo> selectRealtimeDataPage(DeviceReportDataForm deviceReportDataForm);
/**
* 新增设备监控
*
......
gassafety-system/src/main/java/com/zehong/system/service/ITHiddenTroubleService.java
View file @ ce600de5
package com.zehong.system.service;
import java.util.List;
import com.github.pagehelper.PageInfo;
import com.zehong.system.domain.THiddenTrouble;
import com.zehong.system.domain.form.HiddenTroubleForm;
import com.zehong.system.domain.vo.HiddenTroubleVo;
......@@ -29,6 +31,15 @@ public interface ITHiddenTroubleService
*/
public List<HiddenTroubleVo> selectTHiddenTroubleList(HiddenTroubleForm hiddenTroubleForm);
/**
* 查询隐患信息列表
*
* @param hiddenTroubleForm 隐患信息
* @return 隐患信息集合
*/
public PageInfo<HiddenTroubleVo> selectTHiddenTroublePage(HiddenTroubleForm hiddenTroubleForm);
/**
* 地图显示隐患信息列表
*
......
gassafety-system/src/main/java/com/zehong/system/service/ITInspectionPlanService.java
View file @ ce600de5
package com.zehong.system.service;
import java.util.List;
import com.github.pagehelper.PageInfo;
import com.zehong.system.domain.TInspectionPlan;
import com.zehong.system.domain.form.InspectionPlanForm;
import com.zehong.system.domain.vo.InspectionPlanVo;
......@@ -29,6 +31,14 @@ public interface ITInspectionPlanService
*/
public List<TInspectionPlan> selectTInspectionPlanList(InspectionPlanForm inspectionPlanForm);
/**
* 查询巡检计划列表
*
* @param inspectionPlanForm 巡检计划
* @return 巡检计划集合
*/
public PageInfo<TInspectionPlan> selectTInspectionPlanPage(InspectionPlanForm inspectionPlanForm);
/**
* 新增巡检计划
*
......
gassafety-system/src/main/java/com/zehong/system/service/ITMonitorDeviceService.java
View file @ ce600de5
package com.zehong.system.service;
import java.util.List;
import com.github.pagehelper.PageInfo;
import com.zehong.system.domain.TMonitorDevice;
/**
......@@ -27,6 +29,15 @@ public interface ITMonitorDeviceService
*/
public List<TMonitorDevice> selectTMonitorDeviceList(TMonitorDevice tMonitorDevice);
/**
* 查询设备监控列表
*
* @param tMonitorDevice 设备监控
* @return 设备监控集合
*/
public PageInfo<TMonitorDevice> selectTMonitorDevicePage(TMonitorDevice tMonitorDevice);
/**
* 新增设备监控
*
......
gassafety-system/src/main/java/com/zehong/system/service/ITPipeService.java
View file @ ce600de5
package com.zehong.system.service;
import java.util.List;
import com.github.pagehelper.PageInfo;
import com.zehong.system.domain.TPipe;
import com.zehong.system.domain.vo.PipeVo;
......@@ -28,6 +30,14 @@ public interface ITPipeService
*/
public List<PipeVo> selectTPipeList(TPipe tPipe);
/**
* 查询管道信息列表
*
* @param tPipe 管道信息
* @return 管道信息集合
*/
public PageInfo<PipeVo> selectTPipePage(TPipe tPipe);
/**
* 统计管道总长度
* @param
......
gassafety-system/src/main/java/com/zehong/system/service/ITWorkOrderService.java
View file @ ce600de5
package com.zehong.system.service;
import java.util.List;
import com.github.pagehelper.PageInfo;
import com.zehong.system.domain.TWorkOrder;
import com.zehong.system.domain.form.TWorkOrderForm;
import com.zehong.system.domain.vo.WorkOrderVo;
......@@ -30,6 +32,14 @@ public interface ITWorkOrderService
*/
public List<WorkOrderVo> selectTWorkOrderList(TWorkOrderForm tWorkOrderForm) throws Exception;
/**
* 查询工单基础信息列表
*
* @param tWorkOrderForm 工单基础信息表单
* @return 工单基础信息集合
*/
public PageInfo<WorkOrderVo> selectTWorkOrderPage(TWorkOrderForm tWorkOrderForm) throws Exception;
/**
* 新增工单基础信息
*
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TDeviceAlarmServiceImpl.java
View file @ ce600de5
package com.zehong.system.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.github.pagehelper.PageInfo;
import com.zehong.common.core.domain.entity.SysDictData;
import com.zehong.common.utils.DateUtils;
import com.zehong.common.utils.PageInfoUtil;
import com.zehong.common.utils.StringUtils;
import com.zehong.system.domain.TDeviceAlarm;
import com.zehong.system.domain.TDeviceInfo;
import com.zehong.system.domain.TDeviceReportData;
import com.zehong.system.domain.TPipe;
import com.zehong.system.domain.form.DeviceAlarmForm;
import com.zehong.system.domain.vo.DeviceAlarmVo;
import com.zehong.system.mapper.TDeviceAlarmMapper;
import com.zehong.system.mapper.TDeviceInfoMapper;
import com.zehong.system.mapper.TDeviceReportDataMapper;
import com.zehong.system.mapper.TPipeMapper;
import com.zehong.system.service.ISysDictTypeService;
import com.zehong.system.service.ITDeviceAlarmService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TDeviceAlarmMapper;
import com.zehong.system.domain.TDeviceAlarm;
import com.zehong.system.service.ITDeviceAlarmService;
import java.util.ArrayList;
import java.util.List;
/**
* 报警信息Service业务层处理
......@@ -116,31 +118,23 @@ public class TDeviceAlarmServiceImpl implements ITDeviceAlarmService
* @return 报警信息
*/
@Override
public List<DeviceAlarmVo> selectTDeviceAlarmList(DeviceAlarmForm deviceAlarmForm) throws Exception
public PageInfo<DeviceAlarmVo> selectTDeviceAlarmPage(DeviceAlarmForm deviceAlarmForm) throws Exception
{
List<DeviceAlarmVo> list = new ArrayList<>();
List<TDeviceAlarm> deviceAlarmList = new ArrayList<>();
PageInfo<TDeviceAlarm> deviceAlarmList = new PageInfo<>();
if(deviceAlarmForm.getDeviceCode() != null){
List<TDeviceAlarm> pipeList = tDeviceAlarmMapper.selectTDeviceAlarmByPipeCode(deviceAlarmForm);
List<TDeviceAlarm> deviceList = tDeviceAlarmMapper.selectTDeviceAlarmByDeviceCode(deviceAlarmForm);
if(pipeList.size() != 0){
deviceAlarmList.addAll(pipeList);
}
if(deviceList.size() != 0){
deviceAlarmList.addAll(deviceList);
}
setDeviceInfo(deviceAlarmList,pipeList);
setDeviceInfo(deviceAlarmList,deviceList);
} else {
deviceAlarmList = tDeviceAlarmMapper.selectTDeviceAlarmList(deviceAlarmForm);
deviceAlarmList = new PageInfo(tDeviceAlarmMapper.selectTDeviceAlarmList(deviceAlarmForm));
}
if(deviceAlarmList.size() != 0) {
for (TDeviceAlarm alarm : deviceAlarmList) {
DeviceAlarmVo deviceAlarmVo = new DeviceAlarmVo();
BeanUtils.copyProperties(alarm, deviceAlarmVo);
if ("0".equals(alarm.getDeviceType())) {
TPipe pipe = tPipeMapper.selectTPipeById(alarm.getDeviceId());
PageInfo<DeviceAlarmVo> pageVo = PageInfoUtil.pageInfo2PageInfoDTO(deviceAlarmList,DeviceAlarmVo.class);
if(pageVo.getList().size() != 0) {
for (DeviceAlarmVo deviceAlarmVo : pageVo.getList()) {
if ("0".equals(deviceAlarmVo.getDeviceType())) {
TPipe pipe = tPipeMapper.selectTPipeById(deviceAlarmVo.getDeviceId());
if (pipe != null) {
deviceAlarmVo.setDeviceCode(pipe.getPipeCode());
deviceAlarmVo.setDeviceName(pipe.getPipeName());
......@@ -150,7 +144,7 @@ public class TDeviceAlarmServiceImpl implements ITDeviceAlarmService
deviceAlarmVo.setPipeList(pipeList);
}
} else {
TDeviceInfo deviceInfo = tDeviceInfoMapper.selectTDeviceInfoById(alarm.getDeviceId());
TDeviceInfo deviceInfo = tDeviceInfoMapper.selectTDeviceInfoById(deviceAlarmVo.getDeviceId());
if (deviceInfo != null) {
deviceAlarmVo.setDeviceCode(deviceInfo.getDeviceCode());
deviceAlarmVo.setDeviceName(deviceInfo.getDeviceName());
......@@ -161,29 +155,39 @@ public class TDeviceAlarmServiceImpl implements ITDeviceAlarmService
}
}
if (StringUtils.isNotEmpty(alarm.getAlarmType())) {
if (StringUtils.isNotEmpty(deviceAlarmVo.getAlarmType())) {
List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("t_alarm_type");
for (SysDictData sysDictData : sysDictDataList) {
if (alarm.getAlarmType().equals(sysDictData.getDictValue())) {
if (deviceAlarmVo.getAlarmType().equals(sysDictData.getDictValue())) {
deviceAlarmVo.setAlarmType(sysDictData.getDictLabel());
}
}
}
if (StringUtils.isNotEmpty(alarm.getDeviceType())) {
if (StringUtils.isNotEmpty(deviceAlarmVo.getDeviceType())) {
List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("t_trouble_device_type");
for (SysDictData sysDictData : sysDictDataList) {
if (alarm.getDeviceType().equals(sysDictData.getDictValue())) {
if (deviceAlarmVo.getDeviceType().equals(sysDictData.getDictValue())) {
deviceAlarmVo.setDeviceType(sysDictData.getDictLabel());
}
}
}
list.add(deviceAlarmVo);
}
}
return list;
return pageVo;
}
private void setDeviceInfo(PageInfo<TDeviceAlarm> deviceAlarmList,List<TDeviceAlarm> list){
if(list.size() != 0){
if(null != deviceAlarmList.getList() && !deviceAlarmList.getList().isEmpty()){
deviceAlarmList.getList().addAll(list);
deviceAlarmList.setTotal(deviceAlarmList.getTotal() + list.size());
}else{
deviceAlarmList.setList(list);
deviceAlarmList.setTotal(list.size());
}
}
}
/**
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TDeviceInfoServiceImpl.java
View file @ ce600de5
package com.zehong.system.service.impl;
import com.github.pagehelper.PageInfo;
import com.zehong.common.utils.PageInfoUtil;
import com.zehong.system.domain.TDeviceInfo;
import com.zehong.system.domain.TPipe;
import com.zehong.system.domain.vo.DeviceInfoVo;
......@@ -76,6 +78,29 @@ public class TDeviceInfoServiceImpl implements ITDeviceInfoService
return list;
}
/**
* 查询设备信息列表
*
* @param tDeviceInfo 设备信息
* @return 设备信息
*/
@Override
public PageInfo<DeviceInfoVo> selectTDeviceInfoPage(TDeviceInfo tDeviceInfo)
{
List<TDeviceInfo> deviceInfoList = tDeviceInfoMapper.selectTDeviceInfoList(tDeviceInfo);
PageInfo<DeviceInfoVo> pageVo = PageInfoUtil.pageInfo2PageInfoDTO(new PageInfo(deviceInfoList),DeviceInfoVo.class);
if(pageVo.getList().size() != 0){
for(DeviceInfoVo device : pageVo.getList()){
TPipe pipe = tPipeMapper.selectTPipeById(device.getPipeId());
device.setPipeName(pipe.getPipeName());
}
}
return pageVo;
}
/**
* 构建前端所需要下拉树结构
*
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TDeviceReportDataServiceImpl.java
View file @ ce600de5
package com.zehong.system.service.impl;
import java.util.List;
import com.github.pagehelper.PageInfo;
import com.zehong.common.utils.DateUtils;
import com.zehong.system.domain.TDeviceInfo;
import com.zehong.system.domain.form.DeviceReportDataForm;
......@@ -70,6 +72,16 @@ public class TDeviceReportDataServiceImpl implements ITDeviceReportDataService
return tDeviceReportDataMapper.selectTDeviceReportDataList(deviceReportDataForm);
}
/**
* 查询设备监控列表
*
* @param deviceReportDataForm 设备监控
* @return 设备监控集合
*/
public PageInfo<DeviceReportDataVo> selectTDeviceReportDataPage(DeviceReportDataForm deviceReportDataForm){
return new PageInfo(tDeviceReportDataMapper.selectTDeviceReportDataList(deviceReportDataForm));
}
/**
* 查询设备监控实时数据
*
......@@ -82,6 +94,18 @@ public class TDeviceReportDataServiceImpl implements ITDeviceReportDataService
return tDeviceReportDataMapper.selectRealtimeDataList(deviceReportDataForm);
}
/**
* 查询设备监控实时数据
*
* @param deviceReportDataForm 设备监控
* @return 设备监控
*/
@Override
public PageInfo<DeviceReportDataVo> selectRealtimeDataPage(DeviceReportDataForm deviceReportDataForm)
{
return new PageInfo(tDeviceReportDataMapper.selectRealtimeDataList(deviceReportDataForm));
}
/**
* 新增设备监控
*
......
gassafety-system/src/main/java/com/zehong/system/service/impl/THiddenTroubleServiceImpl.java
View file @ ce600de5
package com.zehong.system.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.github.pagehelper.PageInfo;
import com.zehong.common.core.domain.entity.SysDictData;
import com.zehong.common.core.domain.entity.SysUser;
import com.zehong.common.utils.DateUtils;
import com.zehong.common.utils.PageInfoUtil;
import com.zehong.common.utils.StringUtils;
import com.zehong.system.domain.*;
import com.zehong.system.domain.form.HiddenTroubleForm;
import com.zehong.system.domain.vo.HiddenTroubleVo;
import com.zehong.system.mapper.*;
import com.zehong.system.service.ISysDictTypeService;
import com.zehong.system.service.ITHiddenTroubleService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.service.ITHiddenTroubleService;
import java.util.ArrayList;
import java.util.List;
/**
* 隐患信息Service业务层处理
......@@ -111,6 +113,30 @@ public class THiddenTroubleServiceImpl implements ITHiddenTroubleService
return list;
}
/**
* 查询隐患信息列表
*
* @param hiddenTroubleForm 隐患信息
* @return 隐患信息
*/
@Override
public PageInfo<HiddenTroubleVo> selectTHiddenTroublePage(HiddenTroubleForm hiddenTroubleForm)
{
List<THiddenTrouble> tHiddenTroubleList = tHiddenTroubleMapper.selectTHiddenTroubleList(hiddenTroubleForm);
PageInfo<HiddenTroubleVo> pageVo = PageInfoUtil.pageInfo2PageInfoDTO(new PageInfo<>(tHiddenTroubleList),HiddenTroubleVo.class);
if(pageVo.getList().size() != 0) {
for (HiddenTroubleVo hiddenTroubleVo : pageVo.getList()) {
SysUser sysUser = sysUserMapper.selectUserById(hiddenTroubleVo.getReportMan());
if(sysUser != null) {
hiddenTroubleVo.setReportManName(sysUser.getNickName());
}
}
}
return pageVo;
}
/**
* 地图显示隐患信息列表
*
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TInspectionPlanServiceImpl.java
View file @ ce600de5
package com.zehong.system.service.impl;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.github.pagehelper.PageInfo;
import com.zehong.common.core.domain.entity.SysDictData;
import com.zehong.common.core.domain.entity.SysUser;
import com.zehong.common.utils.DateUtils;
......@@ -15,10 +11,15 @@ import com.zehong.system.domain.vo.InspectionDataVo;
import com.zehong.system.domain.vo.InspectionPlanVo;
import com.zehong.system.mapper.*;
import com.zehong.system.service.ISysDictTypeService;
import com.zehong.system.service.ITInspectionPlanService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.service.ITInspectionPlanService;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* 巡检计划Service业务层处理
......@@ -131,6 +132,18 @@ public class TInspectionPlanServiceImpl implements ITInspectionPlanService
return tInspectionPlanMapper.selectTInspectionPlanList(inspectionPlanForm);
}
/**
* 查询巡检计划列表
*
* @param inspectionPlanForm 巡检计划
* @return 巡检计划
*/
@Override
public PageInfo<TInspectionPlan> selectTInspectionPlanPage(InspectionPlanForm inspectionPlanForm)
{
return new PageInfo(tInspectionPlanMapper.selectTInspectionPlanList(inspectionPlanForm));
}
/**
* 新增巡检计划
*
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TMonitorDeviceServiceImpl.java
View file @ ce600de5
package com.zehong.system.service.impl;
import java.util.List;
import com.github.pagehelper.PageInfo;
import com.zehong.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -44,6 +46,18 @@ public class TMonitorDeviceServiceImpl implements ITMonitorDeviceService
return tMonitorDeviceMapper.selectTMonitorDeviceList(tMonitorDevice);
}
/**
* 查询设备监控列表
*
* @param tMonitorDevice 设备监控
* @return 设备监控
*/
@Override
public PageInfo<TMonitorDevice> selectTMonitorDevicePage(TMonitorDevice tMonitorDevice)
{
return new PageInfo(tMonitorDeviceMapper.selectTMonitorDeviceList(tMonitorDevice));
}
/**
* 新增设备监控
*
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TPipeServiceImpl.java
View file @ ce600de5
package com.zehong.system.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.zehong.common.core.domain.entity.SysDictData;
import com.zehong.common.utils.StringUtils;
import com.github.pagehelper.PageInfo;
import com.zehong.common.utils.PageInfoUtil;
import com.zehong.system.domain.TDeviceInfo;
import com.zehong.system.domain.TPipe;
import com.zehong.system.domain.vo.PipeVo;
import com.zehong.system.mapper.TDeviceInfoMapper;
import com.zehong.system.service.ISysDictTypeService;
import com.zehong.system.mapper.TPipeMapper;
import com.zehong.system.service.ITPipeService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TPipeMapper;
import com.zehong.system.domain.TPipe;
import com.zehong.system.service.ITPipeService;
import java.util.ArrayList;
import java.util.List;
/**
* 管道信息Service业务层处理
......@@ -79,6 +78,29 @@ public class TPipeServiceImpl implements ITPipeService
return list;
}
/**
* 查询管道信息列表
*
* @param tPipe 管道信息
* @return 管道信息
*/
@Override
public PageInfo<PipeVo> selectTPipePage(TPipe tPipe)
{
List<PipeVo> list = new ArrayList<>();
List<TPipe> tPipeList = tPipeMapper.selectTPipeList(tPipe);
PageInfo<PipeVo> pageVo = PageInfoUtil.pageInfo2PageInfoDTO(new PageInfo(tPipeList),PipeVo.class);
if(pageVo.getList().size() != 0){
for(PipeVo pipe : pageVo.getList()){
List<TDeviceInfo> deviceInfoList = tDeviceInfoMapper.selectTDeviceInfoByPipeId(pipe.getPipeId());
if(deviceInfoList.size() != 0) {
pipe.setDeviceInfoList(deviceInfoList);
}
}
}
return pageVo;
}
/**
* 统计管道总长度
* @return
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TWorkOrderServiceImpl.java
View file @ ce600de5
package com.zehong.system.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.github.pagehelper.PageInfo;
import com.zehong.common.core.domain.entity.SysUser;
import com.zehong.common.utils.DateUtils;
import com.zehong.common.utils.PageInfoUtil;
import com.zehong.system.domain.*;
import com.zehong.system.domain.form.TWorkOrderForm;
import com.zehong.system.domain.vo.InspectionPlanVo;
import com.zehong.system.domain.vo.OrderFeedbackVo;
import com.zehong.system.domain.vo.WorkOrderVo;
import com.zehong.system.mapper.*;
import com.zehong.system.service.ITWorkOrderService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.service.ITWorkOrderService;
import java.util.ArrayList;
import java.util.List;
/**
* 工单基础信息Service业务层处理
......@@ -219,6 +220,37 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
return workOrderVoList;
}
/**
* 查询工单基础信息列表
*
* @param tWorkOrderForm 工单基础信息
* @return 工单基础信息
*/
@Override
public PageInfo<WorkOrderVo> selectTWorkOrderPage(TWorkOrderForm tWorkOrderForm) throws Exception
{
List<TWorkOrder> workOrderList = tWorkOrderMapper.selectTWorkOrderList(tWorkOrderForm);
PageInfo<WorkOrderVo> pageVo = PageInfoUtil.pageInfo2PageInfoDTO(new PageInfo<>(workOrderList),WorkOrderVo.class);
if(pageVo.getList().size() != 0){
for(WorkOrderVo workOrder : pageVo.getList()){
// 获取巡检员姓名
SysUser appointInspector = sysUserMapper.selectUserById(workOrder.getAppointInspector());
workOrder.setAppointInspectorName(appointInspector.getNickName());
if(workOrder.getActualInspector() != workOrder.getAppointInspector() && workOrder.getActualInspector() != null){
SysUser actualInspector = sysUserMapper.selectUserById(workOrder.getActualInspector());
workOrder.setActualInspectorName(actualInspector.getNickName());
} else {
workOrder.setActualInspectorName(appointInspector.getNickName());
}
}
}
return pageVo;
}
/**
* 新增工单基础信息
*
......
gassafety-web/src/views/dataMonitoring/deviceAlarm/index.vue
View file @ ce600de5
......@@ -71,7 +71,7 @@
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="deviceAlarmList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange" >
<el-table v-loading="loading" :data="deviceAlarmList" @selection-change="handleSelectionChange" >
<el-table-column label="设备名称" align="center" prop="deviceName" width="280px"/>
<el-table-column label="设备编号" align="center" prop="deviceCode" width="240px"/>
<el-table-column label="设备类型" align="center" prop="deviceType"/>
......@@ -120,8 +120,8 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="pageNum"
:limit.sync="pageSize"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 添加工单信息对话框 -->
......@@ -187,8 +187,6 @@ export default {
showSearch: true,
// 总条数
total: 0,
pageNum: 1,
pageSize: 10,
// 报警信息表格数据
deviceAlarmList: [],
// 报警类型字典
......@@ -212,6 +210,8 @@ export default {
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
deviceCode: null,
orderId: null,
alarmType: null,
......@@ -292,7 +292,7 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
this.pageNum = 1;
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
......
gassafety-web/src/views/dataMonitoring/realtimeData/index.vue
View file @ ce600de5
......@@ -26,7 +26,7 @@
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="dataList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="dataList" @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" />
......@@ -62,8 +62,8 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="pageNum"
:limit.sync="pageSize"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
......@@ -93,8 +93,6 @@ export default {
showSearch: true,
// 总条数
total: 0,
pageNum: 1,
pageSize: 10,
// 设备监控表格数据
dataList: [],
// 处理状态字典
......@@ -108,6 +106,8 @@ export default {
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
deviceNum: null,
standardConditionAccumulation: null,
workingConditionAccumulation: null,
......@@ -134,6 +134,7 @@ export default {
/** 查询设备监控列表 */
getList() {
this.loading = true;
console.log();
realtimeData(this.queryParams).then(response => {
this.dataList = response.rows;
this.total = response.total;
......@@ -167,7 +168,7 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
this.pageNum = 1;
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
......
gassafety-web/src/views/dataMonitoring/reportData/index.vue
View file @ ce600de5
......@@ -47,7 +47,7 @@
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="dataList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="dataList" @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" >
......@@ -71,8 +71,8 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="pageNum"
:limit.sync="pageSize"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
......@@ -102,8 +102,6 @@ export default {
showSearch: true,
// 总条数
total: 0,
pageNum: 1,
pageSize: 10,
// 设备监控表格数据
dataList: [],
// 处理状态字典
......@@ -117,6 +115,8 @@ export default {
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
deviceNum: null,
standardConditionAccumulation: null,
workingConditionAccumulation: null,
......@@ -178,7 +178,7 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
this.pageNum = 1;
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
......
gassafety-web/src/views/device/deviceInfo/index.vue
View file @ ce600de5
......@@ -82,7 +82,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="deviceInfoList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="deviceInfoList" @selection-change="handleSelectionChange">
<el-table-column label="设备名称" align="center" prop="deviceName" width="240px"/>
<el-table-column label="所属管道" align="center" prop="pipeName" width="240px"/>
<el-table-column label="设备编号" align="center" prop="deviceCode" width="240px"/>
......@@ -133,8 +133,8 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="pageNum"
:limit.sync="pageSize"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
......@@ -314,8 +314,6 @@
showSearch: true,
// 总条数
total: 0,
pageNum: 1,
pageSize: 10,
// 设备信息表格数据
deviceInfoList: [],
// 弹出层标题
......@@ -333,6 +331,8 @@
typeOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
enterpriseId: null,
deviceName: null,
deviceCode: null,
......@@ -459,7 +459,7 @@
},
/** 搜索按钮操作 */
handleQuery() {
this.pageNum = 1;
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
......
gassafety-web/src/views/device/devicemonitor/index.vue
View file @ ce600de5
......@@ -118,7 +118,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="deviceList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="deviceList" @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="pageNum"
:limit.sync="pageSize"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
......@@ -295,8 +295,6 @@ export default {
showSearch: true,
// 总条数
total: 0,
pageNum: 1,
pageSize: 10,
// 设备监控表格数据
deviceList: [],
// 弹出层标题
......@@ -305,6 +303,8 @@ export default {
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
deviceId: null,
deviceThreshold: null,
relationPipeId: null,
......@@ -362,7 +362,7 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
this.pageNum = 1;
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
......
gassafety-web/src/views/device/pipe/index.vue
View file @ ce600de5
......@@ -82,7 +82,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="pipeList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="pipeList" @selection-change="handleSelectionChange">
<el-table-column label="管道名称" align="center" prop="pipeName" width="280px"/>
<el-table-column label="管道编号" align="center" prop="pipeCode" width="240px"/>
<el-table-column label="管道类型" align="center" prop="pipeType" >
......@@ -138,8 +138,8 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="pageNum"
:limit.sync="pageSize"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
......@@ -274,8 +274,6 @@
showSearch: true,
// 总条数
total: 0,
pageNum: 1,
pageSize: 10,
// 管道信息表格数据
pipeList: [],
// 弹出层标题
......@@ -294,6 +292,8 @@
pressureOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
enterpriseId: null,
pipeName: null,
pipeAddr: null,
......@@ -410,7 +410,7 @@
},
/** 搜索按钮操作 */
handleQuery() {
this.pageNum = 1;
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
......
gassafety-web/src/views/deviceInspection/inspectionPlan/index.vue
View file @ ce600de5
......@@ -41,7 +41,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="inspectionPlanList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="inspectionPlanList" @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">
......@@ -108,8 +108,8 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="pageNum"
:limit.sync="pageSize"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
......@@ -234,8 +234,6 @@
showSearch: true,
// 总条数
total: 0,
pageNum: 1,
pageSize: 10,
// 巡检计划表格数据
inspectionPlanList: [],
// 计划状态字典
......@@ -261,6 +259,8 @@
open2: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
planName: null,
orderId: null,
startTime: null,
......@@ -373,7 +373,7 @@
},
/** 搜索按钮操作 */
handleQuery() {
this.pageNum = 1;
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
......
gassafety-web/src/views/riskManagement/hiddenTrouble/index.vue
View file @ ce600de5
......@@ -67,7 +67,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="hiddenTroubleList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="hiddenTroubleList" @selection-change="handleSelectionChange">
<el-table-column label="隐患名称" align="center" prop="troubleName" width="400px"/>
<el-table-column label="隐患类型" align="center" prop="troubleType" >
<template slot-scope="scope">
......@@ -142,8 +142,8 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="pageNum"
:limit.sync="pageSize"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
......@@ -325,8 +325,6 @@ export default {
showSearch: true,
// 总条数
total: 0,
pageNum: 1,
pageSize: 10,
// 隐患信息表格数据
hiddenTroubleList: [],
// 隐患类型字典
......@@ -368,6 +366,8 @@ export default {
open2: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
troubleName: null,
troubleType: null,
deviceId: null,
......@@ -532,7 +532,7 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
this.pageNum = 1;
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
......
gassafety-web/src/views/workOrder/basicsInfo/index.vue
View file @ ce600de5
......@@ -57,7 +57,7 @@
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="basicsInfoList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="basicsInfoList" @selection-change="handleSelectionChange">
<el-table-column label="工单编号" align="center" prop="orderId" />
<el-table-column label="工单名称" align="center" prop="orderName" width="350px"/>
<el-table-column label="工单类型" align="center" prop="orderType" >
......@@ -118,8 +118,8 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="pageNum"
:limit.sync="pageSize"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
......@@ -194,8 +194,6 @@ export default {
showSearch: true,
// 总条数
total: 0,
pageNum: 1,
pageSize: 10,
// 工单基础信息表格数据
basicsInfoList: [],
// 弹出层标题
......@@ -212,6 +210,8 @@ export default {
ordertypeOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
orderId: null,
orderType: null,
orderName: null,
......@@ -286,7 +286,7 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
this.pageNum = 1;
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
......
gassafety-web/src/views/workOrder/feedback/index.vue
View file @ ce600de5
......@@ -57,7 +57,7 @@
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="basicsInfoList.slice((pageNum-1)*pageSize,pageNum*pageSize)" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="basicsInfoList" @selection-change="handleSelectionChange">
<el-table-column label="工单编号" align="center" prop="orderId" />
<el-table-column label="工单名称" align="center" prop="orderName" width="350px"/>
<el-table-column label="工单类型" align="center" prop="orderType" >
......@@ -117,8 +117,8 @@
<pagination
v-show="total>0"
:total="total"
:page.sync="pageNum"
:limit.sync="pageSize"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
......@@ -209,8 +209,6 @@
showSearch: true,
// 总条数
total: 0,
pageNum: 1,
pageSize: 10,
// 工单基础信息表格数据
basicsInfoList: [],
// 弹出层标题
......@@ -230,6 +228,8 @@
fileIndex: 0,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
orderId: null,
orderType: null,
orderName: null,
......@@ -312,7 +312,7 @@
},
/** 搜索按钮操作 */
handleQuery() {
this.pageNum = 1;
this.queryParams.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