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 @@ -219,7 +219,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
219 219
220 //触发拖动列事件，参数为保存按钮的id 220 //触发拖动列事件，参数为保存按钮的id
221 common.dragCols("bizreslist_cols_save"); 221 common.dragCols("bizreslist_cols_save");
222 - loadRightResTypeSelectEvent(newResType, 'normal'); 222 + loadRightResTypeSelectEvent(newResType, 'normal',res.obj);
223 223
224 initSaveColsEvent();//保存列事件 224 initSaveColsEvent();//保存列事件
225 // 导出到excel 225 // 导出到excel
@@ -746,7 +746,11 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm @@ -746,7 +746,11 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
746 } 746 }
747 747
748 // 渲染统计数据 748 // 渲染统计数据
749 - function loadRightResTypeSelectEvent(resType, type) { 749 + function loadRightResTypeSelectEvent(resType, type,obj) {
  750 + var map = obj;
  751 + $.each(map, function (key, values) {
  752 + $("#" + key + "_resStatus").html(map[key])
  753 + });
750 layer.closeAll('tips'); 754 layer.closeAll('tips');
751 if (collProtocols) { 755 if (collProtocols) {
752 xmSelect.get('#collProtocolSelect', true).setValue([]); 756 xmSelect.get('#collProtocolSelect', true).setValue([]);
@@ -772,9 +776,6 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm @@ -772,9 +776,6 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
772 fun = renderTreeTable; 776 fun = renderTreeTable;
773 } 777 }
774 var map = res.object; 778 var map = res.object;
775 - $.each(map, function (key, values) {  
776 - $("#" + domStr + " span[data-field='" + str + key + "']").html(values)  
777 - });  
778 $("#" + domStr).find(".info-box-count .num span").unbind().on("click", function () { 779 $("#" + domStr).find(".info-box-count .num span").unbind().on("click", function () {
779 var val = $(this).data("value"), target = $(this).data("target"); 780 var val = $(this).data("value"), target = $(this).data("target");
780 if (val && target) { 781 if (val && target) {
@@ -222,7 +222,7 @@ @@ -222,7 +222,7 @@
222 <i></i> 222 <i></i>
223 <label>资源总量</label> 223 <label>资源总量</label>
224 <div class="num"> 224 <div class="num">
225 - <span lay-tips="资源总量" data-field="total">0</span> 225 + <span lay-tips="资源总量" data-field="total" id="total_resStatus">0</span>
226 </div> 226 </div>
227 </div> 227 </div>
228 <div class="info-box-count"> 228 <div class="info-box-count">
@@ -230,13 +230,13 @@ @@ -230,13 +230,13 @@
230 <label>健康状态</label> 230 <label>健康状态</label>
231 <div class="num"> 231 <div class="num">
232 <span class="green" lay-tips="健康状态：优" data-value="3" data-target="biz_reslist_resStatus" 232 <span class="green" lay-tips="健康状态：优" data-value="3" data-target="biz_reslist_resStatus"
233 - data-field="normal">0</span>/ 233 + data-field="normal" id="normal_resStatus">0</span>/
234 <span class="orange" lay-tips="健康状态: 良" data-value="2" data-target="biz_reslist_resStatus" 234 <span class="orange" lay-tips="健康状态: 良" data-value="2" data-target="biz_reslist_resStatus"
235 - data-field="worse">0</span>/ 235 + data-field="worse" id="worse_resStatus">0</span>/
236 <span class="red" lay-tips="健康状态: 中" data-value="1" data-target="biz_reslist_resStatus" 236 <span class="red" lay-tips="健康状态: 中" data-value="1" data-target="biz_reslist_resStatus"
237 - data-field="worst">0</span>/ 237 + data-field="worst" id="worst_resStatus">0</span>/
238 <span class="gray" lay-tips="连接状态：未监控" data-value="none" data-target="biz_reslist_resStatus" 238 <span class="gray" lay-tips="连接状态：未监控" data-value="none" data-target="biz_reslist_resStatus"
239 - data-field="healthNone">0</span> 239 + data-field="healthNone" id="healthNone_resStatus">0</span>
240 </div> 240 </div>
241 </div> 241 </div>
242 <div class="info-box-count"> 242 <div class="info-box-count">
@@ -244,11 +244,11 @@ @@ -244,11 +244,11 @@
244 <label>资源状态</label> 244 <label>资源状态</label>
245 <div class="num"> 245 <div class="num">
246 <span class="green" lay-tips="资源状态：监控中" data-value="monitor" data-target="biz_reslist_state" 246 <span class="green" lay-tips="资源状态：监控中" data-value="monitor" data-target="biz_reslist_state"
247 - data-field="monitorstate">0</span>/ 247 + data-field="monitorstate" id="monitorstate_resStatus">0</span>/
248 <span class="red" lay-tips="资源状态：暂停监控" data-value="stop" data-target="biz_reslist_state" 248 <span class="red" lay-tips="资源状态：暂停监控" data-value="stop" data-target="biz_reslist_state"
249 - data-field="stopstate">0</span>/ 249 + data-field="stopstate" id="stopstate_resStatus">0</span>/
250 <span class="gray" lay-tips="资源状态：未监控" data-value="new" data-target="biz_reslist_state" 250 <span class="gray" lay-tips="资源状态：未监控" data-value="new" data-target="biz_reslist_state"
251 - data-field="newstate">0</span> 251 + data-field="newstate" id="newstate_resStatus">0</span>
252 </div> 252 </div>
253 </div> 253 </div>
254 <div class="info-box-count div-link-state" style="display: none"> 254 <div class="info-box-count div-link-state" style="display: none">
@@ -256,11 +256,11 @@ @@ -256,11 +256,11 @@
256 <label>连接状态</label> 256 <label>连接状态</label>
257 <div class="num"> 257 <div class="num">
258 <span class="green" lay-tips="连接状态：成功" data-value="1" data-target="biz_reslist_link_state" 258 <span class="green" lay-tips="连接状态：成功" data-value="1" data-target="biz_reslist_link_state"
259 - data-field="linksuccess">0</span>/ 259 + data-field="linksuccess" id="linksuccess_resStatus">0</span>/
260 <span class="red" lay-tips="连接状态：失败" data-value="0" data-target="biz_reslist_link_state" 260 <span class="red" lay-tips="连接状态：失败" data-value="0" data-target="biz_reslist_link_state"
261 - data-field="linkfail">0</span>/ 261 + data-field="linkfail" id="linkfail_resStatus">0</span>/
262 <span class="gray" lay-tips="连接状态：未监控" data-value="9" data-target="biz_reslist_link_state" 262 <span class="gray" lay-tips="连接状态：未监控" data-value="9" data-target="biz_reslist_link_state"
263 - data-field="linkNone">0</span> 263 + data-field="linkNone" id="linkNone_resStatus">0</span>
264 </div> 264 </div>
265 </div> 265 </div>
266 <!-- <div class="info-box-count"> 266 <!-- <div class="info-box-count">