diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml index 7b67756..f053798 100644 --- a/.idea/dataSources.local.xml +++ b/.idea/dataSources.local.xml @@ -1,6 +1,6 @@ - + #@ @@ -18,7 +18,6 @@ #@ ` - true root @@ -28,5 +27,9 @@ + + + + - \ No newline at end of file + diff --git a/src/main/java/com/bonus/imgTool/imageUpload/dto/CoordinatePhotoReqVo.java b/src/main/java/com/bonus/imgTool/imageUpload/dto/CoordinatePhotoReqVo.java index 85720f3..f2fb633 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/dto/CoordinatePhotoReqVo.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/dto/CoordinatePhotoReqVo.java @@ -30,6 +30,6 @@ public class CoordinatePhotoReqVo { */ private String keyWord; - private int pageNum = 1; - private int pageSize = 10; + private int pageNum; + private int pageSize; } diff --git a/src/main/java/com/bonus/imgTool/imageUpload/dto/ImportantMatterReqVo.java b/src/main/java/com/bonus/imgTool/imageUpload/dto/ImportantMatterReqVo.java index e218470..7fdaf05 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/dto/ImportantMatterReqVo.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/dto/ImportantMatterReqVo.java @@ -31,6 +31,6 @@ public class ImportantMatterReqVo { */ private String keyWord; - private int pageNum = 1; - private int pageSize = 10; + private int pageNum; + private int pageSize; } diff --git a/src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresReqVo.java b/src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresReqVo.java index 9354d25..a8ef750 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresReqVo.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresReqVo.java @@ -30,6 +30,6 @@ public class SafetyMeasuresReqVo { */ private String keyWord; - private int pageNum = 1; - private int pageSize = 10; + private int pageNum; + private int pageSize; } diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java index 3f79591..f365e75 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java @@ -53,7 +53,7 @@ public class CoordinatePhotoServiceImpl implements CoordinatePhotoService { coordinatePhotoVo.setSysFileResourceList(sysFileResourceList); } PageInfo pageInfo = new PageInfo<>(list); - return ServerResponse.createSuccess(pageInfo); + return ServerResponse.createSuccessPage(pageInfo,data.getPageNum(),data.getPageSize()); } catch (Exception e) { log.error(e.toString(), e); return ServerResponse.createErroe("查询失败"); diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java index 4f26c36..4e2988b 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java @@ -53,7 +53,7 @@ public class ImportantMatterServiceImpl implements ImportantMatterService { importantMatterVo.setSysFileResourceList(sysFileResourceList); } PageInfo pageInfo = new PageInfo<>(list); - return ServerResponse.createSuccess(pageInfo); + return ServerResponse.createSuccessPage(pageInfo,data.getPageNum(),data.getPageSize()); } catch (Exception e) { log.error(e.toString(), e); return ServerResponse.createErroe("查询失败"); diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java index b8d0219..1ad833d 100644 --- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java @@ -53,7 +53,7 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService { safetyMeasuresVo.setSysFileResourceList(sysFileResourceList); } PageInfo pageInfo = new PageInfo<>(list); - return ServerResponse.createSuccess(pageInfo); + return ServerResponse.createSuccessPage(pageInfo,data.getPageNum(),data.getPageSize()); } catch (Exception e) { log.error(e.toString(), e); return ServerResponse.createErroe("查询失败"); diff --git a/src/main/resources/static/js/imageUpload/coordinatePhoto/child/coordinatePhotoForm.js b/src/main/resources/static/js/imageUpload/coordinatePhoto/child/coordinatePhotoForm.js index 25b99d7..be69fcb 100644 --- a/src/main/resources/static/js/imageUpload/coordinatePhoto/child/coordinatePhotoForm.js +++ b/src/main/resources/static/js/imageUpload/coordinatePhoto/child/coordinatePhotoForm.js @@ -230,6 +230,8 @@ function setParams(params) { majorId = selectedId; majorName = selectedName; } + gxId = ''; + gxName = ''; let gxs = getGxsSelect(data.value); setSelectValueName(gxs, 'gxId', '请选择工序'); }); @@ -351,6 +353,13 @@ function setFormData(data) { $('#buildUnderDesc').val(data.buildUnderDesc) $('#buildAfterDesc').val(data.buildAfterDesc) + proId = data.proId; + proName = data.proName; + majorId = data.majorId; + majorName = data.majorName; + gxId = data.gxId; + gxName = data.gxName; + var sysFileResourceList = data.sysFileResourceList; if (sysFileResourceList && sysFileResourceList.length > 0) { diff --git a/src/main/resources/static/js/imageUpload/importantMatter/child/importantMatterForm.js b/src/main/resources/static/js/imageUpload/importantMatter/child/importantMatterForm.js index 58859d7..850a4c5 100644 --- a/src/main/resources/static/js/imageUpload/importantMatter/child/importantMatterForm.js +++ b/src/main/resources/static/js/imageUpload/importantMatter/child/importantMatterForm.js @@ -120,6 +120,8 @@ function setParams(params) { majorId = selectedId; majorName = selectedName; } + gxId = ''; + gxName = ''; let gxs = getGxsSelect(data.value); setSelectValueName(gxs, 'gxId', '请选择工序'); }); @@ -241,6 +243,13 @@ function setFormData(data) { $('#title').val(data.title) $('#content').val(data.content) + proId = data.proId; + proName = data.proName; + majorId = data.majorId; + majorName = data.majorName; + gxId = data.gxId; + gxName = data.gxName; + vrImgList = data.sysFileResourceList; var vioPhotoListEdit = data.sysFileResourceList; if (vioPhotoListEdit && vioPhotoListEdit.length > 0) { diff --git a/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js b/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js index 2f2ade9..0097ed1 100644 --- a/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js +++ b/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js @@ -176,6 +176,8 @@ function setParams(params) { majorId = selectedId; majorName = selectedName; } + gxId = ''; + gxName = ''; let gxs = getGxsSelect(data.value); setSelectValueName(gxs, 'gxId', '请选择工序'); }); @@ -299,6 +301,13 @@ function setFormData(data) { $('#rectDate').val(data.rectDate) $('#vioDesc').val(data.vioDesc) + proId = data.proId; + proName = data.proName; + majorId = data.majorId; + majorName = data.majorName; + gxId = data.gxId; + gxName = data.gxName; + var vioPhotoListEdit = data.vioPhotoList; if (vioPhotoListEdit && vioPhotoListEdit.length > 0) { var html = ""; diff --git a/src/main/resources/static/js/imageUpload/safetyMeasure/child/safetyMeasureForm.js b/src/main/resources/static/js/imageUpload/safetyMeasure/child/safetyMeasureForm.js index 3f7e957..dfbca68 100644 --- a/src/main/resources/static/js/imageUpload/safetyMeasure/child/safetyMeasureForm.js +++ b/src/main/resources/static/js/imageUpload/safetyMeasure/child/safetyMeasureForm.js @@ -120,6 +120,8 @@ function setParams(params) { majorId = selectedId; majorName = selectedName; } + gxId = ''; + gxName = ''; let gxs = getGxsSelect(data.value); setSelectValueName(gxs, 'gxId', '请选择工序'); }); @@ -242,6 +244,13 @@ function setFormData(data) { $('#checkPlace').val(data.checkPlace) $('#checkDesc').val(data.checkDesc) + proId = data.proId; + proName = data.proName; + majorId = data.majorId; + majorName = data.majorName; + gxId = data.gxId; + gxName = data.gxName; + vrImgList = data.sysFileResourceList; var vioPhotoListEdit = data.sysFileResourceList; if (vioPhotoListEdit && vioPhotoListEdit.length > 0) { diff --git a/src/main/resources/static/js/imageUpload/safetyViolations/child/safetyViolationsForm.js b/src/main/resources/static/js/imageUpload/safetyViolations/child/safetyViolationsForm.js index 9b054fc..588749a 100644 --- a/src/main/resources/static/js/imageUpload/safetyViolations/child/safetyViolationsForm.js +++ b/src/main/resources/static/js/imageUpload/safetyViolations/child/safetyViolationsForm.js @@ -185,7 +185,8 @@ function setParams(params) { majorId = selectedId; majorName = selectedName; } - + gxId = ''; + gxName = ''; let gxs = getGxsSelect(data.value); setSelectValueName(gxs, 'gxId', '请选择工序'); }); @@ -308,6 +309,13 @@ function setFormData(data) { $('#rectDate').val(data.rectDate) $('#vioDesc').val(data.vioDesc) + proId = data.proId; + proName = data.proName; + majorId = data.majorId; + majorName = data.majorName; + gxId = data.gxId; + gxName = data.gxName; + var vioPhotoListEdit = data.vioPhotoList; if (vioPhotoListEdit && vioPhotoListEdit.length > 0) { var html = "";