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:
马三炮 2025-04-14 16:04:06 +08:00
parent 14e957b2aa 23f2f632ed
commit 3947e397fe
13 changed files with 90 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/bonus/imgTool/system/controller/UserController.java
View File

@ -226,7 +226,7 @@ public class UserController {
UserDto userDto = userService.getById(data.getData().getId()); UserDto userDto = userService.getById(data.getData().getId());
List<SelectVo> projects = userService.getProjects(userDto); List<SelectVo> projects = userService.getProjects(userDto);
userDto.setProjects(projects); userDto.setProjects(projects);
/*String loginType = userDto.getLoginType(); String loginType = userDto.getLoginType();
if (loginType != null && !loginType.isEmpty()){ if (loginType != null && !loginType.isEmpty()){
String[] loginTypeArr = loginType.split(","); String[] loginTypeArr = loginType.split(",");
List<Long> loginTypes = new ArrayList<>(); List<Long> loginTypes = new ArrayList<>();
@ -234,7 +234,7 @@ public class UserController {
loginTypes.add(Long.parseLong(type.trim())); loginTypes.add(Long.parseLong(type.trim()));
} }
userDto.setLoginTypes(loginTypes); userDto.setLoginTypes(loginTypes);
}*/ }
return ServerResponse.createSuccess(userDto); return ServerResponse.createSuccess(userDto);
}catch (Exception e){ }catch (Exception e){
log.error(e.toString(),e); log.error(e.toString(),e);

2
src/main/java/com/bonus/imgTool/system/service/impl/UserServiceImpl.java
View File

@ -53,7 +53,7 @@ public class UserServiceImpl implements UserService {
if (StringUtils.isNotBlank(project)){ if (StringUtils.isNotBlank(project)){
for (String proId : project.split(",")) { for (String proId : project.split(",")) {
// 新增工程 // 新增工程
userDao.saveUserProject(userDto.getId(), proId); userDao.saveUserProject(user.getId(), proId);
} }
} }
if (num > 0) { if (num > 0) {

6
src/main/resources/mappers/system/UserMapper.xml
View File

@ -52,12 +52,12 @@
</if> </if>
</select> </select>
<!--新增用户--> <!--新增用户-->
<insert id="saveUser" parameterType="com.bonus.imgTool.model.SysUser" > <insert id="saveUser" parameterType="com.bonus.imgTool.model.SysUser" keyColumn="id" keyProperty="id" useGeneratedKeys="true">
insert into sys_user(login_name, user_name, insert into sys_user(login_name, user_name,
<if test="userCode != null and userCode != ''"> <if test="userCode != null and userCode != ''">
user_code, user_code,
</if> </if>
sex, org_id,login_type, role_id, phone, user_type, state, sex, org_id,login_type, role_id, user_type, state,
password, password,
<if test="teamId != null and teamId != ''"> <if test="teamId != null and teamId != ''">
team_id, team_id,
@ -67,7 +67,7 @@
<if test="userCode != null and userCode != ''"> <if test="userCode != null and userCode != ''">
#{userCode}, #{userCode},
</if> </if>
#{sex}, #{orgId},#{loginType}, #{roleId}, #{phone}, #{userType}, #{sex}, #{orgId},#{loginType}, #{roleId}, #{userType},
#{state}, #{state},
#{password}, #{password},
<if test="teamId != null and teamId != ''"> <if test="teamId != null and teamId != ''">

BIN
src/main/resources/static/img/synthesisQuery/download_icon2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 266 B

BIN
src/main/resources/static/img/synthesisQuery/water_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 323 B

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

@ -230,6 +230,8 @@ function setParams(params) {
majorId = selectedId; majorId = selectedId;
majorName = selectedName; majorName = selectedName;
} }
gxId = '';
gxName = '';
let gxs = getGxsSelect(data.value); let gxs = getGxsSelect(data.value);
setSelectValueName(gxs, 'gxId', '请选择工序'); setSelectValueName(gxs, 'gxId', '请选择工序');
}); });
@ -351,6 +353,13 @@ function setFormData(data) {
$('#buildUnderDesc').val(data.buildUnderDesc) $('#buildUnderDesc').val(data.buildUnderDesc)
$('#buildAfterDesc').val(data.buildAfterDesc) $('#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; var sysFileResourceList = data.sysFileResourceList;
if (sysFileResourceList && sysFileResourceList.length > 0) { 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; majorId = selectedId;
majorName = selectedName; majorName = selectedName;
} }
gxId = '';
gxName = '';
let gxs = getGxsSelect(data.value); let gxs = getGxsSelect(data.value);
setSelectValueName(gxs, 'gxId', '请选择工序'); setSelectValueName(gxs, 'gxId', '请选择工序');
}); });
@ -241,6 +243,13 @@ function setFormData(data) {
$('#title').val(data.title) $('#title').val(data.title)
$('#content').val(data.content) $('#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; vrImgList = data.sysFileResourceList;
var vioPhotoListEdit = data.sysFileResourceList; var vioPhotoListEdit = data.sysFileResourceList;
if (vioPhotoListEdit && vioPhotoListEdit.length > 0) { 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; majorId = selectedId;
majorName = selectedName; majorName = selectedName;
} }
gxId = '';
gxName = '';
let gxs = getGxsSelect(data.value); let gxs = getGxsSelect(data.value);
setSelectValueName(gxs, 'gxId', '请选择工序'); setSelectValueName(gxs, 'gxId', '请选择工序');
}); });
@ -299,6 +301,13 @@ function setFormData(data) {
$('#rectDate').val(data.rectDate) $('#rectDate').val(data.rectDate)
$('#vioDesc').val(data.vioDesc) $('#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; var vioPhotoListEdit = data.vioPhotoList;
if (vioPhotoListEdit && vioPhotoListEdit.length > 0) { if (vioPhotoListEdit && vioPhotoListEdit.length > 0) {
var html = ""; var html = "";

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

@ -120,6 +120,8 @@ function setParams(params) {
majorId = selectedId; majorId = selectedId;
majorName = selectedName; majorName = selectedName;
} }
gxId = '';
gxName = '';
let gxs = getGxsSelect(data.value); let gxs = getGxsSelect(data.value);
setSelectValueName(gxs, 'gxId', '请选择工序'); setSelectValueName(gxs, 'gxId', '请选择工序');
}); });
@ -242,6 +244,13 @@ function setFormData(data) {
$('#checkPlace').val(data.checkPlace) $('#checkPlace').val(data.checkPlace)
$('#checkDesc').val(data.checkDesc) $('#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; vrImgList = data.sysFileResourceList;
var vioPhotoListEdit = data.sysFileResourceList; var vioPhotoListEdit = data.sysFileResourceList;
if (vioPhotoListEdit && vioPhotoListEdit.length > 0) { 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; majorId = selectedId;
majorName = selectedName; majorName = selectedName;
} }
gxId = '';
gxName = '';
let gxs = getGxsSelect(data.value); let gxs = getGxsSelect(data.value);
setSelectValueName(gxs, 'gxId', '请选择工序'); setSelectValueName(gxs, 'gxId', '请选择工序');
}); });
@ -308,6 +309,13 @@ function setFormData(data) {
$('#rectDate').val(data.rectDate) $('#rectDate').val(data.rectDate)
$('#vioDesc').val(data.vioDesc) $('#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; var vioPhotoListEdit = data.vioPhotoList;
if (vioPhotoListEdit && vioPhotoListEdit.length > 0) { if (vioPhotoListEdit && vioPhotoListEdit.length > 0) {
var html = ""; var html = "";

21
src/main/resources/static/js/synthesisQuery/synthesisQueryCommon.js
View File

@ -3,6 +3,7 @@ function viewImg(item) {
layer.photos({ layer.photos({
shade: 0.5, shade: 0.5,
footer: false, footer: false,
// toolbar: ['prev', 'next', 'download', 'customBtn'], // 添加自定义按钮标识
photos: { photos: {
"title": "图片预览", "title": "图片预览",
"start": 0, "start": 0,
@ -13,6 +14,26 @@ function viewImg(item) {
} }
] ]
}, },
success: function(layero){
// 获取工具栏元素
var toolbar = $(layero).find('.layui-layer-photos-toolbar');
// 添加自定义按钮
var customBtn = $('<div class="layui-layer-photos-btn layui-layer-photos-customBtn" title="原图下载">'+
'<img style="margin-top: 15px;cursor: pointer;" src="../../img/synthesisQuery/download_icon2.png"></div>');
toolbar.append(customBtn);
// 绑定点击事件
customBtn.on('click', function(){
imgDownLoad(item,1);
});
var customBtn2 = $('<div class="layui-layer-photos-btn layui-layer-photos-customBtn" title="水印下载">'+
'<img style="margin-top: 15px;cursor: pointer;" src="../../img/synthesisQuery/water_icon.png"></div>');
toolbar.append(customBtn2);
// 绑定点击事件
customBtn2.on('click', function(){
generateWatermark(item)
});
}
}); });
} }

