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

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

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

See merge request !928

@@ -107,8 +107,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
             $("#bizResTreeTableContent").hide();
 
             // 如果是虚拟机或者物理主机，展示电源状态查询条件
-            if (resType === 'VIRTUALIZATION_VMWARE_VHOST' || resType === 'VIRTUALIZATION_VMWARE_PHYSICSHOST') {
-                // $('#biz_reslist_power_state').val('poweredOn');
+            if (resType === 'VIRTUALIZATION_VMWARE_VHOST' || resType === 'VIRTUALIZATION_VMWARE_PHYSICSHOST'|| 'VIRTUALIZATION_'+resType === 'VIRTUALIZATION_VHOST'|| 'VIRTUALIZATION_'+resType == 'VIRTUALIZATION_VMWARE_PHYSICSHOST') {
+                $('#biz_reslist_power_state').val('poweredOn');
                 $('#biz_reslist_power_state_id').show();
             } else {
                 $('#biz_reslist_power_state_id').hide();