From 10eb940bab0e2e599f6c6c99effa00fa89764246 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Sat, 20 Jul 2024 22:28:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E4=B8=AA=E4=BD=93?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ToolsManageController.java | 38 ++- .../bonus/aqgqj/basis/dao/ToolsManageDao.java | 19 ++ .../basis/entity/dto/ToolsManageDto.java | 101 ++----- .../basis/service/ToolsManageService.java | 16 + .../service/impl/ToolsManageServiceImpl.java | 33 ++- .../mappers/basis/ToolsManageMapper.xml | 86 +++--- .../static/js/tools/child/toolsForm.js | 280 ++++++++++++++++++ .../resources/static/js/tools/toolsMge.js | 166 +++-------- .../resources/static/pages/role/addRole.html | 5 +- .../pages/tools/child/certificateView.html | 37 +++ .../static/pages/tools/child/toolsForm.html | 52 ++++ .../static/pages/tools/toolsMge.html | 23 +- .../static/pages/user/child/userForm.html | 25 -- 13 files changed, 605 insertions(+), 276 deletions(-) create mode 100644 src/main/resources/static/js/tools/child/toolsForm.js create mode 100644 src/main/resources/static/pages/tools/child/certificateView.html create mode 100644 src/main/resources/static/pages/tools/child/toolsForm.html diff --git a/src/main/java/com/bonus/aqgqj/basis/controller/ToolsManageController.java b/src/main/java/com/bonus/aqgqj/basis/controller/ToolsManageController.java index e7f3d91..5f4915a 100644 --- a/src/main/java/com/bonus/aqgqj/basis/controller/ToolsManageController.java +++ b/src/main/java/com/bonus/aqgqj/basis/controller/ToolsManageController.java @@ -5,6 +5,7 @@ import com.bonus.aqgqj.annotation.LogAnnotation; import com.bonus.aqgqj.basis.entity.dto.ToolsManageDto; import com.bonus.aqgqj.basis.service.ToolsManageService; import com.bonus.aqgqj.model.PasswordConfig; +import com.bonus.aqgqj.model.Role; import com.bonus.aqgqj.model.SysUser; import com.bonus.aqgqj.system.dao.UserDao; import com.bonus.aqgqj.system.service.UserService; @@ -33,9 +34,10 @@ import java.util.Objects; /** - * 工器具管理 + * 工器具个体管理 + * @author hay */ -@Api(tags = "工器具管理") +@Api(tags = "工器具个体管理") @RestController @RequestMapping("/tools/") public class ToolsManageController { @@ -47,7 +49,7 @@ public class ToolsManageController { @PostMapping(value = "getList") @DecryptAndVerify(decryptedClass = ToolsManageDto.class) - @LogAnnotation(operModul = "系统管理-用户管理", operation = "查询用列表", operDesc = "系统级事件",operType="查询") + @LogAnnotation(operModul = "工器具管理-工器具个体管理", operation = "查询用列表", operDesc = "系统级事件",operType="查询") @PreAuthorize("@pms.hasPermission('sys:tools:query')" ) public ServerResponse listUsers(EncryptedReq data) { PageHelper.startPage(data.getData().getPage(), data.getData().getLimit()); @@ -61,4 +63,34 @@ public class ToolsManageController { return ServerResponse.createErrorPage(data.getData().getPage(),data.getData().getLimit()); } + @PostMapping(value = "getDetailsList") + @DecryptAndVerify(decryptedClass = ToolsManageDto.class) + @LogAnnotation(operModul = "工器具管理-工器具个体管理详情", operation = "查询用列表", operDesc = "系统级事件",operType="查询") + @PreAuthorize("@pms.hasPermission('sys:tools:query')" ) + public ServerResponse getDetailsList(EncryptedReq data) { + PageHelper.startPage(data.getData().getPage(), data.getData().getLimit()); + try { + List list = toolsManageService.getDetailsList(data.getData()); + PageInfo pageInfo = new PageInfo<>(list); + return ServerResponse.createSuccessPage(pageInfo,data.getData().getPage(),data.getData().getLimit()); + } catch (Exception e) { + log.error(e.toString(),e); + } + return ServerResponse.createErrorPage(data.getData().getPage(),data.getData().getLimit()); + } + + + @PostMapping(value = "all") + @LogAnnotation(operModul = "工器具管理", operation = "查询所有工器具", operDesc = "系统级事件",operType="查询") + @PreAuthorize("@pms.hasPermission('sys:tools:query')" ) + public ServerResponse getAll() { + try { + List list = toolsManageService.listTools(); + return ServerResponse.createSuccess(list); + }catch (Exception e){ + log.error(e.toString(),e); + } + return ServerResponse.createErroe("操作失败"); + } + } diff --git a/src/main/java/com/bonus/aqgqj/basis/dao/ToolsManageDao.java b/src/main/java/com/bonus/aqgqj/basis/dao/ToolsManageDao.java index f3964a7..db2081a 100644 --- a/src/main/java/com/bonus/aqgqj/basis/dao/ToolsManageDao.java +++ b/src/main/java/com/bonus/aqgqj/basis/dao/ToolsManageDao.java @@ -25,4 +25,23 @@ public interface ToolsManageDao { */ List list(ToolsManageDto bean); + /** + * 获取工器具 + * @param id + * @return + */ + String getSampleTools(Integer id); + + /** + * 获取详情列表 + * @param data + * @return + */ + List getDetailsList(ToolsManageDto data); + + /** + * 获取工器具 + * @return + */ + List listTools(); } diff --git a/src/main/java/com/bonus/aqgqj/basis/entity/dto/ToolsManageDto.java b/src/main/java/com/bonus/aqgqj/basis/entity/dto/ToolsManageDto.java index 9012e3f..15aca38 100644 --- a/src/main/java/com/bonus/aqgqj/basis/entity/dto/ToolsManageDto.java +++ b/src/main/java/com/bonus/aqgqj/basis/entity/dto/ToolsManageDto.java @@ -3,119 +3,76 @@ package com.bonus.aqgqj.basis.entity.dto; import com.bonus.aqgqj.base.entity.PageEntity; import lombok.Data; +/** + * 工器具个体管理 + * @author hay + */ @Data public class ToolsManageDto extends PageEntity { private static final long serialVersionUID = -6525908145032868837L; - private Long id; - + private Integer id; /** - * 登录名 + * 名称 */ - private String loginName; + private String name; /** - * 用户名 + * 送样单位 */ - private String username; + private String customName; /** - * 工号 + * 送样人 */ - private String userCode; + private String sampleUser; /** - * 单位部门 + * 送样时间 */ - private String orgName; + private String sampleTime; /** - * 角色名称 + * 送样设备 */ - private String roleName; - - private String password; - - private String oldPassword; + private String sampleTools; /** - * 手机号 + * 收样人 */ - private String phone; + private String collectSamplesUser; /** - * 用户类型 + * 收样时间 */ - private String userType; - - private String email; - - private Integer sex; - - private Integer state; - + private String collectSamplesTime; /** - * 角色id + * 班组 */ - private String roleId; + private String teamName; /** - * 组织机构id + * 设备编号 */ - private Integer orgId; + private String devTypeCode; /** - * 所属单位 + * 生产厂家 */ - private String unit; + private String factoryName; /** - * 所属部门 + * 生产日期 */ - private String dept; + private String produceDate; /** - * 登录权限 + * 设备规格 */ - private String loginType; + private String devModule; - private String headImgUrl; - - private String delFlag; - - /** - * 账号类型 - */ - private int type; - - /** - * 休眠时间 - */ - private String sleepTime; - - private String updatePasswordTime; - - /** - * 临时账号时间 - */ - private String lsTime; - - /** - * 登录时间 - */ - private String loginTimes; - - private String status; - - private String newUser; - - public interface Status { - int DISABLED = 0; - int VALID = 1; - int LOCKED = 2; - } } diff --git a/src/main/java/com/bonus/aqgqj/basis/service/ToolsManageService.java b/src/main/java/com/bonus/aqgqj/basis/service/ToolsManageService.java index 3d95205..49a9def 100644 --- a/src/main/java/com/bonus/aqgqj/basis/service/ToolsManageService.java +++ b/src/main/java/com/bonus/aqgqj/basis/service/ToolsManageService.java @@ -10,6 +10,10 @@ import com.bonus.aqgqj.utils.ServerResponse; import java.util.List; import java.util.Map; +/** + * 工器具个体管理 + * @author hay + */ public interface ToolsManageService { /** * 查询列表 @@ -18,4 +22,16 @@ public interface ToolsManageService { */ List list(ToolsManageDto bean); + /** + * 详情列表 + * @param data + * @return + */ + List getDetailsList(ToolsManageDto data); + + /** + * 工器具列表 + * @return + */ + List listTools(); } diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/ToolsManageServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/ToolsManageServiceImpl.java index 41ac426..0d7c5fb 100644 --- a/src/main/java/com/bonus/aqgqj/basis/service/impl/ToolsManageServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/ToolsManageServiceImpl.java @@ -5,6 +5,7 @@ import com.bonus.aqgqj.basis.dao.ToolsManageDao; import com.bonus.aqgqj.basis.entity.dto.ToolsManageDto; import com.bonus.aqgqj.basis.service.ToolsManageService; import com.bonus.aqgqj.model.PasswordConfig; +import com.bonus.aqgqj.model.Role; import com.bonus.aqgqj.model.SysUser; import com.bonus.aqgqj.system.dao.UserDao; import com.bonus.aqgqj.system.service.UserService; @@ -23,6 +24,11 @@ import javax.annotation.Resource; import java.util.List; import java.util.Map; +/** +* @description 工器具个体管理 +* @author hay +* @date 2024/7/20 16:10 +*/ @Slf4j @Service public class ToolsManageServiceImpl implements ToolsManageService { @@ -32,11 +38,34 @@ public class ToolsManageServiceImpl implements ToolsManageService { private ToolsManageDao toolsManageDao; /** - * 查询用户列表 + * 查询列表 + * @param bean + * @return */ @Override public List list(ToolsManageDto bean) { - return toolsManageDao.list(bean); + List list = toolsManageDao.list(bean); + for (ToolsManageDto dto : list){ + String sampleTools = toolsManageDao.getSampleTools(dto.getId()); + dto.setSampleTools(sampleTools); + } + return list; + } + + /** + * 查询详情列表 + * @param data + * @return + */ + @Override + public List getDetailsList(ToolsManageDto data) { + return toolsManageDao.getDetailsList(data); + } + + @Override + public List listTools() { + List list = toolsManageDao.listTools(); + return list; } diff --git a/src/main/resources/mappers/basis/ToolsManageMapper.xml b/src/main/resources/mappers/basis/ToolsManageMapper.xml index 3f0d42e..7b4686f 100644 --- a/src/main/resources/mappers/basis/ToolsManageMapper.xml +++ b/src/main/resources/mappers/basis/ToolsManageMapper.xml @@ -3,44 +3,58 @@ + + + \ No newline at end of file diff --git a/src/main/resources/static/js/tools/child/toolsForm.js b/src/main/resources/static/js/tools/child/toolsForm.js new file mode 100644 index 0000000..9e6638f --- /dev/null +++ b/src/main/resources/static/js/tools/child/toolsForm.js @@ -0,0 +1,280 @@ +let form, layer, table, tableIns; +let pageNum = 1, limitSize = 10; // 默认第一页，分页数量为10 +let orgData,selectOrgId; +let idParam; + +function setParams(params){ + idParam = JSON.parse(params).id; + layui.use(['form', 'layer', 'table', 'laydate'], function () { + form = layui.form; + layer = layui.layer; + table = layui.table; + layui.form.render(); + pages(1, 10, 1); + getToolsSelected(); + }) +} + +function pages(pageNum, pageSize, typeNum) { + let params = getReqParams(pageNum, pageSize, typeNum); + let url = dataUrl + "/tools/getDetailsList" + ajaxRequest(url, "POST", params, true, function () { + }, function (result) { + console.log(result); + if (result.code === 200) { + if (result.data) { + initTable(result.data, result.limit, result.curr) + laypages(result.count, result.curr, result.limit) + } + } else if (result.code === 500) { + layer.alert(result.msg, {icon: 2}) + } + }, function (xhr) { + error(xhr) + }); + +} + +function getToolsSelected() { + let url = dataUrl + '/tools/all'; + ajaxRequest(url, "POST", null, true, function () { + }, function (result) { + if (result.code === 200) { + setSelectValue(result.data, 'sampleTools'); + // return result.data + } else { + layer.alert(result.msg, {icon: 2}) + } + }, function (xhr) { + error(xhr) + }); +} + +function laypages(total, page, limit) { + layui.use(['laypage'], function () { + let laypage = layui.laypage; + laypage.render({ + elem: 'voi-page', + count: total, + curr: page, + limit: limit, + limits: [10, 20, 50, 100, 200, 500], + layout: ['prev', 'page', 'next', 'skip', 'count', 'limit'], + groups: 5, + jump: function (obj, first) { + if (!first) { + pageNum = obj.curr, limitSize = obj.limit; + pages(obj.curr, obj.limit, null); + } + } + }); + }) +} + +/*初始化表格*/ +function initTable(dataList, limit, page) { + let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0,}); + tableIns = table.render({ + elem: "#table_data", + height: "full-130", + data: dataList, + limit: limit, + cols: [ + [ + //表头 + {title: "序号", width: 80, unresize: true, align: "center", + templet: function (d) { + return (page - 1) * limit + d.LAY_INDEX; + } + }, + {field: "sampleTools", title: "设备类型", unresize: true, align: "center"}, + {field: "devTypeCode", title: "设备编号", unresize: true, align: "center"}, + {field: "factoryName", title: "生产厂家", unresize: true, align: "center"}, + {field: "produceDate", title: "生产日期", unresize: true, align: "center"}, + {field: "devModule", title: "设备规格", unresize: true, align: "center"}, + { + field: "view1", title: "检测报告", unresize: true, align: "center", + templet: function (d) { + return '查看'; + } + }, + { + field: "view2", title: "合格证", unresize: true, align: "center", templet: function (d) { + return '查看'; + } + }, + { + field: "view3", title: "设备二维码", unresize: true, align: "center", templet: function (d) { + return '查看'; + } + }, + ], + ], + done: function (res, curr, count) { + layer.close(loadingMsg); + table.resize("table_data"); + count || this.elem.next(".layui-table-view").find(".layui-table-header").css("display", "inline-block"); + count || this.elem.next(".layui-table-view").find(".layui-table-box").css("overflow", "auto"); + }, + }); +} + +function handleClick1(view1) { + alert('Clicked on: ' + view1); +} + +function handleClick2(view1) { + alert('Clicked on: ' + view1); +} + +function handleClick3(view1) { + alert('Clicked on: ' + view1); +} + +// 获取参数 +function getReqParams(page, limit, type) { + var selectedValue =$('#sampleTools').val() + // 2. 查找对应的选项文本 + var selectedText = $('#sampleTools option[value="' + selectedValue + '"]').text(); + if (selectedText=='请选择'){ + selectedText='' + } + let obj = {}; + if (!type) { + obj = { + page: page + "", + limit: limit + "", + id: idParam, + sampleTools: selectedText, + collectSamplesUser:$('#collectSamplesUser').val() + }; + } else { + obj = { + page: '1', + limit: '10', + id: idParam, + sampleTools: selectedText, + collectSamplesUser: '' + }; + } + console.log(obj) + obj={ + encryptedData:encryptCBC(JSON.stringify(obj)) + } + return obj; +} + +// 查询/重置 +function query() { + let pattern = new RegExp("[%_<>]"); + if (pattern.test($("#loginName").val())) { + $("#loginName").val(''); + return layer.msg('用户名查询包含特殊字符，请重新输入', { + icon: 2, + time: 2000 //2秒关闭（如果不配置，默认是3秒） + }); + } + if (pattern.test($("#phone").val())) { + $("#phone").val(''); + return layer.msg('手机号查询包含特殊字符，请重新输入', { + icon: 2, + time: 2000 //2秒关闭（如果不配置，默认是3秒） + }); + } + pageNum = 1; + pages(1, limitSize); +} + + +//重置 +function reset() { + pages(1, limitSize, 1) +} + + +function reloadData() { + pages(pageNum, limitSize); +} + +// 新增/修改平台用户 +function addData(id) { + if (id) { + title = '详情'; + } + let param = { + 'id': id + } + openIframe2("addOrEditUser", title, "child/toolsFrom.html", '100%', '100%', param); +} + +/*删除用户*/ +function delData(id) { + layer.confirm("确定删除吗？", { + move: false + }, function () { + let loadingMsg = layer.msg('数据删除中,请稍候...', {icon: 16, scrollbar: false, time: 0}); + let url = dataUrl + "/users/delById"; + let params = { + 'id': id + } + params={ + encryptedData:encryptCBC(JSON.stringify(params)) + } + ajaxRequest(url, "POST", params, true, function () { + }, function (result) { + layer.close(loadingMsg); // 关闭提示层 + if (result.code === 200) { + parent.layer.msg(result.msg, {icon: 1}) + query() + } else if (result.code === 500) { + layer.alert(result.msg, {icon: 2}) + } + }, function (xhr) { + layer.close(loadingMsg); // 关闭提示层 + error(xhr) + }); + }) +} + +// 启用/停用/解除锁定 +function editUserAccountStatus(id, status, type) { + let url = dataUrl + "/sys/user/editUserAccountStatus?token=" + token; + let params = { + 'id': id, + 'accountStatus': status, + 'type': type + } + ajaxRequest(url, "POST", params, true, function () { + }, function (result) { + if (result.code === 200) { + if(type){ + reloadData(); + } + parent.layer.msg(result.msg, {icon: 1}) + } else if (result.code === 500) { + layer.alert(result.msg, {icon: 2}) + } + }, function (xhr) { + error(xhr) + }); +} + +// 管理员修改密码 +function resetPwd(id) { + let param = { + 'id': id, + 'type': '1' + } + openIframe2("addOrEditUnifyUser", '修改密码', "password.html", '770px', '400px', param); +} + +/*下拉选表单赋值*/ +function setSelectValue(list, selectName) { + console.log("list",list) + let html = ''; + $.each(list, function (index, item) { + html += ''; + }) + $('#' + selectName).empty().append(html); + layui.form.render(); +} diff --git a/src/main/resources/static/js/tools/toolsMge.js b/src/main/resources/static/js/tools/toolsMge.js index 9552058..dba7b86 100644 --- a/src/main/resources/static/js/tools/toolsMge.js +++ b/src/main/resources/static/js/tools/toolsMge.js @@ -1,46 +1,36 @@ -let form, layer, dtree, table, tableIns; +let form, layer, table, tableIns; let pageNum = 1, limitSize = 10; // 默认第一页，分页数量为10 let orgData,selectOrgId; -layui.config({ - base: "../../js/layui-v2.6.8/dtree/", //此处路径请自行处理, 可以使用绝对路径 -}).extend({ - dtree: 'dtree' -}).use(['form', 'layer', 'table','dtree', 'laydate'], function () { +layui.use(['form', 'layer', 'table', 'laydate'], function () { form = layui.form; layer = layui.layer; table = layui.table; - dtree = layui.dtree; layui.form.render(); - orgData = getOrgTree(); pages(1, 10, 1); - form.on('switch(is-state)', function (obj) { - console.log(obj); - let url = dataUrl + "/users/updateEnableState"; - let params = { - 'id': this.value, - 'state': obj.elem.checked ? 1 : 0 - } - params={ - encryptedData:encryptCBC(JSON.stringify(params)) - } - ajaxRequest(url, "POST", params, true, function () {}, function (result) { - console.log(result) - reloadData(); - if (result.status === 200) { - parent.layer.msg(result.data, {icon: 1}) - } else if (result.status === 204) { - parent.layer.alert(result.msg, {icon: 2}) - } - }, function (xhr) { - error(xhr) - }); - }); + getToolsSelected(); }) + +function getToolsSelected() { + let url = dataUrl + '/tools/all'; + ajaxRequest(url, "POST", null, true, function () { + }, function (result) { + if (result.code === 200) { + setSelectValue(result.data, 'sampleTools'); + // return result.data + } else { + layer.alert(result.msg, {icon: 2}) + } + }, function (xhr) { + error(xhr) + }); +} + + function pages(pageNum, pageSize, typeNum) { let params = getReqParams(pageNum, pageSize, typeNum); - let url = dataUrl + "/users/getList" + let url = dataUrl + "/tools/getList" ajaxRequest(url, "POST", params, true, function () { }, function (result) { console.log(result); @@ -95,21 +85,21 @@ function initTable(dataList, limit, page) { return (page - 1) * limit + d.LAY_INDEX; } }, - {field: "loginName", title: "送样单位", unresize: true, align: "center"}, - {field: "username", title: "送样人", unresize: true, align: "center"}, - {field: "userCode", title: "送样时间", unresize: true, align: "center"}, - {field: "orgName", title: "送样设备", unresize: true, align: "center"}, - {field: "roleName", title: "收样人", unresize: true, align: "center"}, - {field: "phone", title: "收样时间", unresize: true, align: "center"}, - {field: "userType", title: "试验班组", unresize: true, align: "center"}, - {title: "操作", unresize: true, width: 300, align: "center", + {field: "customName", title: "送样单位", unresize: true, align: "center"}, + {field: "sampleUser", title: "送样人", unresize: true, align: "center"}, + {field: "sampleTime", title: "送样时间", unresize: true, align: "center"}, + {field: "sampleTools", title: "送样设备", unresize: true, align: "center"}, + {field: "collectSamplesUser", title: "收样人", unresize: true, align: "center"}, + {field: "collectSamplesTime", title: "收样时间", unresize: true, align: "center"}, + {field: "teamName", title: "试验班组", unresize: true, align: "center"}, + {title: "操作", unresize: true, width: 85, align: "center", templet: function (d) { let html = ''; // let updaetpwd=""; - let del="" - let edit=""; - html=edit+del; + // let del="" + let view=""; + html=view; if(d.delFlag==1){ return ''; } @@ -130,24 +120,25 @@ function initTable(dataList, limit, page) { // 获取参数 function getReqParams(page, limit, type) { + var selectedValue =$('#sampleTools').val() + // 2. 查找对应的选项文本 + var selectedText = $('#sampleTools option[value="' + selectedValue + '"]').text(); + if (selectedText=='请选择'){ + selectedText='' + } let obj = {}; if (!type) { obj = { page: page + "", limit: limit + "", - userName: $('#userName').val(), - phone: $('#phone').val(), - orgId: $('#orgId').val(), - userType: $('#userType').val(), + sampleTools: selectedText, + collectSamplesUser:$('#collectSamplesUser').val() }; } else { obj = { page: '1', limit: '10', - userName: '', - phone:'', - orgId:'', - userType: '', + collectSamplesUser: '' }; } console.log(obj) @@ -191,43 +182,13 @@ function reloadData() { // 新增/修改平台用户 function addData(id) { - let title = '新增用户' if (id) { - title = '修改用户'; + title = '工器具个体管理/详情'; } let param = { 'id': id } - openIframe2("addOrEditUser", title, "child/userForm.html", '1000px', '625px', param); -} - -/*删除用户*/ -function delData(id) { - layer.confirm("确定删除吗？", { - move: false - }, function () { - let loadingMsg = layer.msg('数据删除中,请稍候...', {icon: 16, scrollbar: false, time: 0}); - let url = dataUrl + "/users/delById"; - let params = { - 'id': id - } - params={ - encryptedData:encryptCBC(JSON.stringify(params)) - } - ajaxRequest(url, "POST", params, true, function () { - }, function (result) { - layer.close(loadingMsg); // 关闭提示层 - if (result.code === 200) { - parent.layer.msg(result.msg, {icon: 1}) - query() - } else if (result.code === 500) { - layer.alert(result.msg, {icon: 2}) - } - }, function (xhr) { - layer.close(loadingMsg); // 关闭提示层 - error(xhr) - }); - }) + openIframe2("addOrEditUser", title, "child/toolsForm.html", '100%', '100%', param); } // 启用/停用/解除锁定 @@ -262,47 +223,10 @@ function resetPwd(id) { openIframe2("addOrEditUnifyUser", '修改密码', "password.html", '770px', '400px', param); } -function getOrgTree() { - let data = []; - let url = dataUrl + '/users/getOrg'; - ajaxRequest(url, "POST", null, true, function () { - }, function (result) { - if (result.code === 200) { - console.log(result,"getOrgTree") - data = result.data; - setOrgTree(data) - } else { - layer.alert(result.msg, {icon: 2}) - } - }, function (xhr) { - error(xhr) - }); - return data; -} - -function setOrgTree(data){ - console.log("data",data) - orgTree = dtree.renderSelect({ - elem: "#orgId", - data: data, - dataFormat: "list", - skin: "laySimple", - line: true, // 显示树线 - checkbar: false, //开启复选框 - done: function (data, url, first) { - console.log($('#orgId').val()) - if (first) { - var params = dtree.dataInit("orgId", $('#orgId').val()); - var selectParam = dtree.selectVal("orgId"); - console.log(params) - } - } - }); -} - /*下拉选表单赋值*/ function setSelectValue(list, selectName) { - let html = ''; + console.log("list",list) + let html = ''; $.each(list, function (index, item) { html += ''; }) diff --git a/src/main/resources/static/pages/role/addRole.html b/src/main/resources/static/pages/role/addRole.html index c06cb82..ba1eefb 100644 --- a/src/main/resources/static/pages/role/addRole.html +++ b/src/main/resources/static/pages/role/addRole.html @@ -24,10 +24,9 @@
- +
- +
diff --git a/src/main/resources/static/pages/tools/child/certificateView.html b/src/main/resources/static/pages/tools/child/certificateView.html new file mode 100644 index 0000000..3fb94ef --- /dev/null +++ b/src/main/resources/static/pages/tools/child/certificateView.html @@ -0,0 +1,37 @@ + + + + + + Dynamic Table + + + + + + + + + + + + + + + + + +
序号名称规格型号唯一标识号检验日期下次检验日期试验人员送检单位
+ + + + \ No newline at end of file diff --git a/src/main/resources/static/pages/tools/child/toolsForm.html b/src/main/resources/static/pages/tools/child/toolsForm.html new file mode 100644 index 0000000..fce1b5e --- /dev/null +++ b/src/main/resources/static/pages/tools/child/toolsForm.html @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + 详情 + + +
+
+
+
+ +
+
+ +
+
+ + + + + + + + +
+ +
+
+
+
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/src/main/resources/static/pages/tools/toolsMge.html b/src/main/resources/static/pages/tools/toolsMge.html index a845bdb..3a21ece 100644 --- a/src/main/resources/static/pages/tools/toolsMge.html +++ b/src/main/resources/static/pages/tools/toolsMge.html @@ -9,6 +9,7 @@ + @@ -23,14 +24,14 @@
-
- +
@@ -38,12 +39,12 @@
- + + + + + +
@@ -60,11 +61,5 @@ } - - \ No newline at end of file diff --git a/src/main/resources/static/pages/user/child/userForm.html b/src/main/resources/static/pages/user/child/userForm.html index 1512a9e..0cef09c 100644 --- a/src/main/resources/static/pages/user/child/userForm.html +++ b/src/main/resources/static/pages/user/child/userForm.html @@ -107,31 +107,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - -