monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 袁晋鹏
Commit 103f7e775a0b09bfc61626af4bab48314486a614 1 parent f165c37b

fix:备份相关功能整体ui优化

Inline Side-by-side
Showing 7 changed files with 28 additions and 82 deletions
@@ -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,['90%', '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,['90%', '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 == '编辑';
@@ -139,7 +139,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -139,7 +139,7 @@ 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,['90%', '90%'],null,{end: reloadAllChange()})
143 } 143 }
144 144
145 145
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>
@@ -94,3 +65,11 @@ @@ -94,3 +65,11 @@
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>