From 8304c056b4898d34c19f55bb3d9718168c91627b Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Mon, 14 Apr 2025 15:31:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../img/synthesisQuery/download_icon2.png | Bin 0 -> 266 bytes .../static/img/synthesisQuery/water_icon.png | Bin 0 -> 323 bytes .../js/synthesisQuery/synthesisQueryCommon.js | 21 ++++++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 src/main/resources/static/img/synthesisQuery/download_icon2.png create mode 100644 src/main/resources/static/img/synthesisQuery/water_icon.png diff --git a/src/main/resources/static/img/synthesisQuery/download_icon2.png b/src/main/resources/static/img/synthesisQuery/download_icon2.png new file mode 100644 index 0000000000000000000000000000000000000000..80949233f875a4905df5f41317ae677c98371e30 GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|#^NA%Cx&(BWL^R}M?75|LoEE? zPPr)9WFX*DZoN==qtI62wJvL1-W>4@yXI-cC^SLR?yUOF%AL1wH{W*AHB2X--Wp7(TSH5vK3e+pu@ zG*)j`(qT^(2siFJtmD3LFN<_k#^Kfc4C~6+em+~1@{uL2b8o>`R}WEPx#{YgYYR5(w~l-&)&FbssxlTbEc6X+B?0+RrfP#&2An8fgbjY7mvh5A6GN{t<# z?`$WgftC$~qhW#Ey^++ISqH<|PbJMHwQ2vv{>I4Nj{sc*Pw`D6i2X_up!iwX@@!{j z`0vu(eJ6=v7~LEMnAs`V;U_r#{4c_`F|)P?T4sh)hPxwieYHLOkpLwm948Ry%R*X- z1B>$uAQZs#iBV=GC<9Yo_lD6E%bL+wX_B^4d=#+8)G~q4Plin#q?n^Ph=hZrdC{@# z-eWZCVwbg{%?S(`$x`~ho~;Ce0kfjMU8{$)*A;nH>|cRkOsn5smtKteyb%8fbOB}8 VgcGP-Ex-T(002ovPDHLkV1l2>jCcS5 literal 0 HcmV?d00001 diff --git a/src/main/resources/static/js/synthesisQuery/synthesisQueryCommon.js b/src/main/resources/static/js/synthesisQuery/synthesisQueryCommon.js index d5201cd..741ee39 100644 --- a/src/main/resources/static/js/synthesisQuery/synthesisQueryCommon.js +++ b/src/main/resources/static/js/synthesisQuery/synthesisQueryCommon.js @@ -3,6 +3,7 @@ function viewImg(item) { layer.photos({ shade: 0.5, footer: false, + // toolbar: ['prev', 'next', 'download', 'customBtn'], // 添加自定义按钮标识 photos: { "title": "图片预览", "start": 0, @@ -13,6 +14,26 @@ function viewImg(item) { } ] }, + success: function(layero){ + // 获取工具栏元素 + var toolbar = $(layero).find('.layui-layer-photos-toolbar'); + // 添加自定义按钮 + var customBtn = $('
'+ + '
'); + toolbar.append(customBtn); + // 绑定点击事件 + customBtn.on('click', function(){ + imgDownLoad(item,1); + }); + + var customBtn2 = $('
'+ + '
'); + toolbar.append(customBtn2); + // 绑定点击事件 + customBtn2.on('click', function(){ + generateWatermark(item) + }); + } }); } From 1b7ed4f52caf22e09a2c9a6e9d5682e06d841096 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Mon, 14 Apr 2025 15:36:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E9=97=AE=E9=A2=98bug=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E5=92=8C=E7=94=A8=E6=88=B7=E7=BB=91=E5=AE=9A=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/UserController.java | 4 +-- .../system/service/impl/UserServiceImpl.java | 2 +- .../resources/mappers/system/UserMapper.xml | 6 ++-- .../static/js/system/child/userFormTemp.js | 31 ++++++++++--------- .../static/pages/user/child/userFormTemp.html | 4 +-- 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/bonus/imgTool/system/controller/UserController.java b/src/main/java/com/bonus/imgTool/system/controller/UserController.java index 4777961..4b59f76 100644 --- a/src/main/java/com/bonus/imgTool/system/controller/UserController.java +++ b/src/main/java/com/bonus/imgTool/system/controller/UserController.java @@ -226,7 +226,7 @@ public class UserController { UserDto userDto = userService.getById(data.getData().getId()); List projects = userService.getProjects(userDto); userDto.setProjects(projects); - /*String loginType = userDto.getLoginType(); + String loginType = userDto.getLoginType(); if (loginType != null && !loginType.isEmpty()){ String[] loginTypeArr = loginType.split(","); List loginTypes = new ArrayList<>(); @@ -234,7 +234,7 @@ public class UserController { loginTypes.add(Long.parseLong(type.trim())); } userDto.setLoginTypes(loginTypes); - }*/ + } return ServerResponse.createSuccess(userDto); }catch (Exception e){ log.error(e.toString(),e); diff --git a/src/main/java/com/bonus/imgTool/system/service/impl/UserServiceImpl.java b/src/main/java/com/bonus/imgTool/system/service/impl/UserServiceImpl.java index 9c10ccd..b92c922 100644 --- a/src/main/java/com/bonus/imgTool/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/bonus/imgTool/system/service/impl/UserServiceImpl.java @@ -53,7 +53,7 @@ public class UserServiceImpl implements UserService { if (StringUtils.isNotBlank(project)){ for (String proId : project.split(",")) { // 新增工程 - userDao.saveUserProject(userDto.getId(), proId); + userDao.saveUserProject(user.getId(), proId); } } if (num > 0) { diff --git a/src/main/resources/mappers/system/UserMapper.xml b/src/main/resources/mappers/system/UserMapper.xml index d17c92d..61f0383 100644 --- a/src/main/resources/mappers/system/UserMapper.xml +++ b/src/main/resources/mappers/system/UserMapper.xml @@ -52,12 +52,12 @@ - + insert into sys_user(login_name, user_name, user_code, - sex, org_id,login_type, role_id, phone, user_type, state, + sex, org_id,login_type, role_id, user_type, state, password, team_id, @@ -67,7 +67,7 @@ #{userCode}, - #{sex}, #{orgId},#{loginType}, #{roleId}, #{phone}, #{userType}, + #{sex}, #{orgId},#{loginType}, #{roleId}, #{userType}, #{state}, #{password}, diff --git a/src/main/resources/static/js/system/child/userFormTemp.js b/src/main/resources/static/js/system/child/userFormTemp.js index 122513b..9bf4fb1 100644 --- a/src/main/resources/static/js/system/child/userFormTemp.js +++ b/src/main/resources/static/js/system/child/userFormTemp.js @@ -43,7 +43,7 @@ function setParams(params) { let loginName = $('#loginName').val(); if (loginName) { if (!(/^1[3456789]\d{9}$/.test(loginName))) { - return layer.alert("请输入正确的手机号", {icon: 2}) + return layer.alert("登录账号请输入正确的手机号", {icon: 2}) } } if (!validatePassword(data.field.password)) { @@ -287,15 +287,16 @@ function setFormData(data) { formSelects.value('project', selectedValues); /*$('#teamId').val(data.teamId) $('#teamId option[value=' + data.teamId + ']').attr('selected', true)*/ - // var arrCB = data.loginTypes; - // for (var j = 0; j < arrCB.length; j++) { - // var cbthis = $("input[name='loginType']"); - // for (var i = 0; i < cbthis.length; i++) { - // if (cbthis[i].value == arrCB[j]) { - // cbthis[i].checked = true; - // } - // } - // } + var arrCB = data.loginTypes; + console.log(arrCB+"arrCB"); + for (var j = 0; j < arrCB.length; j++) { + var cbthis = $("input[name='loginType']"); + for (var i = 0; i < cbthis.length; i++) { + if (cbthis[i].value == arrCB[j]) { + cbthis[i].checked = true; + } + } + } layui.form.render(); } } @@ -309,16 +310,16 @@ function saveData(data) { let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0}); let url = dataUrl + "/users/addTemp"; let params = data.field; - // var arr_box = [];//固定复选框 - // $('#cbGuDing input[type=checkbox]:checked').each(function () { - // arr_box.push($(this).val()); - // }); + var arr_box = [];//固定复选框 + $('#cbGuDing input[type=checkbox]:checked').each(function () { + arr_box.push($(this).val()); + }); // var arr_pro = [];//固定复选框 // $('#project input[type=checkbox]:checked').each(function () { // arr_pro.push($(this).val()); // }); - // params.loginType = arr_box.join() + params.loginType = arr_box.join() // params.project = arr_pro.join() // params.orgId = params.orgId_select_nodeId; if (params.id != "") { diff --git a/src/main/resources/static/pages/user/child/userFormTemp.html b/src/main/resources/static/pages/user/child/userFormTemp.html index c32cd71..d468126 100644 --- a/src/main/resources/static/pages/user/child/userFormTemp.html +++ b/src/main/resources/static/pages/user/child/userFormTemp.html @@ -115,7 +115,7 @@ --> - +
From 23f2f632ededdf0d0db9ffcc6bb05937a2936dd8 Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Mon, 14 Apr 2025 15:47:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coordinatePhoto/child/coordinatePhotoForm.js | 9 +++++++++ .../importantMatter/child/importantMatterForm.js | 9 +++++++++ .../qualityInspection/child/qualityInspectionForm.js | 9 +++++++++ .../safetyMeasure/child/safetyMeasureForm.js | 9 +++++++++ .../safetyViolations/child/safetyViolationsForm.js | 10 +++++++++- 5 files changed, 45 insertions(+), 1 deletion(-) 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 = "";