Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj-joke
Showing
19 changed files
with
141 additions
and
102 deletions
@@ -296,16 +296,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -296,16 +296,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
296 | } | 296 | } |
297 | } | 297 | } |
298 | , { | 298 | , { |
299 | - field: 'userTotal', title: '订阅人数', align: 'right', sort: true, width: 120, | 299 | + field: 'userTotal', title: '订阅者', align: 'right', sort: true, width: 120, |
300 | templet: function (d) { | 300 | templet: function (d) { |
301 | - if (d.userTotal != '0') { | 301 | + /*if (d.userTotal != '0') { |
302 | return `<div><span data-id="${d.subId}" class="layui-table-link view-alarmsubscribe-users-total">${d.userTotal}</span></div>`; | 302 | return `<div><span data-id="${d.subId}" class="layui-table-link view-alarmsubscribe-users-total">${d.userTotal}</span></div>`; |
303 | } else { | 303 | } else { |
304 | return d.userTotal; | 304 | return d.userTotal; |
305 | - } | 305 | + }*/ |
306 | + return `<div> | ||
307 | + <span data-id="${d.subId}" class="layui-table-link view-alarmsubscribe-users-total" lay-tips="用户">${d.userTotal}</span> / | ||
308 | + <span data-id="${d.subId}" class="layui-table-link view-alarmsubscribe-org-total" lay-tips="部门">${d.orgTotal}</span> / | ||
309 | + <span data-id="${d.subId}" class="layui-table-link view-alarmsubscribe-user-group-total" lay-tips="用户组">${d.userGroupTotal}</span> | ||
310 | + </div>`; | ||
306 | } | 311 | } |
307 | } | 312 | } |
308 | - , {field: 'times', title: '允许通知时间段', align: 'center', sort: true, width: 180} | ||
309 | , { | 313 | , { |
310 | field: 'syncFlag', title: '同步状态', align: 'center', sort: true, width: 120, | 314 | field: 'syncFlag', title: '同步状态', align: 'center', sort: true, width: 120, |
311 | templet: function (d) { | 315 | templet: function (d) { |
@@ -315,7 +319,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -315,7 +319,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
315 | return ' <button type="button" class="layui-btn layui-bg-green layui-btn-radius layui-btn-xs p-0-15">已同步</button>'; | 319 | return ' <button type="button" class="layui-btn layui-bg-green layui-btn-radius layui-btn-xs p-0-15">已同步</button>'; |
316 | } | 320 | } |
317 | } | 321 | } |
318 | - } | 322 | + }, {field: 'times', title: '允许通知时间段', align: 'center', sort: true, width: 180} |
319 | , { | 323 | , { |
320 | title: '操作', align: 'center', minWidth: 460, fixed: 'right', toolbar: | 324 | title: '操作', align: 'center', minWidth: 460, fixed: 'right', toolbar: |
321 | '<div>' + | 325 | '<div>' + |
@@ -389,8 +393,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -389,8 +393,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
389 | }); | 393 | }); |
390 | }); | 394 | }); |
391 | 395 | ||
392 | - //订阅人 | 396 | + // 订阅人 |
393 | $(".view-alarmsubscribe-users-total").on("click", function () { | 397 | $(".view-alarmsubscribe-users-total").on("click", function () { |
398 | + if ($(this).text() == '0') { | ||
399 | + layer.msg('暂无订阅人,请先订阅!', {icon: 7, time: 3000}); | ||
400 | + return false; | ||
401 | + } | ||
402 | + | ||
394 | var id = $(this).data("id"); | 403 | var id = $(this).data("id"); |
395 | admin.req({ | 404 | admin.req({ |
396 | url: domainName + '/api-web/alarmsubscribe/users' | 405 | url: domainName + '/api-web/alarmsubscribe/users' |
@@ -399,8 +408,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -399,8 +408,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
399 | if (res.data && res.data.length > 0) { | 408 | if (res.data && res.data.length > 0) { |
400 | var trs = ''; | 409 | var trs = ''; |
401 | $.each(res.data, function (i, v) { | 410 | $.each(res.data, function (i, v) { |
402 | - trs += `<tr style="text-align: center"><td>${i + 1}</td><td>${v.username}</td><td>${v.nickname}</td><td>${v.email != 'undefined'?v.email:''}</td> | ||
403 | - <td>${v.phone != 'undefined'?v.phone:''}</td><td>${v.operator != 'undefined'?v.operator:''}</td><td>${v.resTotal}</td><td>${v.bizTotal}</td></tr>`; | 411 | + trs += `<tr style="text-align: center"><td>${i + 1}</td><td>${v.username}</td><td>${v.nickname}</td><td>${v.email != 'undefined' && v.email != null?v.email:''}</td> |
412 | + <td>${v.phone != 'undefined' && v.phone != null?v.phone:''}</td><td>${v.operator != 'undefined' && v.operator != null?v.operator:''}</td><td>${v.resTotal}</td><td>${v.bizTotal}</td></tr>`; | ||
404 | }); | 413 | }); |
405 | var tb = `<div class="layui-form" style="padding: 0 10px;"> | 414 | var tb = `<div class="layui-form" style="padding: 0 10px;"> |
406 | <table class="layui-table"> | 415 | <table class="layui-table"> |
@@ -424,6 +433,84 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -424,6 +433,84 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
424 | }); | 433 | }); |
425 | 434 | ||
426 | }); | 435 | }); |
436 | + // 订阅部门 | ||
437 | + $(".view-alarmsubscribe-org-total").on("click", function () { | ||
438 | + if ($(this).text() == '0') { | ||
439 | + layer.msg('暂无订阅部门,请先订阅!', {icon: 7, time: 3000}); | ||
440 | + return false; | ||
441 | + } | ||
442 | + var id = $(this).data("id"); | ||
443 | + admin.req({ | ||
444 | + url: domainName + '/api-web/alarmsubscribe/userOrg' | ||
445 | + , data: {subId: id} | ||
446 | + , done: function (res) { | ||
447 | + if (res.data && res.data.length > 0) { | ||
448 | + var trs = ''; | ||
449 | + $.each(res.data, function (i, v) { | ||
450 | + trs += `<tr style="text-align: center"><td>${i + 1}</td><td>${v.username}</td><td>${v.nickname}</td><td>${v.orgName}</td><td>${v.email != 'undefined' && v.email != null?v.email:''}</td> | ||
451 | + <td>${v.phone != 'undefined' && v.phone != null?v.phone:''}</td><td>${v.operator != 'undefined' && v.operator != null?v.operator:''}</td><td>${v.resTotal}</td><td>${v.bizTotal}</td></tr>`; | ||
452 | + }); | ||
453 | + var tb = `<div class="layui-form" style="padding: 0 10px;"> | ||
454 | + <table class="layui-table"> | ||
455 | + <thead> | ||
456 | + <tr> <th>序号</th><th>用户名</th><th>昵称</th><th>部门</th><th>邮箱</th><th>手机号</th> | ||
457 | + <th>运营商</th><th>负责资源数</th><th>负责业务</th> </tr> | ||
458 | + </thead> | ||
459 | + <tbody> ${trs} </tbody> | ||
460 | + </table> | ||
461 | + </div>`; | ||
462 | + layer.open({ | ||
463 | + type: 1 | ||
464 | + , title: "部门用户列表" | ||
465 | + , shade: 0.8 | ||
466 | + , area: ['80%', '90%'] | ||
467 | + , id: 'alarm_subscribe_users' //设定一个id,防止重复弹出 | ||
468 | + , content: tb | ||
469 | + }) | ||
470 | + } | ||
471 | + } | ||
472 | + }); | ||
473 | + | ||
474 | + }); | ||
475 | + // 订阅组 | ||
476 | + $(".view-alarmsubscribe-user-group-total").on("click", function () { | ||
477 | + if ($(this).text() == '0') { | ||
478 | + layer.msg('暂无订阅组,请先订阅!', {icon: 7, time: 3000}); | ||
479 | + return false; | ||
480 | + } | ||
481 | + var id = $(this).data("id"); | ||
482 | + admin.req({ | ||
483 | + url: domainName + '/api-web/alarmsubscribe/userGroup' | ||
484 | + , data: {subId: id} | ||
485 | + , done: function (res) { | ||
486 | + if (res.data && res.data.length > 0) { | ||
487 | + var trs = ''; | ||
488 | + $.each(res.data, function (i, v) { | ||
489 | + trs += `<tr style="text-align: center"><td>${i + 1}</td><td>${v.username}</td><td>${v.nickname}</td><td>${v.userGroupName}</td><td>${v.email != 'undefined' && v.email != null?v.email:''}</td> | ||
490 | + <td>${v.phone != 'undefined' && v.phone != null?v.phone:''}</td><td>${v.operator != 'undefined' && v.operator != null?v.operator:''}</td><td>${v.resTotal}</td><td>${v.bizTotal}</td></tr>`; | ||
491 | + }); | ||
492 | + var tb = `<div class="layui-form" style="padding: 0 10px;"> | ||
493 | + <table class="layui-table"> | ||
494 | + <thead> | ||
495 | + <tr> <th>序号</th><th>用户名</th><th>昵称</th><th>用户组</th><th>邮箱</th><th>手机号</th> | ||
496 | + <th>运营商</th><th>负责资源数</th><th>负责业务</th> </tr> | ||
497 | + </thead> | ||
498 | + <tbody> ${trs} </tbody> | ||
499 | + </table> | ||
500 | + </div>`; | ||
501 | + layer.open({ | ||
502 | + type: 1 | ||
503 | + , title: "用户组用户列表" | ||
504 | + , shade: 0.8 | ||
505 | + , area: ['80%', '90%'] | ||
506 | + , id: 'alarm_subscribe_users' //设定一个id,防止重复弹出 | ||
507 | + , content: tb | ||
508 | + }) | ||
509 | + } | ||
510 | + } | ||
511 | + }); | ||
512 | + | ||
513 | + }); | ||
427 | 514 | ||
428 | //设置同步 | 515 | //设置同步 |
429 | form.on('switch(switchSyncalarmsubscribe)', function (obj) { | 516 | form.on('switch(switchSyncalarmsubscribe)', function (obj) { |
@@ -40,21 +40,21 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd | @@ -40,21 +40,21 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd | ||
40 | cellMinWidth: 80, | 40 | cellMinWidth: 80, |
41 | autoSort: false, | 41 | autoSort: false, |
42 | cols: [[{ | 42 | cols: [[{ |
43 | - field: 'createDate', title: '备份时间', align: 'center', sort: true, drag: false, width: 220 | 43 | + field: 'createDate', title: '备份时间', align: 'center', sort: true, drag: false, |
44 | }, { | 44 | }, { |
45 | - field: 'shouldBack', title: '应备份数量', align: 'center', drag: false, width: 220, | 45 | + field: 'shouldBack', title: '应备份数量', align: 'center', drag: false, |
46 | }, { | 46 | }, { |
47 | - field: 'success', title: '备份成功数量', align: 'center', drag: false, width: 220, | 47 | + field: 'success', title: '备份成功数量', align: 'center', drag: false, |
48 | templet: '<div><span data-date="{{d.createDate}}" data-status="成功" class="layui-table-link view-failCount-collectValue" style="color: green;font-size: 14px">{{d.success}}</span></div>' | 48 | templet: '<div><span data-date="{{d.createDate}}" data-status="成功" class="layui-table-link view-failCount-collectValue" style="color: green;font-size: 14px">{{d.success}}</span></div>' |
49 | 49 | ||
50 | }, { | 50 | }, { |
51 | - field: 'fail', title: '备份失败数量', align: 'center', drag: false, width: 220, | 51 | + field: 'fail', title: '备份失败数量', align: 'center', drag: false, |
52 | templet: '<div><span data-date="{{d.createDate}}" data-status="失败" class="layui-table-link view-failCount-collectValue" style="color: red;font-size: 14px">{{d.fail}}</span></div>' | 52 | templet: '<div><span data-date="{{d.createDate}}" data-status="失败" class="layui-table-link view-failCount-collectValue" style="color: red;font-size: 14px">{{d.fail}}</span></div>' |
53 | 53 | ||
54 | }, { | 54 | }, { |
55 | - field: 'inback', title: '备份中数量', align: 'center', drag: false, width: 220, | 55 | + field: 'inback', title: '备份中数量', align: 'center', drag: false, |
56 | }, { | 56 | }, { |
57 | - field: 'noback', title: '未备份数量', align: 'center', drag: false, width: 220, | 57 | + field: 'noback', title: '未备份数量', align: 'center', drag: false, |
58 | }, { | 58 | }, { |
59 | field: 'sucRate', title: '备份成功率', align: 'center', drag: false, | 59 | field: 'sucRate', title: '备份成功率', align: 'center', drag: false, |
60 | }]], | 60 | }]], |
@@ -111,11 +111,11 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | @@ -111,11 +111,11 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | ||
111 | $('.view-backed-collectValue').on('click', function () { | 111 | $('.view-backed-collectValue').on('click', function () { |
112 | var busId = $(this).data("busid"); | 112 | var busId = $(this).data("busid"); |
113 | var flag = $(this).data("flag"); | 113 | var flag = $(this).data("flag"); |
114 | - var title = '备份服务器列表' | 114 | + var title = '备份服务器列表(数据来源于鼎甲备份作业列表)' |
115 | common.openWin('backup/backDingjiaList', title, { | 115 | common.openWin('backup/backDingjiaList', title, { |
116 | busId: busId, | 116 | busId: busId, |
117 | flag: flag | 117 | flag: flag |
118 | - }, ['确定', '取消']) | 118 | + }, ['确定', '取消'],null,null,['1512px', '90%']) |
119 | }); | 119 | }); |
120 | 120 | ||
121 | } | 121 | } |
@@ -240,7 +240,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | @@ -240,7 +240,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | ||
240 | '<td>' + endTime + '</td>' + | 240 | '<td>' + endTime + '</td>' + |
241 | '<td>' + remark + '</td>' + | 241 | '<td>' + remark + '</td>' + |
242 | '<td>' + lastTime + '</td>' + | 242 | '<td>' + lastTime + '</td>' + |
243 | - '<td><input type="button" value="编辑" class="edit" style="background-color: #1E9FFF;"/></td>' + | 243 | + '<td><input type="button" value="编辑" class="edit layui-button layui-btn-sm layui-btn-normal" style="color: #ffffff;border-radius:4px"/></td>' + |
244 | '</tr>' | 244 | '</tr>' |
245 | } else { | 245 | } else { |
246 | tr += '<td style="display: none" class="bizid" data-bizId = "' + e.businfo.busId + '" data-bizName = "' + e.businfo.busTypeName + '">' + id + '</td>' + | 246 | tr += '<td style="display: none" class="bizid" data-bizId = "' + e.businfo.busId + '" data-bizName = "' + e.businfo.busTypeName + '">' + id + '</td>' + |
@@ -257,7 +257,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | @@ -257,7 +257,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | ||
257 | '<td>' + endTime + '</td>' + | 257 | '<td>' + endTime + '</td>' + |
258 | '<td>' + remark + '</td>' + | 258 | '<td>' + remark + '</td>' + |
259 | '<td>' + lastTime + '</td>' + | 259 | '<td>' + lastTime + '</td>' + |
260 | - '<td style="display:grid"><input type="button" value="编辑" class="edit" style="background-color: #1E9FFF;"/><input type="button" class="import" value="引用上次" style="background-color: #c0c4cc;margin-top: 5px"/></td>' + | 260 | + '<td style="display:grid"><input type="button" value="编辑" class="edit layui-button layui-btn-sm layui-btn-normal" style="color: #ffffff;border-radius:4px"/><input type="button" class="import layui-button layui-btn-sm layui-btn-normal" value="引用上次" style="background-color: #c0c4cc;margin-top: 5px;border-radius:4px"/></td>' + |
261 | '</tr>' | 261 | '</tr>' |
262 | } | 262 | } |
263 | }); | 263 | }); |
@@ -274,7 +274,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | @@ -274,7 +274,7 @@ layui.define(['table', 'admin', 'form', 'laydate', 'common', 'sessions', 'view', | ||
274 | startTime: startTime, | 274 | startTime: startTime, |
275 | resId: resId, | 275 | resId: resId, |
276 | resIp: ip | 276 | resIp: ip |
277 | - }, ['确定', '取消']) | 277 | + }, ['确定', '取消'],null,null,['1512px', '90%']) |
278 | }); | 278 | }); |
279 | $('#inspectioncount_table_id :button.edit').click(function () { | 279 | $('#inspectioncount_table_id :button.edit').click(function () { |
280 | var toEdit = this.value == '编辑'; | 280 | var toEdit = this.value == '编辑'; |
@@ -298,7 +298,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -298,7 +298,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
298 | common.openWin('machineroom/bizupgradeAdd', title, {id: id}, ['保存', '取消'], function f() { | 298 | common.openWin('machineroom/bizupgradeAdd', title, {id: id}, ['保存', '取消'], function f() { |
299 | $("#bizupgrade-form-save-id").trigger("click"); | 299 | $("#bizupgrade-form-save-id").trigger("click"); |
300 | reloadAllChange(); | 300 | reloadAllChange(); |
301 | - },null,null,null,{end: function () { | 301 | + },null,['1512px', '90%'],null,{end: function () { |
302 | reloadAllChange(); | 302 | reloadAllChange(); |
303 | }}) | 303 | }}) |
304 | } | 304 | } |
@@ -207,7 +207,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -207,7 +207,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
207 | common.openWin('machineroom/devicehitchAdd', title, {id: id}, ['保存', '取消'], function f(){ | 207 | common.openWin('machineroom/devicehitchAdd', title, {id: id}, ['保存', '取消'], function f(){ |
208 | $("#devicehitch-form-save-id").trigger("click"); | 208 | $("#devicehitch-form-save-id").trigger("click"); |
209 | reloadAllChange(); | 209 | reloadAllChange(); |
210 | - },null,null,null,{end: function () { | 210 | + },null,['1512px', '90%'],null,{end: function () { |
211 | reloadAllChange(); | 211 | reloadAllChange(); |
212 | }}) | 212 | }}) |
213 | } | 213 | } |
@@ -334,7 +334,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -334,7 +334,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
334 | common.openWin('emergency/add', title, {id: id}, ['保存', '取消'], function f() { | 334 | common.openWin('emergency/add', title, {id: id}, ['保存', '取消'], function f() { |
335 | $("#emergency-form-save-id").trigger("click"); | 335 | $("#emergency-form-save-id").trigger("click"); |
336 | reloadAllChange(); | 336 | reloadAllChange(); |
337 | - },null,null,null,{end: function () { | 337 | + },null,['1512px', '90%'],null,{end: function () { |
338 | reloadAllChange(); | 338 | reloadAllChange(); |
339 | }}) | 339 | }}) |
340 | } | 340 | } |
@@ -375,7 +375,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -375,7 +375,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
375 | common.openWin('machineroom/deviceAdd', title, {id: id}, ['保存', '取消'], function f() { | 375 | common.openWin('machineroom/deviceAdd', title, {id: id}, ['保存', '取消'], function f() { |
376 | $("#device-form-save-id").trigger("click"); | 376 | $("#device-form-save-id").trigger("click"); |
377 | reloadAllChange(); | 377 | reloadAllChange(); |
378 | - }, null, null, null, {end: function () { | 378 | + }, null, ['1512px', '90%'], null, {end: function () { |
379 | reloadAllChange(); | 379 | reloadAllChange(); |
380 | }}) | 380 | }}) |
381 | } | 381 | } |
@@ -227,7 +227,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -227,7 +227,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
227 | var title = id ? '编辑' : '新增' | 227 | var title = id ? '编辑' : '新增' |
228 | common.openWin('machineroom/staffAdd', title, {id: id}, ['保存', '取消'], function f() { | 228 | common.openWin('machineroom/staffAdd', title, {id: id}, ['保存', '取消'], function f() { |
229 | $("#staff-form-save-id").trigger("click"); | 229 | $("#staff-form-save-id").trigger("click"); |
230 | - },null,['90%', '90%'],null,{end: function () { | 230 | + },null,['1512px', '90%'],null,{end: function () { |
231 | reloadAllChange(); | 231 | reloadAllChange(); |
232 | }}) | 232 | }}) |
233 | } | 233 | } |
@@ -195,7 +195,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -195,7 +195,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
195 | common.openWin('machineroom/extraAdd', title, {id: id}, ['保存', '取消'], function f(){ | 195 | common.openWin('machineroom/extraAdd', title, {id: id}, ['保存', '取消'], function f(){ |
196 | $("#extra-form-save-id").trigger("click"); | 196 | $("#extra-form-save-id").trigger("click"); |
197 | reloadAllChange(); | 197 | reloadAllChange(); |
198 | - },null,null,null,{end: function () { | 198 | + },null,['1512px', '90%'],null,{end: function () { |
199 | reloadAllChange(); | 199 | reloadAllChange(); |
200 | }}) | 200 | }}) |
201 | } | 201 | } |
@@ -161,7 +161,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -161,7 +161,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
161 | common.openWin('machineroom/meetingApplyAdd', title, {id: id}, ['保存', '取消'], function f(){ | 161 | common.openWin('machineroom/meetingApplyAdd', title, {id: id}, ['保存', '取消'], function f(){ |
162 | $("#meetingApply-form-save-id").trigger("click"); | 162 | $("#meetingApply-form-save-id").trigger("click"); |
163 | form.render(); | 163 | form.render(); |
164 | - },null,null,null,{end: function () { | 164 | + },null,['1512px', '90%'],null,{end: function () { |
165 | reloadAllChange(); | 165 | reloadAllChange(); |
166 | }}) | 166 | }}) |
167 | } | 167 | } |
@@ -139,7 +139,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -139,7 +139,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
139 | function openmeetingsummaryForm(id) { | 139 | function openmeetingsummaryForm(id) { |
140 | var title = id ? '编辑' : '新增' | 140 | var title = id ? '编辑' : '新增' |
141 | common.openWin('machineroom/meetingsummaryAdd', title, {id: id}, ['确定', '取消'], function f(index,layero){ | 141 | common.openWin('machineroom/meetingsummaryAdd', title, {id: id}, ['确定', '取消'], function f(index,layero){ |
142 | - },null,null,null,{end: reloadAllChange()}) | 142 | + },null,['1512px', '90%'],null,{end: function () { |
143 | + reloadAllChange(); | ||
144 | + }}) | ||
143 | } | 145 | } |
144 | 146 | ||
145 | 147 |
@@ -211,7 +211,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -211,7 +211,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
211 | common.openWin('recoveryverify/add', title, {id: id}, ['保存', '取消'], function f() { | 211 | common.openWin('recoveryverify/add', title, {id: id}, ['保存', '取消'], function f() { |
212 | $("#recoveryverify-form-save-id").trigger("click"); | 212 | $("#recoveryverify-form-save-id").trigger("click"); |
213 | reloadAllChange(); | 213 | reloadAllChange(); |
214 | - },null,null,null,{end: function () { | 214 | + },null,['1512px', '90%'],null,{end: function () { |
215 | reloadAllChange(); | 215 | reloadAllChange(); |
216 | }}) | 216 | }}) |
217 | } | 217 | } |
@@ -166,7 +166,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -166,7 +166,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
166 | common.openWin('machineroom/routeAdjustAdd', title, {id: id}, ['保存', '取消'], function f() { | 166 | common.openWin('machineroom/routeAdjustAdd', title, {id: id}, ['保存', '取消'], function f() { |
167 | $("#routeAdjust-form-save-id").trigger("click"); | 167 | $("#routeAdjust-form-save-id").trigger("click"); |
168 | reloadAllChange(); | 168 | reloadAllChange(); |
169 | - },null,null,null,{end: function () { | 169 | + },null,['1512px', '90%'],null,{end: function () { |
170 | reloadAllChange(); | 170 | reloadAllChange(); |
171 | }}) | 171 | }}) |
172 | } | 172 | } |
@@ -239,7 +239,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -239,7 +239,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
239 | var title = id ? '编辑' : '新增' | 239 | var title = id ? '编辑' : '新增' |
240 | common.openWin('workreport/add', title, {id: id, repType: repType}, ['保存', '取消'], function f() { | 240 | common.openWin('workreport/add', title, {id: id, repType: repType}, ['保存', '取消'], function f() { |
241 | $("#workReport-form-save-id").trigger("click"); | 241 | $("#workReport-form-save-id").trigger("click"); |
242 | - }) | 242 | + },null,['1100px', '90%'],null,{end: function () { |
243 | + reloadWorkReportTable(); | ||
244 | + }}) | ||
243 | } | 245 | } |
244 | 246 | ||
245 | //查看附件/接收人列表 | 247 | //查看附件/接收人列表 |
@@ -300,7 +300,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -300,7 +300,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
300 | common.openWin('workreport/add', '查看', {id: id, repType: repType, viewType: 'view',datas:datas}, ['下一条','关闭'], function f() { | 300 | common.openWin('workreport/add', '查看', {id: id, repType: repType, viewType: 'view',datas:datas}, ['下一条','关闭'], function f() { |
301 | $("#workReport-form-next-id").trigger("click"); | 301 | $("#workReport-form-next-id").trigger("click"); |
302 | reloadAllChange(); | 302 | reloadAllChange(); |
303 | - }); | 303 | + },null,['1100px', '90%'],null,{end: function () { |
304 | + reloadAllChange(); | ||
305 | + }}); | ||
304 | } | 306 | } |
305 | }); | 307 | }); |
306 | 308 |
1 | <title>数据库备份统计</title> | 1 | <title>数据库备份统计</title> |
2 | -<style type="text/css"> | ||
3 | - table th { | ||
4 | - background-color: cornflowerblue; | ||
5 | - } | ||
6 | -</style> | ||
7 | <article class="page-container template"> | 2 | <article class="page-container template"> |
8 | <div class="page-panel"> | 3 | <div class="page-panel"> |
9 | <div class="main" style="background-color: #fff"> | 4 | <div class="main" style="background-color: #fff"> |
1 | -<style type="text/css"> | ||
2 | - td input { | ||
3 | - width: 70px; | ||
4 | - border: 1px; | ||
5 | - } | ||
6 | 1 | ||
7 | - element.style { | ||
8 | - } | ||
9 | - | ||
10 | - .layui-table td, .layui-table th { | ||
11 | - position: relative; | ||
12 | - padding: 9px 15px; | ||
13 | - min-height: 20px; | ||
14 | - line-height: 20px; | ||
15 | - font-size: 14px; | ||
16 | - } | ||
17 | - | ||
18 | - .layui-table td, .layui-table th, .layui-table-col-set, .layui-table-fixed-r, .layui-table-grid-down, .layui-table-header, .layui-table-page, .layui-table-tips-main, .layui-table-tool, .layui-table-total, .layui-table-view, .layui-table[lay-skin=line], .layui-table[lay-skin=row] { | ||
19 | - border-width: 1px; | ||
20 | - border-style: solid; | ||
21 | - border-color: #e6e6e6; | ||
22 | - } | ||
23 | - | ||
24 | - .layui-table th { | ||
25 | - min-width: 35px; | ||
26 | - text-align: center; | ||
27 | - background-color: cornflowerblue; | ||
28 | - } | ||
29 | -</style> | ||
30 | <title>服务器备份概况</title> | 2 | <title>服务器备份概况</title> |
31 | <article class="page-container template"> | 3 | <article class="page-container template"> |
32 | <div class="page-panel"> | 4 | <div class="page-panel"> |
1 | -<style type="text/css"> | ||
2 | - td input { | ||
3 | - width: 70px; | ||
4 | - border: 1px; | ||
5 | - } | ||
6 | - | ||
7 | - element.style { | ||
8 | - } | ||
9 | - | ||
10 | - .layui-table td, .layui-table th { | ||
11 | - position: relative; | ||
12 | - padding: 9px 15px; | ||
13 | - min-height: 20px; | ||
14 | - line-height: 20px; | ||
15 | - font-size: 14px; | ||
16 | - } | ||
17 | - | ||
18 | - .layui-table td, .layui-table th, .layui-table-col-set, .layui-table-fixed-r, .layui-table-grid-down, .layui-table-header, .layui-table-page, .layui-table-tips-main, .layui-table-tool, .layui-table-total, .layui-table-view, .layui-table[lay-skin=line], .layui-table[lay-skin=row] { | ||
19 | - border-width: 1px; | ||
20 | - border-style: solid; | ||
21 | - border-color: #e6e6e6; | ||
22 | - } | ||
23 | - | ||
24 | - .layui-table th { | ||
25 | - min-width: 35px; | ||
26 | - text-align: center; | ||
27 | - background-color: cornflowerblue; | ||
28 | - } | ||
29 | -</style> | ||
30 | <title>数据库备份概况</title> | 1 | <title>数据库备份概况</title> |
31 | <article class="page-container template"> | 2 | <article class="page-container template"> |
32 | <div class="page-panel"> | 3 | <div class="page-panel"> |
33 | - <div class="main" style="background-color: #fff"> | 4 | + <div class="main"> |
34 | <div class="layui-card-body" style="margin-top: 10px;"> | 5 | <div class="layui-card-body" style="margin-top: 10px;"> |
35 | <div style="display: flex;justify-content: space-between;align-items: center;"> | 6 | <div style="display: flex;justify-content: space-between;align-items: center;"> |
36 | <form class="layui-form layui-card-header" onsubmit="return false" | 7 | <form class="layui-form layui-card-header" onsubmit="return false" |
@@ -64,16 +35,16 @@ | @@ -64,16 +35,16 @@ | ||
64 | <thead> | 35 | <thead> |
65 | <tr> | 36 | <tr> |
66 | <th>序号</th> | 37 | <th>序号</th> |
67 | - <th>系统名称</th> | ||
68 | - <th>等保等级</th> | ||
69 | - <th>数据库名称</th> | 38 | + <th width="150">系统名称</th> |
39 | + <th width="100">等保等级</th> | ||
40 | + <th width="200">数据库名称</th> | ||
70 | <th>IP地址</th> | 41 | <th>IP地址</th> |
71 | <th>备份平台</th> | 42 | <th>备份平台</th> |
72 | <th>备份级别</th> | 43 | <th>备份级别</th> |
73 | - <th>备份状态</th> | ||
74 | - <th>数据量(GB)</th> | ||
75 | - <th>速率(MB/s)</th> | ||
76 | - <th>运行时间(分)</th> | 44 | + <th width="100">备份状态</th> |
45 | + <th width="100">数据量(GB)</th> | ||
46 | + <th width="100">速率(MB/s)</th> | ||
47 | + <th width="100">运行时间(分)</th> | ||
77 | <th>开始时间</th> | 48 | <th>开始时间</th> |
78 | <th>结束时间</th> | 49 | <th>结束时间</th> |
79 | <th>备注</th> | 50 | <th>备注</th> |
@@ -93,4 +64,12 @@ | @@ -93,4 +64,12 @@ | ||
93 | layui.use('backupmain', function (fn) { | 64 | layui.use('backupmain', function (fn) { |
94 | fn(); | 65 | fn(); |
95 | }); | 66 | }); |
96 | -</script> | ||
67 | +</script> | ||
68 | +<style type="text/css"> | ||
69 | + .layui-table td, .layui-table th { | ||
70 | + padding: 0 5px!important; | ||
71 | + } | ||
72 | + td input:not([type=button]) { | ||
73 | + width: 80px; | ||
74 | + } | ||
75 | +</style> |
-
Please register or login to post a comment