monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit f7da58c228fab8add0a185c1a08f941e6d9900fe 2 parents 68157e5f 7f669961

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

首页应用资源类型下探，资源列表

告警数量下探活动告警
关键字搜索无效
虚拟化增加条件：开机关机状态（字典配置）默认展示开机状态
表头排序后无数据

See merge request !928
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
@@ -107,8 +107,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm @@ -107,8 +107,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
107 $("#bizResTreeTableContent").hide(); 107 $("#bizResTreeTableContent").hide();
108 108
109 // 如果是虚拟机或者物理主机，展示电源状态查询条件 109 // 如果是虚拟机或者物理主机，展示电源状态查询条件
110 - if (resType === 'VIRTUALIZATION_VMWARE_VHOST' || resType === 'VIRTUALIZATION_VMWARE_PHYSICSHOST') {  
111 - // $('#biz_reslist_power_state').val('poweredOn'); 110 + if (resType === 'VIRTUALIZATION_VMWARE_VHOST' || resType === 'VIRTUALIZATION_VMWARE_PHYSICSHOST'|| 'VIRTUALIZATION_'+resType === 'VIRTUALIZATION_VHOST'|| 'VIRTUALIZATION_'+resType == 'VIRTUALIZATION_VMWARE_PHYSICSHOST') {
  111 + $('#biz_reslist_power_state').val('poweredOn');
112 $('#biz_reslist_power_state_id').show(); 112 $('#biz_reslist_power_state_id').show();
113 } else { 113 } else {
114 $('#biz_reslist_power_state_id').hide(); 114 $('#biz_reslist_power_state_id').hide();