diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseTransferInfoController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseTransferInfoController.java index 789162f..4012bd2 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseTransferInfoController.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseTransferInfoController.java @@ -48,6 +48,7 @@ public class DmsBaseTransferInfoController extends BaseController @GetMapping("/list") public TableDataInfo list(DmsBaseTransferInfo dmsBaseTransferInfo) { + startPage(); List list = dmsBaseTransferInfoService.selectDmsBaseTransferInfoList(dmsBaseTransferInfo); return getDataTable(list); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseLubeStandardServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseLubeStandardServiceImpl.java index 64b6a3c..b708194 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseLubeStandardServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseLubeStandardServiceImpl.java @@ -56,7 +56,6 @@ public class DmsBaseLubeStandardServiceImpl implements IDmsBaseLubeStandardServi @Override public int insertDmsBaseLubeStandard(DmsBaseLubeStandard dmsBaseLubeStandard) { - //ZCH DmsBaseLubeStandard LubeStandard = new DmsBaseLubeStandard(); LubeStandard.setLubeStandardCode(dmsBaseLubeStandard.getLubeStandardCode()); List dmsBaseLubeStandardList = dmsBaseLubeStandardMapper. diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseLubeStationServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseLubeStationServiceImpl.java index 11d1fb1..681bf62 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseLubeStationServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseLubeStationServiceImpl.java @@ -79,7 +79,6 @@ public class DmsBaseLubeStationServiceImpl implements IDmsBaseLubeStationService @Override public int updateDmsBaseLubeStation(DmsBaseLubeStation dmsBaseLubeStation) { - //ZCH DmsBaseLubeStation BaseLubeStation = new DmsBaseLubeStation(); BaseLubeStation.setLubeStationCode(dmsBaseLubeStation.getLubeStationCode()); List dmsBaseLubeStationList = dmsBaseLubeStationMapper diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseMaintStandardServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseMaintStandardServiceImpl.java index b5f6989..8149bc6 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseMaintStandardServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseMaintStandardServiceImpl.java @@ -89,7 +89,6 @@ public class DmsBaseMaintStandardServiceImpl implements IDmsBaseMaintStandardSer throw new ServiceException("保养标准编码已存在"); } LoginUser user = SecurityUtils.getLoginUser(); - dmsBaseMaintStandard.setUpdateBy(user.getUsername()); dmsBaseMaintStandard.setUpdateTime(DateUtils.getNowDate()); return dmsBaseMaintStandardMapper.updateDmsBaseMaintStandard(dmsBaseMaintStandard); diff --git a/hw-ui/src/views/dms/dmsBaseInspectProject/index.vue b/hw-ui/src/views/dms/dmsBaseInspectProject/index.vue index b7856c2..e9a19e1 100644 --- a/hw-ui/src/views/dms/dmsBaseInspectProject/index.vue +++ b/hw-ui/src/views/dms/dmsBaseInspectProject/index.vue @@ -361,7 +361,6 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const inspectProjectIds = row.inspectProjectId || this.ids; - inspectProjectCode const inspectProjectCode = row.inspectProjectCode || this.ids; this.$modal.confirm('是否确认删除巡检项目信息编号为"' + inspectProjectCode + '"的数据项?').then(function() { return delDmsBaseInspectProject(inspectProjectIds); diff --git a/hw-ui/src/views/dms/specialDeviceParam/index.vue b/hw-ui/src/views/dms/specialDeviceParam/index.vue index 94068d5..d1c7a38 100644 --- a/hw-ui/src/views/dms/specialDeviceParam/index.vue +++ b/hw-ui/src/views/dms/specialDeviceParam/index.vue @@ -246,13 +246,13 @@ export default { // 表单校验 rules: { deviceId: [ - { required: true, message: "设备ID,关联dms_base_device_ledger的device_id不能为空", trigger: "blur" } + { required: true, message: "设备ID不能为空", trigger: "blur" } ], paramName: [ { required: true, message: "参数名称不能为空", trigger: "blur" } ], paramCode: [ - { required: true, message: "是否标识:1-是;2-否不能为空", trigger: "blur" } + { required: true, message: "参数编号不能为空", trigger: "blur" } ], } }; diff --git a/hw-ui/src/views/dms/station/index.vue b/hw-ui/src/views/dms/station/index.vue index ff59b42..aa9861d 100644 --- a/hw-ui/src/views/dms/station/index.vue +++ b/hw-ui/src/views/dms/station/index.vue @@ -273,11 +273,11 @@ export default { created() { this.getList(); this.getDeviceTypeList(); - this.getStandards(); + this.getStandard(); }, methods: { /** 查询保养标准信息列表 */ - getStandards() { + getStandard() { getMaintStandardlist({}).then(response => { this.standardList = response.data; });