Authored by zhangtianqi

Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj-ztq

... ... @@ -10,7 +10,7 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd
//对外暴露的接口
var accessToken;
exports('backupCount', function () {
var accessToken = common.getMjToken();
accessToken = common.getMjToken();
var period = 'thisMonth';
initTable();
initStatusTable()
... ... @@ -140,17 +140,22 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions', 'layd
$.each(e.backlist[j], function (h, n) {
if (h != "resId") {
if (/失败/.test(n)) {
tr += '<td><i class="layui-icon layui-icon-close" style="font-size: 30px; color: #ff252c;"></i></td>'
tr += '<td style="text-align: center"><i class="layui-icon layui-icon-close" style="font-size: 20px; color: #ff252c;"></i></td>'
} else if (/成功/.test(n)) {
tr += '<td><i class="layui-icon layui-icon-ok" style="font-size: 30px; color: #1dff1c;"></i></td>'
tr += '<td><p style="text-align: center"><i class="layui-icon layui-icon-ok" style="font-size: 20px; color: #1dff1c;"></i></p><p style="margin-top: 8px;text-align: center">主楼+综改</p></td>'
} else if (/备份中/.test(n)) {
tr += '<td><span style="color:#ffe40e">' + n + '</span></td>'
tr += '<td style="text-align: center"><span style="color:#ffe40e">' + n + '</span></td>'
} else if (/未备份/.test(n)) {
tr += '<td><span style="color:magenta">' + n + '</span></td>'
} else if (/已失效/.test(n)) {
tr += '<td><span style="color:rgba(72,72,72,0.77)">' + n + '</span></td>'
} else {
tr += '<td>' + n + '</td>'
tr += '<td style="text-align: center"><span style="color:magenta">' + n + '</span></td>'
} else if (/历史存放/.test(n)) {
tr += '<td><p style="text-align: center"><i class="layui-icon layui-icon-log" style="font-size: 20px; color: #1e9fff;"></i></p><p style="margin-top: 8px;text-align: center">综改</p></td>'
} else if (/全备/.test(n)) {
tr += '<td style="text-align: center"><span style="color:#1DFF1C">' + n + '</span></td>'
} else if (/已失效/.test(n)){
tr += '<td style="text-align: center"><span style="color:#FF252C">' + n + '</span></td>'
}else {
tr += '<td style="text-align: center">' + n + '</td>'
}
}
... ...
... ... @@ -229,16 +229,16 @@
<a class="layui-btn layui-btn-normal layui-btn-xs" href="javascript:void(0);"
id="viewResExtendParam"
lay-tips="选择已保存的高级参数" title="快捷方式">
<i class="layui-icon">&#xe62d;</i>
保存
</a>
<a class="layui-btn layui-btn-normal layui-btn-xs" href="javascript:void(0);"
id="saveResExtendParam"
lay-tips="保存当前配置信息" title="保存当前配置信息">
<i class="layui-icon">&#xe605;</i>
保存配置
</a>
<a class="layui-btn layui-btn-normal layui-btn-xs" href="javascript:void(0);" id="addResExtendParam"
lay-tips="添加高级参数" title="添加高级参数">
<i class="layui-icon">&#xe654;</i>
添加
</a>
</legend>
</fieldset>
... ...
... ... @@ -95,10 +95,10 @@
<div class="layui-card-body">
<div class="warn-btns bustype-btns hide">
<button class="layui-btn layui-btn-sm layui-btn-normal" id="bustype-reslist-add">
<i class="layui-icon">&#xe654;</i>添加绑定
添加绑定
</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="bustype-reslist-unbind">
<i class="layui-icon">&#xe64d;</i>取消绑定
取消绑定
</button>
</div>
<table id="reslist_resListTable" lay-filter="reslist_resListTable"></table>
... ...