monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 2b41f83c1930ae35d5dedd2a673f51f418f60145 2 parents 505f80b6 b6681608

Merge branch 'master-500-dev-xwx' into 'master-500-dev' 

中间件-【1054】-统计优化



See merge request !950
Inline Side-by-side
Showing 2 changed files with 17 additions and 16 deletions
... ... @@ -219,7 +219,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
//触发拖动列事件，参数为保存按钮的id
common.dragCols("bizreslist_cols_save");
loadRightResTypeSelectEvent(newResType, 'normal');
loadRightResTypeSelectEvent(newResType, 'normal',res.obj);
initSaveColsEvent();//保存列事件
// 导出到excel
... ... @@ -746,7 +746,11 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
}
// 渲染统计数据
function loadRightResTypeSelectEvent(resType, type) {
function loadRightResTypeSelectEvent(resType, type,obj) {
var map = obj;
$.each(map, function (key, values) {
$("#" + key + "_resStatus").html(map[key])
});
layer.closeAll('tips');
if (collProtocols) {
xmSelect.get('#collProtocolSelect', true).setValue([]);
... ... @@ -772,9 +776,6 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
fun = renderTreeTable;
}
var map = res.object;
$.each(map, function (key, values) {
$("#" + domStr + " span[data-field='" + str + key + "']").html(values)
});
$("#" + domStr).find(".info-box-count .num span").unbind().on("click", function () {
var val = $(this).data("value"), target = $(this).data("target");
if (val && target) {
... ...
... ... @@ -222,7 +222,7 @@
<i></i>
<label>资源总量</label>
<div class="num">
<span lay-tips="资源总量" data-field="total">0</span>
<span lay-tips="资源总量" data-field="total" id="total_resStatus">0</span>
</div>
</div>
<div class="info-box-count">
... ... @@ -230,13 +230,13 @@
<label>健康状态</label>
<div class="num">
<span class="green" lay-tips="健康状态：优" data-value="3" data-target="biz_reslist_resStatus"
data-field="normal">0</span>/
data-field="normal" id="normal_resStatus">0</span>/
<span class="orange" lay-tips="健康状态: 良" data-value="2" data-target="biz_reslist_resStatus"
data-field="worse">0</span>/
data-field="worse" id="worse_resStatus">0</span>/
<span class="red" lay-tips="健康状态: 中" data-value="1" data-target="biz_reslist_resStatus"
data-field="worst">0</span>/
data-field="worst" id="worst_resStatus">0</span>/
<span class="gray" lay-tips="连接状态：未监控" data-value="none" data-target="biz_reslist_resStatus"
data-field="healthNone">0</span>
data-field="healthNone" id="healthNone_resStatus">0</span>
</div>
</div>
<div class="info-box-count">
... ... @@ -244,11 +244,11 @@
<label>资源状态</label>
<div class="num">
<span class="green" lay-tips="资源状态：监控中" data-value="monitor" data-target="biz_reslist_state"
data-field="monitorstate">0</span>/
data-field="monitorstate" id="monitorstate_resStatus">0</span>/
<span class="red" lay-tips="资源状态：暂停监控" data-value="stop" data-target="biz_reslist_state"
data-field="stopstate">0</span>/
data-field="stopstate" id="stopstate_resStatus">0</span>/
<span class="gray" lay-tips="资源状态：未监控" data-value="new" data-target="biz_reslist_state"
data-field="newstate">0</span>
data-field="newstate" id="newstate_resStatus">0</span>
</div>
</div>
<div class="info-box-count div-link-state" style="display: none">
... ... @@ -256,11 +256,11 @@
<label>连接状态</label>
<div class="num">
<span class="green" lay-tips="连接状态：成功" data-value="1" data-target="biz_reslist_link_state"
data-field="linksuccess">0</span>/
data-field="linksuccess" id="linksuccess_resStatus">0</span>/
<span class="red" lay-tips="连接状态：失败" data-value="0" data-target="biz_reslist_link_state"
data-field="linkfail">0</span>/
data-field="linkfail" id="linkfail_resStatus">0</span>/
<span class="gray" lay-tips="连接状态：未监控" data-value="9" data-target="biz_reslist_link_state"
data-field="linkNone">0</span>
data-field="linkNone" id="linkNone_resStatus">0</span>
</div>
</div>
<!-- <div class="info-box-count">
... ...