From 6167f28734148e7c39a0ef8159a9b62fbe727b4a Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Mon, 15 Dec 2025 15:23:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=AE=9E=E5=90=8D=E5=88=B6-?= =?UTF-8?q?=E6=96=BD=E5=B7=A5=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- smz-web/js/work/basic/commonProblemList.js | 12 +- .../js/work/sysMag/UserOperationHistory.js | 108 +-- smz-web/js/work/sysMag/user.js | 58 +- smz-web/js/work/sysMag/userHistory.js | 4 +- smz-web/pages/menu/addMenu.html | 39 +- smz-web/pages/menu/menuList.html | 82 ++- smz-web/pages/menu/updateMenu.html | 53 +- smz-web/pages/role/addRole.html | 680 +++++++++--------- smz-web/pages/role/roleList.html | 85 ++- .../pages/work/basic/commonProblemForm.html | 4 +- .../pages/work/basic/commonProblemList.html | 32 +- smz-web/pages/work/sysMag/UserHistory.html | 4 +- .../work/sysMag/UserOperationHistory.html | 35 +- smz-web/pages/work/sysMag/addUser.html | 26 +- smz-web/pages/work/sysMag/facePhotoForm.html | 6 +- smz-web/pages/work/sysMag/updateUser.html | 53 +- smz-web/pages/work/sysMag/userList.html | 21 +- 17 files changed, 724 insertions(+), 578 deletions(-) diff --git a/smz-web/js/work/basic/commonProblemList.js b/smz-web/js/work/basic/commonProblemList.js index 415b3cf..80573b9 100644 --- a/smz-web/js/work/basic/commonProblemList.js +++ b/smz-web/js/work/basic/commonProblemList.js @@ -138,8 +138,8 @@ function init() { * 新增页面 * */ function addCommonProblem() { - var height = '525px'; - var width = '925px'; + var height = '75%'; + var width = '75%'; var index = layer.open({ title: ['新增','color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, @@ -172,7 +172,7 @@ function buttonEdits(id, permission, pers) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } @@ -187,8 +187,8 @@ function edit(id) { data: {"id": id}, dataType: 'json', success: function (data) { - var height = '85%'; - var width = '85%'; + var height = '75%'; + var width = '75%'; var index = layer.open({ title: ['修改', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, @@ -222,7 +222,7 @@ function buttonDel(id,permission, pers) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); diff --git a/smz-web/js/work/sysMag/UserOperationHistory.js b/smz-web/js/work/sysMag/UserOperationHistory.js index 7f8ad75..67d0424 100644 --- a/smz-web/js/work/sysMag/UserOperationHistory.js +++ b/smz-web/js/work/sysMag/UserOperationHistory.js @@ -8,94 +8,22 @@ layui.use(['laydate','form','layer'], function () { var laydate = layui.laydate; pers = checkPermission(); - var minListDate = $('#hidMinListDate').val();//最小可选时间，例：1990-02-01 - var maxListDate = $('#hidMaxListDate').val();//最大可选时间，例：2200-12-31 - $('#startTime').val(getNowTime()); - $('#endTime').val(getNowTime()); - var begin = "#startTime", end = "#endTime";//开始时间选择框、结束时间选择框：文本框 - var endChange = function (val, date) { - if (date && date.year) - begindate.config.max = { - year: date.year, - month: date.month - 1,//必须减1才是正确值 - date: date.date, - hours: date.hours, - minutes: date.minutes, - seconds: date.seconds - }; - else { - var dateInit = new Date(maxListDate.replace(/-/g, "/")); - begindate.config.max = { - year: dateInit.getFullYear(), - month: dateInit.getMonth(), - date: dateInit.getDate(), - hours: dateInit.getHours(), - minutes: dateInit.getMinutes(), - seconds: dateInit.getSeconds() - }; - } - }; - var beginChange = function (val, date) { - if (date && date.year) - enddate.config.min = { - year: date.year, - month: date.month - 1, - date: date.date, - hours: date.hours, - minutes: date.minutes, - seconds: date.seconds - }; - else { - var dateInit = new Date(minListDate.replace(/-/g, "/")); - enddate.config.min = { - year: dateInit.getFullYear(), - month: dateInit.getMonth(), - date: dateInit.getDate(), - hours: dateInit.getHours(), - minutes: dateInit.getMinutes(), - seconds: dateInit.getSeconds() - }; - } - }; - var enddate = laydate.render({ - elem: end, - format: 'yyyy-MM-dd', - min: minListDate, - max: maxListDate, - done: endChange - }); - var begindate = laydate.render({ - elem: begin, - format: 'yyyy-MM-dd', - min: minListDate, - max: maxListDate, - done: beginChange - }); - $("#searchBt").click(function () { - var startTime = $("#startTime").val(); - var endTime = $("#endTime").val(); - var dateStart = new Date(startTime); - var dateEnd = new Date(endTime); - var difValue = (dateEnd - dateStart) / (1000 * 60 * 60 * 24); - if ((startTime == '' && endTime != '') || (startTime != '' && endTime == '')) { - return top.layer.msg('时间填写不完整', { - icon: 2, - time: 2000 //2秒关闭（如果不配置，默认是3秒） - }); - } - var startDateTemp = startTime.split("-"); - var endDateTemp = endTime.split("-"); - var allStartDate = new Date(startDateTemp[0], startDateTemp[1], startDateTemp[2]); - var allEndDate = new Date(endDateTemp[0], endDateTemp[1], endDateTemp[2]); - if (allStartDate.getTime() > allEndDate.getTime()) { - return top.layer.msg('时间选择不合理，请重新选择', { - icon: 2, - time: 2000 //2秒关闭（如果不配置，默认是3秒） - }); - } + var today = getNowTime(); // 假设你的 getNowTime() 返回 'yyyy-MM-dd' 格式 + $('#test6').val(today + ' - ' + today); + laydate.render({ + elem: '#test6', + range: true, + min: $('#hidMinListDate').val(), + max: $('#hidMaxListDate').val() }); + init(); + $("#searchBt").click(function () { + var dateRange = $.trim($('#test6').val()); + if (!dateRange) { + return layer.msg('请选择日期范围', { icon: 2, time: 2000 }); + } example.ajax.reload(); }); }); @@ -124,10 +52,14 @@ function init() { "url": smz_ht_url + "/userHistory/operationLog", "type": "post", "data": function (d) { + var dateRange = $.trim($('#test6').val()); + var parts = dateRange.split(' - '); + var startTime = parts[0]; + var endTime = parts[1]; d.module = $("#module").val(); d.keyWord = $("#keyWord").val().trim();//关键字部分，查询功能 - d.startTime = $("#startTime").val(); - d.endTime = $("#endTime").val(); + d.startTime = startTime; + d.endTime = endTime; }, "error": function (xhr, textStatus, errorThrown) { var msg = xhr.responseText; @@ -254,4 +186,4 @@ function getPartialRemarksHtml(remarks){ //全部备注信息 function getTotalRemarksHtml(remarks){ return remarks + '  收起'; -} \ No newline at end of file +} diff --git a/smz-web/js/work/sysMag/user.js b/smz-web/js/work/sysMag/user.js index a27de0d..1ccede8 100644 --- a/smz-web/js/work/sysMag/user.js +++ b/smz-web/js/work/sysMag/user.js @@ -51,19 +51,23 @@ var example; // 新增 function adds(){ listUser(); - location.href = "addUser.html"; + var height = '75%'; + var width = '75%'; + var index = layer.open({ + title: ['新增', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], + type: 2, + content: 'addUser.html', + area: [width, height], + maxmin: false, + }); } function listUser() { - // var orgIdUser = $("#orgId").val(); var proIdUser = $("#proId").val(); var examineStatusUser = $("#examineStatus").val(); var usernameUser = $("#username").val(); var phoneUser = $("#phone").val(); var keyWordUser = $("#keyWord").val(); - - - // localStorage.setItem("orgIdUser",orgIdUser); localStorage.setItem("proIdUser",proIdUser); localStorage.setItem("examineStatusUser",examineStatusUser); localStorage.setItem("usernameUser",usernameUser); @@ -281,15 +285,15 @@ function init() { }else{ if (examineStatus == 0) { var audit = buttonAudit(id,phone,userName, "", pers); - var href = encodeURI("updateUser.html?id=" + id + "&status=" + status + "&proId=" + proId + "&proName=" + proName + "&companyName=" +companyName); - var edit = buttonEdit(href, "", pers); + // var href = encodeURI("updateUser.html?id=" + id + "&status=" + status + "&proId=" + proId + "&proName=" + proName + "&companyName=" +companyName); + var edit = buttonEdit(id, "", pers); var del = buttonDel(id, "", pers); var update = buttonEdits(id, "sys:user:password", pers); var updatePhone = buttonEditsUser(id, "sys:user:admin", pers); return audit + edit + del + update + updatePhone; }else if (examineStatus == 1) { - var href = encodeURI("updateUser.html?id=" + id + "&status=" + status + "&proId=" + proId + "&proName=" + proName +"&companyName=" +companyName); - var edit = buttonEdit(href, "", pers); + // var href = encodeURI("updateUser.html?id=" + id + "&status=" + status + "&proId=" + proId + "&proName=" + proName +"&companyName=" +companyName); + var edit = buttonEdit(id, "", pers); var del = buttonDel(id, "", pers); var update = buttonEdits(id, "sys:user:password", pers); var updatePhone = buttonEditsUser(id, "sys:user:admin", pers); @@ -313,7 +317,7 @@ function buttonAudit(id,phone,userName, permission, pers) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } @@ -324,8 +328,8 @@ function audit(id,phone,userName) { localStorage.setItem("id",id) localStorage.setItem("phone",phone) localStorage.setItem("userName",userName) - var height = '100%'; - var width = '100%'; + var height = '75%'; + var width = '75%'; var index = layer.open({ title: ['审核', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, @@ -388,25 +392,35 @@ function buttonDel(id, permission, pers){ return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } // 修改按钮 -function buttonEdit(href, permission, pers){ +function buttonEdit(id, permission, pers){ if(permission != ""){ if ($.inArray(permission, pers) < 0) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } -function update(href){ +function update(id){ listUser(); - window.location=href; + localStorage.setItem("editId",id) + var height = '75%'; + var width = '75%'; + var index = layer.open({ + title: ['编辑', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], + type: 2, + content: 'updateUser.html', + area: [width, height], + maxmin: false, + }); + } // 密码按钮 @@ -416,7 +430,7 @@ function buttonEdits(id, permission, pers) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } //照片查看 @@ -432,8 +446,8 @@ function photoView(id) { localStorage.setItem("collectTime", data.collectTime); localStorage.setItem("userName", data.userName); localStorage.setItem("phone", data.phone); - var height = '585px'; - var width = '675px'; + var height = '75%'; + var width = '75%'; var index = layer.open({ title: ['查看图片','color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, @@ -479,7 +493,7 @@ function buttonEditsUser(id, permission, pers) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } @@ -558,4 +572,4 @@ function getProjectUser() { form.render(); } }) -} \ No newline at end of file +} diff --git a/smz-web/js/work/sysMag/userHistory.js b/smz-web/js/work/sysMag/userHistory.js index bb8f82e..2cb1107 100644 --- a/smz-web/js/work/sysMag/userHistory.js +++ b/smz-web/js/work/sysMag/userHistory.js @@ -143,6 +143,6 @@ function buttonDel(data, permission, pers) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); -} \ No newline at end of file +} diff --git a/smz-web/pages/menu/addMenu.html b/smz-web/pages/menu/addMenu.html index 7baadbf..29ec49b 100644 --- a/smz-web/pages/menu/addMenu.html +++ b/smz-web/pages/menu/addMenu.html @@ -4,9 +4,12 @@ + - -
+ +
@@ -75,9 +78,9 @@
- +
@@ -99,10 +102,10 @@ layui.use('layer', function(){ var layer = layui.layer; }); - - + + initParentMenuSelect(); - + function add() { $('#form').bootstrapValidator(); var bootstrapValidator = $("#form").data('bootstrapValidator'); @@ -110,22 +113,22 @@ if(!bootstrapValidator.isValid()){ return; } - + var formdata = $("#form").serializeObject(); $.ajax({ type : 'post', url : smz_ht_url + '/permissions', - contentType: "application/json; charset=utf-8", + contentType: "application/json; charset=utf-8", data : JSON.stringify(formdata), success : function(data) { layer.msg("添加成功", {shift: -1, time: 1000}, function(){ - location.href = smz_ht_url + "/pages/menu/menuList.html"; + setTimeout("reloading()", 2100); }); } }); } - + function selectCss(){ layer.open({ type: 2, @@ -136,6 +139,18 @@ content: ['icon.html'] }); } + + //设置弹窗关闭 + function reloading() { + var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 + parent.layer.close(index); //再执行关闭 + window.parent.refreshMenuList(); + } + + function cancel(){ + var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 + parent.layer.close(index); //再执行关闭 + } - \ No newline at end of file + diff --git a/smz-web/pages/menu/menuList.html b/smz-web/pages/menu/menuList.html index 252c1f9..e845006 100644 --- a/smz-web/pages/menu/menuList.html +++ b/smz-web/pages/menu/menuList.html @@ -17,24 +17,24 @@ - - - +
- +
- + - - + + @@ -63,7 +63,7 @@ function initMenuList(){ $.ajax({ type : 'get', url : smz_ht_url + '/permissions', - //contentType: "application/json; charset=utf-8", + //contentType: "application/json; charset=utf-8", async:false, success : function(data) { var length = data.length; @@ -80,20 +80,20 @@ function initMenuList(){ } var td2 = ""; tr += td2; - + var permission = d['permission']; if(permission == null){ permission = ""; } - + var td3 = ""; tr += td3; - + var sort = d['sort']; if(sort == 0){ sort = ""; } - + var td4 = ""; tr += td4; @@ -106,8 +106,7 @@ function initMenuList(){ tr += td5; var id = d['id']; - var href = smz_ht_url + "/pages/menu/updateMenu.html?id=" + id; - var edit = buttonEdit(href, "sys:menu:add", pers); + var edit = buttonEdit(id, "sys:menu:add", pers); var del = buttonDel(id, "sys:menu:del", pers); tr += ""; tr += "" @@ -121,6 +120,27 @@ layui.use('layer', function(){ var layer = layui.layer; }); +function buttonDel(data, permission, pers){ + if(permission != ""){ + if ($.inArray(permission, pers) < 0) { + return ""; + } + } + + var btn = $(""); + return btn.prop("outerHTML"); +} + +function buttonEdit(id, permission, pers){ + if(permission != ""){ + if ($.inArray(permission, pers) < 0) { + return ""; + } + } + var btn = $(""); + return btn.prop("outerHTML"); +} + function del(id){ layer.confirm('确定要删除吗？', { btn : [ '确定', '取消' ] @@ -152,4 +172,34 @@ function del(id){ }; $("#dt-table").treetable(option); - \ No newline at end of file + + function addMenu(){ + var height = '97.5%'; + var width = '97.5%'; + var index = layer.open({ + title: ['新增', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], + type: 2, + content: 'addMenu.html', + area: [width, height], + maxmin: false, + }); + } + + function edit(id){ + localStorage.setItem("menuId", id) + var height = '97.5%'; + var width = '97.5%'; + var index = layer.open({ + title: ['编辑', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], + type: 2, + content: 'updateMenu.html', + area: [width, height], + maxmin: false, + }); + } + + function refreshMenuList(){ + location.reload(); + } + + diff --git a/smz-web/pages/menu/updateMenu.html b/smz-web/pages/menu/updateMenu.html index e6ccfad..c1a08da 100644 --- a/smz-web/pages/menu/updateMenu.html +++ b/smz-web/pages/menu/updateMenu.html @@ -4,9 +4,12 @@ + -
+
@@ -56,7 +59,7 @@
-
@@ -71,15 +74,13 @@
-
T - +
- - +
@@ -101,11 +102,11 @@ layui.use('layer', function(){ var layer = layui.layer; }); - + initParentMenuSelect(); - var id = getUrlParam("id"); + var id =localStorage.getItem("menuId"); initData(); - + function initData(){ if(id != ""){ $.ajax({ @@ -123,17 +124,17 @@ $("#permission").val(data.permission); $("#sort").val(data.sort); $("#permissionType").val(data.permissionType); - + if(css != ""){ $("#cssImg").addClass("fa"); $("#cssImg").addClass(css); } } }); - + } } - + function selectCss(){ layer.open({ type: 2, @@ -144,35 +145,47 @@ content: ['icon.html'] }); } - + function update() { if($("#parentId").val() == id){ layer.msg("父级菜单不能是自己"); return; } - + $('#form').bootstrapValidator(); var bootstrapValidator = $("#form").data('bootstrapValidator'); bootstrapValidator.validate(); if(!bootstrapValidator.isValid()){ return; } - + var formdata = $("#form").serializeObject(); formdata.id = id; $.ajax({ type : 'put', url : smz_ht_url + '/permissions/', - contentType: "application/json; charset=utf-8", + contentType: "application/json; charset=utf-8", data : JSON.stringify(formdata), success : function(data) { layer.msg("修改成功", {shift: -1, time: 1000}, function(){ - location.href = smz_ht_url + "/pages/menu/menuList.html"; + setTimeout("reloading()", 2100); }); } }); } - + + //设置弹窗关闭 + function reloading() { + var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 + parent.layer.close(index); //再执行关闭 + window.parent.refreshMenuList(); + } + + function cancel(){ + var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 + parent.layer.close(index); //再执行关闭 + } + - \ No newline at end of file + diff --git a/smz-web/pages/role/addRole.html b/smz-web/pages/role/addRole.html index 0e44af8..1297b76 100644 --- a/smz-web/pages/role/addRole.html +++ b/smz-web/pages/role/addRole.html @@ -1,370 +1,396 @@ - - - - - - + + + + + + -
- -
- - - - - - - - - +
+ +
+ + + + + + + + + -
- +
+ -
- -
+
+ +
-
+
-
- -
- -
- -
+
+ +
+ +
+ +
-
- -
- -
-
+
+ +
+ +
+
-
- - -
+
+ + +
-
- -
- - - - -
-
+
+ +
+ + + + +
+
-
- -
- -
-
-
- -
-
    -
      -
      -
      +
      + +
      + +
      +
      +
      + +
      +
        +
          +
          +
          -
          -
          -
          - - -
          -
          -
          +
          +
          +
          + + +
          +
          +
          -
          - +
          +
          - - - - - - - - - - - - + + + + + + + + + + + + } + }); + } + + //获取注册按钮 + function findCheck() { + var check = document.getElementById("checkInput"); + if (check.checked) { + return "1"; + } else { + return "0"; + } + } + + + //设置弹窗关闭 + function reloading() { + var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 + parent.layer.close(index); //再执行关闭 + window.parent.example.ajax.reload(null, false); // 刷新页面 + } + + function cancel() { + var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 + parent.layer.close(index); //再执行关闭 + } + - \ No newline at end of file + diff --git a/smz-web/pages/role/roleList.html b/smz-web/pages/role/roleList.html index 464a9ee..f585b6b 100644 --- a/smz-web/pages/role/roleList.html +++ b/smz-web/pages/role/roleList.html @@ -33,24 +33,30 @@
          - +
          名称 idhrefpermissionhrefpermission sort 资源类型 操作" + href +"" + permission +"" + sort +""+edit + del+"
          - - - +
          + +
          + + +
          +
          + +
          - +
          - + @@ -84,13 +90,13 @@ var pers = checkPermission(); var example; function init(){ - example = + example = $('#dt-table').DataTable({ "searching": false, "processing": false, "serverSide" : true, "language": { - "url": contentPath + "/js/plugin/datatables/Chinese.lang" + "url": contentPath + "/smz-web/js/plugin/datatables/Chinese.lang" }, "ajax": { "url" : smz_ht_url + "/roles", @@ -187,14 +193,14 @@ function init(){ { "data": "status", "orderable": false, "defaultContent": ""}, { "data": "updateTime", "defaultContent": ""}, - { - "data": "", + { + "data": "", "defaultContent": "", "orderable":false, "render": function (data, type, row) { var id = row['id']; - var href = smz_ht_url + "/pages/role/addRole.html?id=" + id; - var edit = buttonEdit(href, "sys:role:add", pers); + // var href = smz_ht_url + "/pages/role/addRole.html?id=" + id; + var edit = buttonEdit(id, "sys:role:add", pers); var del = buttonDel(id, "sys:role:del", pers); return edit + del; } @@ -208,6 +214,27 @@ layui.use('layer', function(){ var layer = layui.layer; }); +function buttonDel(data, permission, pers){ + if(permission != ""){ + if ($.inArray(permission, pers) < 0) { + return ""; + } + } + + var btn = $(""); + return btn.prop("outerHTML"); +} + +function buttonEdit(id, permission, pers){ + if(permission != ""){ + if ($.inArray(permission, pers) < 0) { + return ""; + } + } + var btn = $(""); + return btn.prop("outerHTML"); +} + function del(id){ layer.confirm('确定要删除吗？', { btn : [ '确定', '取消' ] @@ -220,7 +247,7 @@ function del(id){ layer.msg("删除成功"); } }); - + layer.close(1); }); } @@ -229,5 +256,31 @@ $("#searchBt").click(function(){ example.ajax.reload(); }); +function edit(id){ + localStorage.setItem("roleId", id) + var height = '97.5%'; + var width = '97.5%'; + var index = layer.open({ + title: ['编辑', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], + type: 2, + content: 'addRole.html', + area: [width, height], + maxmin: false, + }); +} + +function addRole(){ + localStorage.setItem("roleId", "") + var height = '97.5%'; + var width = '97.5%'; + var index = layer.open({ + title: ['新增', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], + type: 2, + content: 'addRole.html', + area: [width, height], + maxmin: false, + }); +} + init(); - \ No newline at end of file + diff --git a/smz-web/pages/work/basic/commonProblemForm.html b/smz-web/pages/work/basic/commonProblemForm.html index 1d05dca..b3928d7 100644 --- a/smz-web/pages/work/basic/commonProblemForm.html +++ b/smz-web/pages/work/basic/commonProblemForm.html @@ -7,7 +7,7 @@ -
          +
          @@ -63,4 +63,4 @@ - \ No newline at end of file + diff --git a/smz-web/pages/work/basic/commonProblemList.html b/smz-web/pages/work/basic/commonProblemList.html index 9587f64..a14b787 100644 --- a/smz-web/pages/work/basic/commonProblemList.html +++ b/smz-web/pages/work/basic/commonProblemList.html @@ -24,21 +24,23 @@
          - - - - - - -
          + +
          + + + + + + + +
          公司名称 角色名称
          @@ -49,7 +51,7 @@
          - + @@ -78,4 +80,4 @@ - \ No newline at end of file + diff --git a/smz-web/pages/work/sysMag/UserHistory.html b/smz-web/pages/work/sysMag/UserHistory.html index 2040089..cae2d11 100644 --- a/smz-web/pages/work/sysMag/UserHistory.html +++ b/smz-web/pages/work/sysMag/UserHistory.html @@ -20,7 +20,7 @@
          @@ -34,7 +34,7 @@
          序号 子系统
          - + diff --git a/smz-web/pages/work/sysMag/UserOperationHistory.html b/smz-web/pages/work/sysMag/UserOperationHistory.html index a3e9b15..a1cc66b 100644 --- a/smz-web/pages/work/sysMag/UserOperationHistory.html +++ b/smz-web/pages/work/sysMag/UserOperationHistory.html @@ -6,7 +6,7 @@ - +
          @@ -18,15 +18,28 @@
          @@ -39,7 +52,7 @@
          序号 用户编号
          - 模块： - - - - ~ - -   - - +
          + +
          +
          + +
          + + +
          + + + +
          + +
          - + diff --git a/smz-web/pages/work/sysMag/addUser.html b/smz-web/pages/work/sysMag/addUser.html index 13db168..06b6a5b 100644 --- a/smz-web/pages/work/sysMag/addUser.html +++ b/smz-web/pages/work/sysMag/addUser.html @@ -19,7 +19,7 @@ } - +
          @@ -114,7 +114,7 @@
          - + @@ -252,7 +252,9 @@ data: JSON.stringify(formdata), success: function (data) { layer.msg("添加成功", {shift: -1, time: 1000}, function () { - location.href = "userList.html"; + // location.href = "userList.html"; + + setTimeout("reloading()", 2100); }); } }); @@ -520,8 +522,8 @@ } }); } - - + + function querys() { var idNumber = $("#idNumber").val(); var roles = $("#roles").val(); @@ -570,6 +572,18 @@ } }) } + + //设置弹窗关闭 + function reloading() { + var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 + parent.layer.close(index); //再执行关闭 + window.parent.example.ajax.reload( null, false ); // 刷新页面 + } + + function cancel(){ + var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 + parent.layer.close(index); //再执行关闭 + } - \ No newline at end of file + diff --git a/smz-web/pages/work/sysMag/facePhotoForm.html b/smz-web/pages/work/sysMag/facePhotoForm.html index 543ea58..39e753e 100644 --- a/smz-web/pages/work/sysMag/facePhotoForm.html +++ b/smz-web/pages/work/sysMag/facePhotoForm.html @@ -137,7 +137,9 @@ $(function() { $("#userName").val(userName); $("#phone").val(phone); - $("#collectTime").val(collectTime); + if(collectTime!="null"){ + $("#collectTime").val(collectTime); + } if(facePhoto!="null"){ getFacePhoto(facePhoto); }else{ @@ -167,4 +169,4 @@ $("#dowebok").append(html); } } - \ No newline at end of file + diff --git a/smz-web/pages/work/sysMag/updateUser.html b/smz-web/pages/work/sysMag/updateUser.html index f9cbbff..50cb12c 100644 --- a/smz-web/pages/work/sysMag/updateUser.html +++ b/smz-web/pages/work/sysMag/updateUser.html @@ -19,7 +19,7 @@ } - +
          @@ -114,7 +114,7 @@
          - + @@ -139,17 +139,8 @@ - \ No newline at end of file + diff --git a/smz-web/pages/work/sysMag/userList.html b/smz-web/pages/work/sysMag/userList.html index f2881aa..0748615 100644 --- a/smz-web/pages/work/sysMag/userList.html +++ b/smz-web/pages/work/sysMag/userList.html @@ -59,7 +59,7 @@
          -
          +
          @@ -93,25 +93,26 @@
          - - + +
          +
          + +
          序号 操作人
          - +
          - - - + @@ -153,4 +154,4 @@ \ No newline at end of file +
          序号 用户名