diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/bizupgrade.js b/hg-monitor-web-base/src/main/resources/static/src/controller/bizupgrade.js index 20d255a..3297736 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/bizupgrade.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/bizupgrade.js @@ -241,7 +241,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) { var manufacturerName = ''; if(d.manufacturerId == '0'){ - manufacturerName = d.manufacturerOther; + manufacturerName = '其他'; }else { if(manufactureArr && manufactureArr.length>0){ $.each(manufactureArr, function (i, v) { @@ -298,7 +298,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat common.openWin('machineroom/bizupgradeAdd', title, {id: id}, ['保存', '取消'], function f() { $("#bizupgrade-form-save-id").trigger("click"); reloadAllChange(); - },null,null,null,{end: reloadAllChange()}) + },null,null,null,{end: function () { + reloadAllChange(); + }}) } //查看附件/调整信息列表 diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/deviceAdd.js b/hg-monitor-web-base/src/main/resources/static/src/controller/deviceAdd.js index c881065..31517b4 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/deviceAdd.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/deviceAdd.js @@ -110,6 +110,22 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' time: 1000, }, function () { layer.closeAll() + table.reload('enterdevice_table_id', { + where: { + accessToken: accessToken, + createtime: "month", + viewMode: 'true', + dateLimit: "" + }, + }); + table.reload('fitting-table', { + where: { + accessToken: accessToken, + createtime: "month", + viewMode: 'true', + dateLimit: "" + }, + }); }) } else { layer.msg(res.msg, { diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/devicehitch.js b/hg-monitor-web-base/src/main/resources/static/src/controller/devicehitch.js index 8b22c1c..fd9a5ee 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/devicehitch.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/devicehitch.js @@ -207,7 +207,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat common.openWin('machineroom/devicehitchAdd', title, {id: id}, ['保存', '取消'], function f(){ $("#devicehitch-form-save-id").trigger("click"); reloadAllChange(); - },null,null,null,{end: reloadAllChange()}) + },null,null,null,{end: function () { + reloadAllChange(); + }}) } //查看附件/调整信息列表 diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/emergency.js b/hg-monitor-web-base/src/main/resources/static/src/controller/emergency.js index 206ea24..60cf6cb 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/emergency.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/emergency.js @@ -334,7 +334,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat common.openWin('emergency/add', title, {id: id}, ['保存', '取消'], function f() { $("#emergency-form-save-id").trigger("click"); reloadAllChange(); - },null,null,null,{end: reloadAllChange()}) + },null,null,null,{end: function () { + reloadAllChange(); + }}) } //查看附件/调整信息列表 diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/enterDevice.js b/hg-monitor-web-base/src/main/resources/static/src/controller/enterDevice.js index 18a024b..b090cd8 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/enterDevice.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/enterDevice.js @@ -375,7 +375,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat common.openWin('machineroom/deviceAdd', title, {id: id}, ['保存', '取消'], function f() { $("#device-form-save-id").trigger("click"); reloadAllChange(); - }, null, null, null, {end: reloadAllChange()}) + }, null, null, null, {end: function () { + reloadAllChange(); + }}) } //查看更换配件列表 diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/enterStaff.js b/hg-monitor-web-base/src/main/resources/static/src/controller/enterStaff.js index 3904242..425cdec 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/enterStaff.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/enterStaff.js @@ -227,8 +227,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat var title = id ? '编辑' : '新增' common.openWin('machineroom/staffAdd', title, {id: id}, ['保存', '取消'], function f() { $("#staff-form-save-id").trigger("click"); - reloadAllChange(); - },null,null,null,{end: reloadAllChange()}) + },null,['90%', '90%'],null,{end: function () { + reloadAllChange(); + }}) } //查看附件/接收人列表 diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/extra.js b/hg-monitor-web-base/src/main/resources/static/src/controller/extra.js index 308556f..0b8f267 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/extra.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/extra.js @@ -195,7 +195,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat common.openWin('machineroom/extraAdd', title, {id: id}, ['保存', '取消'], function f(){ $("#extra-form-save-id").trigger("click"); reloadAllChange(); - },null,null,null,{end: reloadAllChange()}) + },null,null,null,{end: function () { + reloadAllChange(); + }}) } //查看附件/调整信息列表 diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/meetingApply.js b/hg-monitor-web-base/src/main/resources/static/src/controller/meetingApply.js index 203688a..c9f232e 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/meetingApply.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/meetingApply.js @@ -161,8 +161,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat common.openWin('machineroom/meetingApplyAdd', title, {id: id}, ['保存', '取消'], function f(){ $("#meetingApply-form-save-id").trigger("click"); form.render(); - reloadAllChange(); - },null,null,null,{end: reloadAllChange()}) + },null,null,null,{end: function () { + reloadAllChange(); + }}) } //查看附件/调整信息列表 diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/recoveryverify.js b/hg-monitor-web-base/src/main/resources/static/src/controller/recoveryverify.js index 0814467..22e64ce 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/recoveryverify.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/recoveryverify.js @@ -211,7 +211,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat common.openWin('recoveryverify/add', title, {id: id}, ['保存', '取消'], function f() { $("#recoveryverify-form-save-id").trigger("click"); reloadAllChange(); - },null,null,null,{end: reloadAllChange()}) + },null,null,null,{end: function () { + reloadAllChange(); + }}) } //查看附件/调整信息列表 diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/recoveryverifyAdd.js b/hg-monitor-web-base/src/main/resources/static/src/controller/recoveryverifyAdd.js index f2009be..dd1325f 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/recoveryverifyAdd.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/recoveryverifyAdd.js @@ -481,7 +481,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi '<td>' + v.databaseVersion + '</td>' + '<td><input type="button" value="修改" class="update" style="background-color: #af5f00;line-height: 18px"/></td>' + '</tr>' - }) + }); $("#device-table").append(tr); $("#table-device :button.update").click(function () { var toEdit = this.value == '修改'; diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/routeAdjust.js b/hg-monitor-web-base/src/main/resources/static/src/controller/routeAdjust.js index cb54379..63bde71 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/routeAdjust.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/routeAdjust.js @@ -166,7 +166,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat common.openWin('machineroom/routeAdjustAdd', title, {id: id}, ['保存', '取消'], function f() { $("#routeAdjust-form-save-id").trigger("click"); reloadAllChange(); - },null,null,null,{end: reloadAllChange()}) + },null,null,null,{end: function () { + reloadAllChange(); + }}) } //查看附件/调整信息列表 diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/staffAdd.js b/hg-monitor-web-base/src/main/resources/static/src/controller/staffAdd.js index 338e352..d4117c9 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/staffAdd.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/staffAdd.js @@ -62,12 +62,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi contentType: "application/json; charset=utf-8", done: function (res) { if (res.success) { - layer.msg("操作成功", { + layer.msg(res.msg, { offset: '15px', icon: 1, time: 1000, }, function () { layer.closeAll() + table.reload('table-staff-view', { + where: { + accessToken: accessToken, + createtime: "month", + viewMode: 'true', + dateLimit: "" + }, + }); }) } else { layer.msg(res.msg, { @@ -94,28 +102,32 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi $("#table-identifying :button.edit").click(function () { var toEdit = this.value == '保存'; - this.value = toEdit ? '删除' : '保存'; - var tdArr = [] + var tdArr = []; var tr = $(this).closest('tr'); $(this).closest('tr').find('td').not(':last').each(function (t, index) { if (toEdit) { - this.innerHTML = this.firstChild.value.replace(/</g, '<').replace(/>/g, '>'); - if(this.innerHTML=='' || this.innerHTML == undefined){ - layer.msg('请填写完整', { - icon: 7, time: 3000 - }); - tdArr = []; - saveCount-=1; - $(this).closest('tr').remove(); - return; - } - tdArr.push(this.innerHTML); + if($(this).find('input').eq(0).val()!='' && $(this).find('input').eq(0).val()!=undefined ) { + this.innerHTML = this.firstChild.value.replace(/</g, '<').replace(/>/g, '>'); + if (this.innerHTML == '' || this.innerHTML == undefined) { + layer.msg('请填写完整', { + icon: 7, time: 3000 + }); + //tdArr = []; + //saveCount-=1; + //$(this).closest('tr').remove(); + //return; + } else { + tdArr.push(this.innerHTML); + } + }else { + tdArr.push(''); + toEdit = '保存'; + } } }) if(!toEdit){ layer.confirm('确认要删除吗?', {icon: 3,yes: function (index, layero) { var name = tr.find('td')[0].innerHTML; - console.log(name); if (name != '' && name != undefined) { for (let i = 0; i < staffsBak.length; i++) { if (staffsBak[i].userName == name) { @@ -139,21 +151,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi if(tdArr[1]!=''&& tdArr[1]!=undefined){ var resdata = commonDetail.validatorPhone(tdArr[1]); if(resdata.code==-1){ - layer.confirm(resdata.msg+'确认要删除吗?', { - icon: 3, yes: function (index, layero) { - layer.load(2); - tdArr = []; - staffObj ={}; - tr.remove(); - layer.closeAll('loading'); - layer.close(index) - - return - }, cancel: function (index, layero) { - staffObj.phone = tdArr[1] - layer.close(index); - } + layer.msg(resdata.msg+'请重新核对填写', { + icon: 3 }); + var html = '<input class="layui-input" type="text" value="' + tr.find('td').eq(1).text().replace(/"/g, '"').replace(/<\/?.+?>/g, '').replace(/ /g, '') + '"/>'; + tr.find('td').eq(1).html(html); + toEdit = '保存'; + staffObj.phone =undefined; }else { staffObj.phone = tdArr[1] } @@ -161,27 +165,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi if(tdArr[2]!=''&& tdArr[2]!=undefined){ var res = commonDetail.validatorIDCard(tdArr[2]); if(res.code==-1){ - layer.confirm(res.msg+'确认要删除吗?', {icon: 3,yes: function (index, layero) { - layer.load(2); - tdArr = []; - staffObj={}; - tr.remove(); - layer.closeAll('loading'); - layer.close(index); - - return - },cancel: function (index, layero) { - staffObj.idCard = tdArr[2] - layer.close(index); - } + layer.msg(res.msg+'请重新核对填写', {icon: 3, }); + var html = '<input class="layui-input" type="text" value="' + tr.find('td').eq(2).text().replace(/"/g, '"').replace(/<\/?.+?>/g, '').replace(/ /g, '') + '"/>'; + tr.find('td').eq(2).html(html); + toEdit = '保存'; + staffObj.idCard = undefined; }else { staffObj.idCard = tdArr[2] } } saveCount-=1; if(staffObj.phone && staffObj.idCard) { - staffsBak.push(staffObj) + staffsBak.push(staffObj); + this.value = toEdit ? '删除' : '保存'; } } diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/workReportIndex.js b/hg-monitor-web-base/src/main/resources/static/src/controller/workReportIndex.js index 350ca3f..6b4a9e7 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/workReportIndex.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/workReportIndex.js @@ -41,7 +41,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function $("#createTimeBtn button").removeClass("active"); $(this).addClass("active"); createTime = ($(this).data("period")) - //reloadWorkReportTable(); + reloadWorkReportTable(); }); //渲染表单元素 @@ -91,7 +91,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function cols: [[ {type: 'checkbox'}, { - field: 'repType', title: '汇报类型', align: 'center', width: 150, + field: 'repType', title: '汇报类型', align: 'center', templet: function (d) { var typeName = '' switch (d.repType) { @@ -109,15 +109,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function } }, { - field: 'repTitle', title: '标题', align: 'center', minWith: 300, + field: 'repTitle', title: '标题', align: 'center', templet: '<div><span data-id="{{d.id}}" data-rep="{{d.repType}}" class="layui-table-link view-workReport-title">{{d.repTitle}}</span></div>' }, { - field: 'attachmentList', title: '附件数量', align: 'center', width: 120, + field: 'attachmentList', title: '附件数量', align: 'center', templet: '<div><span data-id="{{d.id}}" class="layui-table-link view-workReport-attachment">{{d.attachmentList.length}}</span></div>' }, { - field: 'reportUserList', title: '已读/接收人数', align: 'center', minWith: 150, + field: 'reportUserList', title: '已读/接收人数', align: 'center', templet: function (d) { var str = '' var count = 0 @@ -131,7 +131,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function } }, { - field: 'reportUserList', title: '已读人员', align: 'center', minWith: 400, + field: 'reportUserList', title: '已读人员', align: 'center', templet: function (d) { var userName = [] var str = '' @@ -147,13 +147,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function } }, { - field: 'createUserNickName', title: '创建人', align: 'center', minWith: 150, + field: 'createUserNickName', title: '创建人', align: 'center', }, { - field: 'createTime', title: '上报时间', align: 'center', minWith: 150, + field: 'createTime', title: '上报时间', align: 'center', }, { - title: '操作', align: "center", width: 120, + title: '操作', align: "center", templet: '<div><span data-id="{{d.id}}" class="layui-table-link delete-workReport-btn">删除</span></div>' } ]], diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/workReportView.js b/hg-monitor-web-base/src/main/resources/static/src/controller/workReportView.js index 8f9501d..5b84d06 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/workReportView.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/workReportView.js @@ -218,7 +218,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat return typeName } }, { - field: 'repTitle', title: '标题', align: 'center', minWidth: 200, event: 'serRead', + field: 'repTitle', title: '标题', align: 'center', event: 'serRead', templet: '<div><span data-id="{{d.id}}" data-rep="{{d.repType}}" class="layui-table-link view-workReport-title" >{{d.repTitle}}</span></div>' }, { field: 'attachmentList', title: '附件数量', align: 'center', @@ -233,7 +233,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat } } }, { - field: 'reportUserList', title: '未读人员', align: 'center', minWidth: '200', + field: 'reportUserList', title: '未读人员', align: 'center', templet: function (d) { var userName = []; $.each(d.reportUserList, function (i, v) { @@ -247,7 +247,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat return userName.toString(); } }, { - field: 'reportUserList', title: '已读人员', align: 'center', minWidth: '200', + field: 'reportUserList', title: '已读人员', align: 'center', templet: function (d) { var userName = []; $.each(d.reportUserList, function (i, v) { diff --git a/hg-monitor-web-base/src/main/resources/static/src/views/machineroom/bizupgradeAdd.html b/hg-monitor-web-base/src/main/resources/static/src/views/machineroom/bizupgradeAdd.html index 722e2c2..71f137c 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/views/machineroom/bizupgradeAdd.html +++ b/hg-monitor-web-base/src/main/resources/static/src/views/machineroom/bizupgradeAdd.html @@ -27,7 +27,7 @@ </div> </div> <div class="layui-inline inline-onethird"> - <label class="layui-form-label"><span>*</span>升级文件/补丁版本</label> + <label class="layui-form-label" style="padding-left: 0"><span>*</span>升级文件/补丁版本</label> <div class="layui-input-inline"> <input type="text" class="layui-input" name="upgradeFiles" id="upgradeFiles" lay-verify="required|account" maxlength="50" onkeyup="if(this.value.length>50) this.value=this.value.substr(0,50)"> </div> diff --git a/hg-monitor-web-base/src/main/resources/static/src/views/machineroom/deviceAdd.html b/hg-monitor-web-base/src/main/resources/static/src/views/machineroom/deviceAdd.html index 1d7869b..5728603 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/views/machineroom/deviceAdd.html +++ b/hg-monitor-web-base/src/main/resources/static/src/views/machineroom/deviceAdd.html @@ -53,7 +53,7 @@ lay-filter="slt-staffadd-group" lay-verify="required"> <option value="">工作单位</option> </select> - <input type="text" name="manufacturerOther" id="manufacturerOther" lay-filter="manufacturerOther" class="layui-input" style="display: none"> + <input type="text" name="manufacturerOther" id="manufacturerOther" lay-filter="manufacturerOther" class="layui-input" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" style="display: none"> </div> </div> <div class="layui-inline inline-onethird"> diff --git a/hg-monitor-web-base/src/main/resources/static/src/views/machineroom/staffAdd.html b/hg-monitor-web-base/src/main/resources/static/src/views/machineroom/staffAdd.html index f704ef0..9cba9af 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/views/machineroom/staffAdd.html +++ b/hg-monitor-web-base/src/main/resources/static/src/views/machineroom/staffAdd.html @@ -24,7 +24,7 @@ lay-filter="slt-staffadd-group" lay-verify="required"> <option value="">工作单位</option> </select> - <input type="text" name="manufacturerOther" id="manufacturerOther" lay-filter="manufacturerOther" oninput="wordLeg(this);" maxlength="100" onchange="if(value.length>100) value=value.substr(0,100)" class="layui-input" style="display: none"> + <input type="text" name="manufacturerOther" id="manufacturerOther" lay-filter="manufacturerOther" maxlength="30" onkeyup="if(this.value.length>30) this.value=this.value.substr(0,30)" class="layui-input" style="display: none"> </div> </div> <div class="layui-inline inline-onethird"> diff --git a/hg-monitor-web-base/src/main/resources/static/src/views/workreport/add.html b/hg-monitor-web-base/src/main/resources/static/src/views/workreport/add.html index 5104e04..86bb5cf 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/views/workreport/add.html +++ b/hg-monitor-web-base/src/main/resources/static/src/views/workreport/add.html @@ -19,7 +19,7 @@ </div> </div> <div class="layui-inline inline-half"> - <label class="layui-form-label">日期<span style="color: red">*</span></label> + <label class="layui-form-label">日期<span>*</span></label> <div class="layui-input-inline"> <input class="layui-input" lay-verify="required" id="createTime" name="createTime" type="text"> </div> @@ -46,10 +46,10 @@ </div> </div> <div class="layui-form-item"> - <label class="layui-form-label textarea-label work_finish" style="height: 400px"></label> + <label class="layui-form-label textarea-label work_finish" ></label> <div class="layui-input-block"> <textarea class="layui-textarea" cols="30" lay-verify="required" - name="workAccomplish" rows="20" style="height: 400px"></textarea> + name="workAccomplish" rows="20" ></textarea> </div> </div> <div class="layui-form-item"> @@ -118,45 +118,7 @@ </article> <script> layui.use('workReportAdd', function (fn) { - fn({{ d }}); + fn({{d}}); }) </script> -<style> - #add-workReport-form .layui-form-label { - width: 130px; - /* padding: 8px 12px; */ - text-align: left !important; - } - - #add-workReport-form .layui-input-block { - margin-left: 130px !important; - } - - .tags { - margin-top: 5px; - } - - .tags span { - height: 20px; - margin-right: 10px; - margin-bottom: 3px; - padding: 5px 10px 5px 10px; - float: left; - white-space: nowrap; - color: #fff; - background-color: #009688; - text-shadow: 1px 1px 1px rgba(0, 0, 0, .15); - } - - .tags .close { - font-weight: bold; - line-height: 20px; - margin-left: 10px; - cursor: pointer; - text-align: center; - color: #fff; - border: 0 none; - background: transparent none repeat scroll 0 0; - } -</style>