31
src/main/resources/static/js/system/child/userFormTemp.js
View File

@ -43,7 +43,7 @@ function setParams(params) {
let loginName = $('#loginName').val(); let loginName = $('#loginName').val();
if (loginName) { if (loginName) {
if (!(/^1[3456789]\d{9}$/.test(loginName))) { if (!(/^1[3456789]\d{9}$/.test(loginName))) {
return layer.alert("请输入正确的手机号", {icon: 2}) return layer.alert("登录账号请输入正确的手机号", {icon: 2})
} }
} }
if (!validatePassword(data.field.password)) { if (!validatePassword(data.field.password)) {
@ -287,15 +287,16 @@ function setFormData(data) {
formSelects.value('project', selectedValues); formSelects.value('project', selectedValues);
/*$('#teamId').val(data.teamId) /*$('#teamId').val(data.teamId)
$('#teamId option[value=' + data.teamId + ']').attr('selected', true)*/ $('#teamId option[value=' + data.teamId + ']').attr('selected', true)*/
// var arrCB = data.loginTypes; var arrCB = data.loginTypes;
// for (var j = 0; j < arrCB.length; j++) { console.log(arrCB+"arrCB");
// var cbthis = $("input[name='loginType']"); for (var j = 0; j < arrCB.length; j++) {
// for (var i = 0; i < cbthis.length; i++) { var cbthis = $("input[name='loginType']");
// if (cbthis[i].value == arrCB[j]) { for (var i = 0; i < cbthis.length; i++) {
// cbthis[i].checked = true; if (cbthis[i].value == arrCB[j]) {
// } cbthis[i].checked = true;
// } }
// } }
}
layui.form.render(); layui.form.render();
} }
} }
@ -309,16 +310,16 @@ function saveData(data) {
let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0}); let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0});
let url = dataUrl + "/users/addTemp"; let url = dataUrl + "/users/addTemp";
let params = data.field; let params = data.field;
// var arr_box = [];//固定复选框 var arr_box = [];//固定复选框
// $('#cbGuDing input[type=checkbox]:checked').each(function () { $('#cbGuDing input[type=checkbox]:checked').each(function () {
// arr_box.push($(this).val()); arr_box.push($(this).val());
// }); });
// var arr_pro = [];//固定复选框 // var arr_pro = [];//固定复选框
// $('#project input[type=checkbox]:checked').each(function () { // $('#project input[type=checkbox]:checked').each(function () {
// arr_pro.push($(this).val()); // arr_pro.push($(this).val());
// }); // });
// params.loginType = arr_box.join() params.loginType = arr_box.join()
// params.project = arr_pro.join() // params.project = arr_pro.join()
// params.orgId = params.orgId_select_nodeId; // params.orgId = params.orgId_select_nodeId;
if (params.id != "") { if (params.id != "") {

4
src/main/resources/static/pages/user/child/userFormTemp.html
View File

@ -115,7 +115,7 @@
</div> </div>
</div>--> </div>-->
<!-- <div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>登录权限</label> <label class="layui-form-label"><i style="padding: 0 10px;">*</i>登录权限</label>
<div class="layui-input-inline" id="cbGuDing" > <div class="layui-input-inline" id="cbGuDing" >
<input type="checkbox" name="loginType" value="1" title="后台" lay-skin="primary" checked> <input type="checkbox" name="loginType" value="1" title="后台" lay-skin="primary" checked>
@ -123,7 +123,7 @@
<input type="checkbox" name="loginType" value="3" title="app" lay-skin="primary"> <input type="checkbox" name="loginType" value="3" title="app" lay-skin="primary">
<input type="hidden" id="loginType" /> <input type="hidden" id="loginType" />
</div> </div>
</div>--> </div>
<div class="layui-form-item" style="margin-top: 2%;" id="pwd"> <div class="layui-form-item" style="margin-top: 2%;" id="pwd">
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>密码</label> <label class="layui-form-label"><i style="padding: 0 10px;">*</i>密码</label>