bonus
/
yn_img_tool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
liang.chao 2025-04-14 16:25:01 +08:00
parent 22ccfcf2c4 7968da8136
commit 24911fb8a5
12 changed files with 60 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.idea/dataSources.local.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="dataSourceStorageLocal" created-in="IU-233.15026.9">
<component name="dataSourceStorageLocal" created-in="IU-222.4345.14">
<data-source name="sz_aqgqj@192.168.0.7" uuid="aa5cf990-655c-437a-ac73-be966b18886f">
<database-info product="MySQL" version="5.7.43" jdbc-version="4.2" driver-name="MySQL Connector/J" driver-version="mysql-connector-j-8.2.0 (Revision: 06a1f724497fd81c6a659131fda822c9e5085b6c)" dbms="MYSQL" exact-version="5.7.43" exact-driver-version="8.2">
<extra-name-characters>#@</extra-name-characters>
@ -18,7 +18,6 @@
<database-info product="MySQL" version="5.7.44" jdbc-version="4.2" driver-name="MySQL Connector/J" driver-version="mysql-connector-j-8.2.0 (Revision: 06a1f724497fd81c6a659131fda822c9e5085b6c)" dbms="MYSQL" exact-version="5.7.44" exact-driver-version="8.2">
<extra-name-characters>#@</extra-name-characters>
<identifier-quote-string>`</identifier-quote-string>
<jdbc-catalog-is-schema>true</jdbc-catalog-is-schema>
</database-info>
<case-sensitivity plain-identifiers="lower" quoted-identifiers="lower" />
<user-name>root</user-name>
@ -28,5 +27,9 @@
</introspection-scope>
</schema-mapping>
</data-source>
<data-source name="yn_img_tool@127.0.0.1" uuid="826f3ee5-e63f-4742-9b4f-b71894453330">
<database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="MYSQL" exact-version="0" />
<schema-mapping />
</data-source>
</component>
</project>
</project>

4
src/main/java/com/bonus/imgTool/imageUpload/dto/CoordinatePhotoReqVo.java
View File

@ -30,6 +30,6 @@ public class CoordinatePhotoReqVo {
*/
private String keyWord;
private int pageNum = 1;
private int pageSize = 10;
private int pageNum;
private int pageSize;
}

4
src/main/java/com/bonus/imgTool/imageUpload/dto/ImportantMatterReqVo.java
View File

@ -31,6 +31,6 @@ public class ImportantMatterReqVo {
*/
private String keyWord;
private int pageNum = 1;
private int pageSize = 10;
private int pageNum;
private int pageSize;
}

4
src/main/java/com/bonus/imgTool/imageUpload/dto/SafetyMeasuresReqVo.java
View File

@ -30,6 +30,6 @@ public class SafetyMeasuresReqVo {
*/
private String keyWord;
private int pageNum = 1;
private int pageSize = 10;
private int pageNum;
private int pageSize;
}

2
src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java
View File

@ -53,7 +53,7 @@ public class CoordinatePhotoServiceImpl implements CoordinatePhotoService {
coordinatePhotoVo.setSysFileResourceList(sysFileResourceList);
}
PageInfo<CoordinatePhotoVo> 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("查询失败");

2
src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java
View File

@ -53,7 +53,7 @@ public class ImportantMatterServiceImpl implements ImportantMatterService {
importantMatterVo.setSysFileResourceList(sysFileResourceList);
}
PageInfo<ImportantMatterVo> 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("查询失败");

2
src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java
View File

@ -53,7 +53,7 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService {
safetyMeasuresVo.setSysFileResourceList(sysFileResourceList);
}
PageInfo<SafetyMeasuresVo> 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("查询失败");

9
src/main/resources/static/js/imageUpload/coordinatePhoto/child/coordinatePhotoForm.js
View File

@ -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) {

9
src/main/resources/static/js/imageUpload/importantMatter/child/importantMatterForm.js
View File

@ -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) {

9
src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js
View File

@ -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 = "";

9
src/main/resources/static/js/imageUpload/safetyMeasure/child/safetyMeasureForm.js
View File

@ -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) {

10
src/main/resources/static/js/imageUpload/safetyViolations/child/safetyViolationsForm.js
View File

@ -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 = "";