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

# Conflicts:
#	hg-monitor-web-base/src/main/resources/static/vue3/public/css/logoConfig.css
#	hg-monitor-web-base/src/main/resources/static/vue3/src/router/index.js
#	hg-monitor-web-base/src/main/resources/static/vue3/src/views/logoConfig/index.html
#	hg-monitor-web-qh/src/main/resources/static/src/controller/userChange.js
#	hg-monitor-web-qh/src/main/resources/static/vue3/src/router/index.js

-# **说明** 
+# **说明**
+
 - hg-monitor-web-base 基于天津现有功能作为基类
 - hg-monitor-web-base 基于天津现有功能作为基类
 - hg-monitor-web-tj 天津21年10月后的个性化开发
 - hg-monitor-web-tj 天津21年10月后的个性化开发
 - hg-monitor-web-zj 杭州功能开发
 - hg-monitor-web-zj 杭州功能开发
 
 
-
 # **基础功能优化**
 # **基础功能优化**
+
 - 如果影响多个现场，则直接修改base工程下对应的接口和页面
 - 如果影响多个现场，则直接修改base工程下对应的接口和页面
 - 各个地方的个性化优化，则使用文件覆盖的方式修改代码（在对应工程目录下创建相同的目录结构）
 - 各个地方的个性化优化，则使用文件覆盖的方式修改代码（在对应工程目录下创建相同的目录结构）
 
 
 # **功能升级**
 # **功能升级**
+
 - 某一个现场的功能需要在各个现场都升级的，则将代码复制到base中
 - 某一个现场的功能需要在各个现场都升级的，则将代码复制到base中
 - 如果升级某一个现场的版本，则将文件复制过去即可
 - 如果升级某一个现场的版本，则将文件复制过去即可

 -- 菜单管理编辑后无法保存，数据库字段"moduleid"长度太短,导致SQL报错
 -- 菜单管理编辑后无法保存，数据库字段"moduleid"长度太短,导致SQL报错
-ALTER TABLE `user-center`.sys_menu MODIFY COLUMN moduleid VARCHAR(100) COMMENT '模块id';
+ALTER TABLE `user-center`.sys_menu MODIFY COLUMN moduleid VARCHAR (100) COMMENT '模块id';

-INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('3a83b4dafeff44fe85e32ae824146b91', 'topoBindKpiIds', '拓扑绑定指标', '拓扑绑定指标', 1, '0', '2021-11-18 14:55:53');
+INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`,
+                                               `createTime`)
+VALUES ('3a83b4dafeff44fe85e32ae824146b91', 'topoBindKpiIds', '拓扑绑定指标', '拓扑绑定指标', 1, '0', '2021-11-18 14:55:53');
 
 
-INSERT INTO sys_ddic (ddicId, ddicCode,ddicName,ddicDesc,ddicSort,ddicCategory,createTime )
-select UUID(),kpiId,kpiName,kpiType, 0 as ddicSort,'topoBindKpiIds' as ddicCategory,NOW() as createTime  from b_kpi where kpiIdent = 1 or isWarning = 1
+INSERT INTO sys_ddic (ddicId, ddicCode, ddicName, ddicDesc, ddicSort, ddicCategory, createTime)
+select UUID(), kpiId, kpiName, kpiType, 0 as ddicSort, 'topoBindKpiIds' as ddicCategory, NOW() as createTime
+from b_kpi
+where kpiIdent = 1
+   or isWarning = 1

@@ -9,6 +9,10 @@ ALTER TABLE `inspection-report`.`b_insepectionreport_type`
     ADD COLUMN `status` int(1) DEFAULT '0' COMMENT '删除状态 0 正常，1删除，默认0';
     ADD COLUMN `status` int(1) DEFAULT '0' COMMENT '删除状态 0 正常，1删除，默认0';
 
 
 -- 授权所有type
 -- 授权所有type
-INSERT INTO b_inspection_document_auth ( id, docId, userName, roleId ) SELECT UUID( ), id, 'admin' AS userName, '' AS roleId  FROM b_insepectionreport_type;
-INSERT INTO b_inspection_document_auth ( id, docId, userName, roleId ) SELECT UUID( ), id, 'admin' AS userName, '' AS roleId  FROM b_insepectionreport_document;
+INSERT INTO b_inspection_document_auth (id, docId, userName, roleId)
+SELECT UUID(), id, 'admin' AS userName, '' AS roleId
+FROM b_insepectionreport_type;
+INSERT INTO b_inspection_document_auth (id, docId, userName, roleId)
+SELECT UUID(), id, 'admin' AS userName, '' AS roleId
+FROM b_insepectionreport_document;
 
 

@@ -15,86 +15,185 @@
 */
 */
 
 
 SET NAMES utf8mb4;
 SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
+SET
+FOREIGN_KEY_CHECKS = 0;
 
 
 -- ----------------------------
 -- ----------------------------
 -- Table structure for b_res_list_tree_v32
 -- Table structure for b_res_list_tree_v32
 -- ----------------------------
 -- ----------------------------
 DROP TABLE IF EXISTS `b_res_list_tree_v32`;
 DROP TABLE IF EXISTS `b_res_list_tree_v32`;
-CREATE TABLE `b_res_list_tree_v32`  (
-  `id` int(0) NOT NULL AUTO_INCREMENT COMMENT '资源类型id',
-  `parentId` int(0) NULL DEFAULT NULL COMMENT '父资源类型',
-  `resType` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '资源类型CODE',
-  `nodeName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '节点名称',
-  `nodeDesc` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '节点描述',
-  `nodeType` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '节点分类',
-  `sort` int(0) NULL DEFAULT NULL COMMENT '排序',
-  `options` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '配置信息',
-  `detailProps` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '详情页属性、参数( JSON)',
-  `detailPage` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '详情页 对应字典：DETAIL_PAGE',
-  `ext1` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '扩展字段',
-  `ext2` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '扩展字段',
-  `ext3` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '扩展字段',
-  `ext4` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '扩展字段',
-  `ext5` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '扩展字段',
-  `querySub` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否查询子节点 0是1否，默认0，相同的资源类型值相同，否则按照否处理',
-  `excludeResType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '查询排除类型(TODO) ',
-  `veiwName` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '查询视图名称，默认值：v_resource',
-  `createTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  PRIMARY KEY (`id`) USING BTREE,
-  INDEX `resType`(`id`, `resType`) USING BTREE
+CREATE TABLE `b_res_list_tree_v32`
+(
+    `id`             int(0) NOT NULL AUTO_INCREMENT COMMENT '资源类型id',
+    `parentId`       int(0) NULL DEFAULT NULL COMMENT '父资源类型',
+    `resType`        varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '资源类型CODE',
+    `nodeName`       varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '节点名称',
+    `nodeDesc`       varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '节点描述',
+    `nodeType`       varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '节点分类',
+    `sort`           int(0) NULL DEFAULT NULL COMMENT '排序',
+    `options`        varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '配置信息',
+    `detailProps`    text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '详情页属性、参数( JSON)',
+    `detailPage`     varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '详情页 对应字典：DETAIL_PAGE',
+    `ext1`           varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '扩展字段',
+    `ext2`           varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '扩展字段',
+    `ext3`           varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '扩展字段',
+    `ext4`           varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '扩展字段',
+    `ext5`           varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '扩展字段',
+    `querySub`       varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否查询子节点 0是1否，默认0，相同的资源类型值相同，否则按照否处理',
+    `excludeResType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '查询排除类型(TODO) ',
+    `veiwName`       varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '查询视图名称，默认值：v_resource',
+    `createTime`     timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    PRIMARY KEY (`id`) USING BTREE,
+    INDEX            `resType`(`id`, `resType`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 50023 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '资源类型信息表' ROW_FORMAT = Dynamic;
 ) ENGINE = InnoDB AUTO_INCREMENT = 50023 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '资源类型信息表' ROW_FORMAT = Dynamic;
 
 
 -- ----------------------------
 -- ----------------------------
 -- Records of b_res_list_tree_v32
 -- Records of b_res_list_tree_v32
 -- ----------------------------
 -- ----------------------------
-INSERT INTO `b_res_list_tree_v32` VALUES (11100, 0, 'HOST_MINICOMPUTER', '整机', '计算存储', '', 11100, '', '', '', '', '', '', '', '', '', '', 'v_resource_minipc', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (11102, 0, 'HOST_MINICOMPUTER_PARTITION', '分区', '计算存储', '', 11102, '', '', '', '', '', '', '', '', '', '', 'v_resource_minipc_part', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (11200, 0, 'HOST_X86SERVER', 'PC服务器', '计算存储', '', 11200, '', '', '', '', '', '', '', '', '', '', 'v_resource_pc', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (11300, 0, 'HOST_ONECOMPUTER', '一体机', '计算存储', '', 11300, '', '', '', '', '', '', '', '', '', '', 'v_resource_pc', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (12100, 0, 'VIRTUALIZATION_VMWARE', 'VMWARE', '计算存储', '', 12100, '', NULL, '', '', '', '', '', '', '', '', 'v_resource_vmware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (12110, 12100, 'VIRTUALIZATION_VMWARE_CLUSTER', 'vm资源池', '计算存储', '', 12110, '', '', '', '', '', '', '', '', '', '', 'v_resource_vmware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (12120, 12100, 'VIRTUALIZATION_VMWARE_PHYSICSHOST', 'vm宿主机', '计算存储', '', 12120, '', '', '', '', '', '', '', '', '', '', 'v_resource_vmware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (12130, 12100, 'VIRTUALIZATION_VMWARE_VHOST', 'vm虚拟机', '计算存储', '', 12130, '', '', '', '', '', '', '', '', '', '', 'v_resource_vmware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (12900, 12100, 'VIRTUALIZATION_VHOST', '虚拟机', '计算存储', '', 12900, '', '', '', '', '', '', '', '', '', '', 'v_resource_vmware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (13000, 0, 'HUAWEI_CLOUD_PLAT', '华为云', '计算存储', '', 13000, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (13100, 13000, 'HUAWEI_CLOUD_COLONY', '资源池', '计算存储', '', 13100, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (13101, 13000, 'HUAWEI_CLOUD_STORAGE', '存储', '计算存储', '', 13101, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (13102, 13000, 'HUAWEI_CLOUD_SWITCHBOARD', '交换机', '计算存储', '', 13102, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (13103, 13000, 'HUAWEI_CLOUD_FIREWALL', '防火墙', '计算存储', '', 13103, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (13110, 13000, 'HUAWEI_CLOUD_CLUSTER', '集群', '计算存储', '', 13110, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (13111, 13000, 'HUAWEI_CLOUD_CLUSTER_OST', '物理机', '计算存储', '', 13111, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (13112, 13000, 'HUAWEI_CLOUD_VIRTUALHOST', '虚拟机', '计算存储', '', 13112, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (14000, 0, 'ALI_CLOUD_PLAT', '阿里云', '计算存储', '', 14000, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_ali', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (14100, 14000, 'ALI_CLOUD_ECS', 'ECS-云服务器', '计算存储', '', 14100, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_ali', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (14200, 14000, 'ALI_CLOUD_RDS', 'RDS-云数据库', '计算存储', '', 14200, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_ali', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (14300, 14000, 'ALI_CLOUD_SLB', 'SLB-负载均衡', '计算存储', '', 14300, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_ali', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (14400, 14000, 'ALI_CLOUD_OSS', 'OSS-对象存储', '计算存储', '', 14400, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_ali', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (15000, 0, 'STORAGE', '存储设备', '计算存储', '', 15000, '', '', '', '', '', '', '', '', '', '', 'v_resource_storage', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (15100, 15000, 'STORAGE_SHARE', '共享存储', '计算存储', '', 15100, '', '', '', '', '', '', '', '', '', '', 'v_resource_storage', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (15101, 15100, 'STORAGE_SHARE_LUN', 'LUN', '计算存储', '', 15100, '', '', '', '', '', '', '', '', '', '', 'v_resource_storage_lun', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (15300, 15000, 'STORAGE_TAPELIBRARY', '物理带库', '计算存储', '', 15300, '', '', '', '', '', '', '', '', '', '', 'v_resource_storage', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (15400, 15000, 'STORAGE_VTAPELIBRARY', '虚拟带库', '计算存储', '', 15400, '', '', '', '', '', '', '', '', '', '', 'v_resource_storage', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (16000, 0, 'DATABASE', '数据库', '系统软件', '', 20001, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (16100, 16000, 'DATABASE_ORACLE', 'oracle', '系统软件', '', 16100, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (16101, 16000, 'DATABASE_RAC', 'oracle集群', '系统软件', '', 16101, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (16200, 16000, 'DATABASE_OGG', 'ogg', '系统软件', '', 16200, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (16300, 16000, 'DATABASE_MYSQL', 'mysql', '系统软件', '', 16300, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (16400, 16000, 'DATABASE_REDIS', 'redis', '系统软件', '', 16400, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (16500, 16000, 'DATABASE_ELASTICSEARCH', 'elasticsearch', '系统软件', '', 16500, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (16600, 16000, 'DATABASE_MONGODB', 'mongodb', '系统软件', '', 16600, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (17000, 0, 'MIDDLEWARE', '中间件', '系统软件', '', 20002, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (17100, 17000, 'MIDDLEWARE_WEBLOGIC', 'weblogic', '系统软件', '', 17100, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (17200, 17000, 'MIDDLEWARE_KAFKA', 'kafka', '系统软件', '', 17200, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (17300, 17000, 'MIDDLEWARE_NGINX', 'nginx', '系统软件', '', 17300, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (17400, 17000, 'MIDDLEWARE_ZOOKEEPER', 'zookeeper', '系统软件', '', 17400, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (17500, 17000, 'MIDDLEWARE_TOMCAT', 'tomcat', '系统软件', '', 17500, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (17600, 17000, 'MIDDLEWARE_MQ', 'MQ', '系统软件', '', 17600, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (18000, 0, 'NETHARDWARE', '计算机网络设备', '网络系统', '', 18000, '', '', '', '', '', '', '', '', '', '', 'v_resource_nethardware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (18100, 18000, 'NETHARDWARE_ROUTER', '路由器', '网络系统', '', 18100, '', '', '', '', '', '', '', '', '', '', 'v_resource_nethardware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (18200, 18000, 'NETHARDWARE_SWITCHBOARD', '交换机', '网络系统', '', 18200, '', '', '', '', '', '', '', '', '', '', 'v_resource_nethardware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (18300, 18000, 'NETHARDWARE_LOADBALANCING', '负载均衡', '网络系统', '', 18300, '', '', '', '', '', '', '', '', '', '', 'v_resource_nethardware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (19000, 0, 'NETSAFE', '安全设备', '安全设备', '', 19000, '', '', '', '', '', '', '', '', '', '', 'v_resource_netsafe', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (19100, 19000, 'NETSAFE_FIREWALL', '防火墙', '安全设备', '', 19100, '', '', '', '', '', '', '', '', '', '', 'v_resource_netsafe', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (11100, 0, 'HOST_MINICOMPUTER', '整机', '计算存储', '', 11100, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_minipc', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (11102, 0, 'HOST_MINICOMPUTER_PARTITION', '分区', '计算存储', '', 11102, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_minipc_part', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (11200, 0, 'HOST_X86SERVER', 'PC服务器', '计算存储', '', 11200, '', '', '', '', '', '', '', '', '', '', 'v_resource_pc',
+        '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (11300, 0, 'HOST_ONECOMPUTER', '一体机', '计算存储', '', 11300, '', '', '', '', '', '', '', '', '', '', 'v_resource_pc',
+        '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (12100, 0, 'VIRTUALIZATION_VMWARE', 'VMWARE', '计算存储', '', 12100, '', NULL, '', '', '', '', '', '', '', '',
+        'v_resource_vmware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (12110, 12100, 'VIRTUALIZATION_VMWARE_CLUSTER', 'vm资源池', '计算存储', '', 12110, '', '', '', '', '', '', '', '', '',
+        '', 'v_resource_vmware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (12120, 12100, 'VIRTUALIZATION_VMWARE_PHYSICSHOST', 'vm宿主机', '计算存储', '', 12120, '', '', '', '', '', '', '', '',
+        '', '', 'v_resource_vmware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (12130, 12100, 'VIRTUALIZATION_VMWARE_VHOST', 'vm虚拟机', '计算存储', '', 12130, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_vmware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (12900, 12100, 'VIRTUALIZATION_VHOST', '虚拟机', '计算存储', '', 12900, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_vmware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (13000, 0, 'HUAWEI_CLOUD_PLAT', '华为云', '计算存储', '', 13000, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_hw', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (13100, 13000, 'HUAWEI_CLOUD_COLONY', '资源池', '计算存储', '', 13100, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_hw', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (13101, 13000, 'HUAWEI_CLOUD_STORAGE', '存储', '计算存储', '', 13101, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_hw', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (13102, 13000, 'HUAWEI_CLOUD_SWITCHBOARD', '交换机', '计算存储', '', 13102, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_hw', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (13103, 13000, 'HUAWEI_CLOUD_FIREWALL', '防火墙', '计算存储', '', 13103, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_hw', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (13110, 13000, 'HUAWEI_CLOUD_CLUSTER', '集群', '计算存储', '', 13110, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_hw', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (13111, 13000, 'HUAWEI_CLOUD_CLUSTER_OST', '物理机', '计算存储', '', 13111, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_hw', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (13112, 13000, 'HUAWEI_CLOUD_VIRTUALHOST', '虚拟机', '计算存储', '', 13112, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_hw', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (14000, 0, 'ALI_CLOUD_PLAT', '阿里云', '计算存储', '', 14000, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_ali', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (14100, 14000, 'ALI_CLOUD_ECS', 'ECS-云服务器', '计算存储', '', 14100, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_ali', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (14200, 14000, 'ALI_CLOUD_RDS', 'RDS-云数据库', '计算存储', '', 14200, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_ali', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (14300, 14000, 'ALI_CLOUD_SLB', 'SLB-负载均衡', '计算存储', '', 14300, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_ali', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (14400, 14000, 'ALI_CLOUD_OSS', 'OSS-对象存储', '计算存储', '', 14400, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_ali', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (15000, 0, 'STORAGE', '存储设备', '计算存储', '', 15000, '', '', '', '', '', '', '', '', '', '', 'v_resource_storage',
+        '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (15100, 15000, 'STORAGE_SHARE', '共享存储', '计算存储', '', 15100, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_storage', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (15101, 15100, 'STORAGE_SHARE_LUN', 'LUN', '计算存储', '', 15100, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_storage_lun', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (15300, 15000, 'STORAGE_TAPELIBRARY', '物理带库', '计算存储', '', 15300, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_storage', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (15400, 15000, 'STORAGE_VTAPELIBRARY', '虚拟带库', '计算存储', '', 15400, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_storage', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (16000, 0, 'DATABASE', '数据库', '系统软件', '', 20001, '', '', '', '', '', '', '', '', '', '', 'v_resource_database',
+        '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (16100, 16000, 'DATABASE_ORACLE', 'oracle', '系统软件', '', 16100, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_database', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (16101, 16000, 'DATABASE_RAC', 'oracle集群', '系统软件', '', 16101, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_database', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (16200, 16000, 'DATABASE_OGG', 'ogg', '系统软件', '', 16200, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_database', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (16300, 16000, 'DATABASE_MYSQL', 'mysql', '系统软件', '', 16300, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_database', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (16400, 16000, 'DATABASE_REDIS', 'redis', '系统软件', '', 16400, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_database', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (16500, 16000, 'DATABASE_ELASTICSEARCH', 'elasticsearch', '系统软件', '', 16500, '', '', '', '', '', '', '', '', '',
+        '', 'v_resource_database', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (16600, 16000, 'DATABASE_MONGODB', 'mongodb', '系统软件', '', 16600, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_database', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (17000, 0, 'MIDDLEWARE', '中间件', '系统软件', '', 20002, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_middleware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (17100, 17000, 'MIDDLEWARE_WEBLOGIC', 'weblogic', '系统软件', '', 17100, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_middleware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (17200, 17000, 'MIDDLEWARE_KAFKA', 'kafka', '系统软件', '', 17200, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_middleware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (17300, 17000, 'MIDDLEWARE_NGINX', 'nginx', '系统软件', '', 17300, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_middleware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (17400, 17000, 'MIDDLEWARE_ZOOKEEPER', 'zookeeper', '系统软件', '', 17400, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_middleware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (17500, 17000, 'MIDDLEWARE_TOMCAT', 'tomcat', '系统软件', '', 17500, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_middleware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (17600, 17000, 'MIDDLEWARE_MQ', 'MQ', '系统软件', '', 17600, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_middleware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (18000, 0, 'NETHARDWARE', '计算机网络设备', '网络系统', '', 18000, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_nethardware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (18100, 18000, 'NETHARDWARE_ROUTER', '路由器', '网络系统', '', 18100, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_nethardware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (18200, 18000, 'NETHARDWARE_SWITCHBOARD', '交换机', '网络系统', '', 18200, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_nethardware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (18300, 18000, 'NETHARDWARE_LOADBALANCING', '负载均衡', '网络系统', '', 18300, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_nethardware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (19000, 0, 'NETSAFE', '安全设备', '安全设备', '', 19000, '', '', '', '', '', '', '', '', '', '', 'v_resource_netsafe',
+        '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (19100, 19000, 'NETSAFE_FIREWALL', '防火墙', '安全设备', '', 19100, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_netsafe', '2021-10-14 11:28:32');
 
 
-SET FOREIGN_KEY_CHECKS = 1;
+SET
+FOREIGN_KEY_CHECKS = 1;

@@ -15,19 +15,22 @@
 */
 */
 
 
 SET NAMES utf8mb4;
 SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
+SET
+FOREIGN_KEY_CHECKS = 0;
 
 
 -- ----------------------------
 -- ----------------------------
 -- Table structure for b_res_list_config_v32
 -- Table structure for b_res_list_config_v32
 -- ----------------------------
 -- ----------------------------
 DROP TABLE IF EXISTS `b_res_list_config_v32`;
 DROP TABLE IF EXISTS `b_res_list_config_v32`;
-CREATE TABLE `b_res_list_config_v32`  (
-  `id` int(0) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `resListId` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '资源类型（b_restype_config_v32主键）',
-  `colKey` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '展示行key',
-  `colAlias` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '别名，默认当前属性key名称',
-  `colType` int(0) NULL DEFAULT NULL COMMENT '类型 ',
-  `colWidth` double(10, 0) NULL DEFAULT 120 COMMENT '宽度，默认120，单位px',
+CREATE TABLE `b_res_list_config_v32`
+(
+    `id`        int(0) NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `resListId` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '资源类型（b_restype_config_v32主键）',
+    `colKey`    varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '展示行key',
+    `colAlias`  varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '别名，默认当前属性key名称',
+    `colType`   int(0) NULL DEFAULT NULL COMMENT '类型 ',
+    `colWidth`  double(10, 0
+) NULL DEFAULT 120 COMMENT '宽度，默认120，单位px',
   `colGroup` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '分组标识',
   `colGroup` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '分组标识',
   `colIsTd` int(0) NULL DEFAULT 1 COMMENT '是否是二维 0是1否，，默认1',
   `colIsTd` int(0) NULL DEFAULT 1 COMMENT '是否是二维 0是1否，，默认1',
   `colProps` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '字段扩展',
   `colProps` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '字段扩展',
@@ -50,109 +53,255 @@ CREATE TABLE `b_res_list_config_v32`  (
 -- ----------------------------
 -- ----------------------------
 -- Records of b_res_list_config_v32
 -- Records of b_res_list_config_v32
 -- ----------------------------
 -- ----------------------------
-INSERT INTO `b_res_list_config_v32` VALUES (3, '1', 'resId', '资源编号', NULL, 220, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:00', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (4, '2', 'resName', '资源名称', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:01', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (5, '3', 'ip', 'IP', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:02', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (6, '5', 'resType', '资源类型', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:03', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (7, '6', 'os', '系统', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:03', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (8, '8', 'provider', '厂商', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:05', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (9, '9', 'resDomain', '所属域', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:05', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (10, '1', 'platform', '平台', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:07', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (11, '1', 'model', '型号', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:08', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (12, '1', 'resAdminMaster', '资源管理员', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:08', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (13, '1', 'busId', '业务id', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:09', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (14, '1', 'monitorState', '监控状态', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:09', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (15, '1', 'health', '健康度', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:10', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (16, '1', 'resPositon', '所属机房', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:10', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (17, '1', 'cabinetNo', '机柜编号', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:11', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (18, '1', 'uLocation', 'U位', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:11', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (19, '1', 'resourceSN', '序列号(SN)', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:12', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (20, '1', 'partitionNum', '分区数量', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:12', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (21, '1', 'cpuNucleus', 'CPU核数', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:13', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (22, '11', 'memoryTotal', '内存总大小', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:14', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (23, '1', 'maintenanceProvider', '维保厂商', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:14', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (24, '1', 'maintenanceEnd', '维保截止日期', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:15', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (25, '1', 'parentId', '所属资源编号', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:15', NULL, NULL);
-INSERT INTO `b_res_list_config_v32` VALUES (26, '1', 'manageIp', '管理IP', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, '2021-10-14 23:27:16', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (3, '1', 'resId', '资源编号', NULL, 220, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:00', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (4, '2', 'resName', '资源名称', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:01', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (5, '3', 'ip', 'IP', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:02', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (6, '5', 'resType', '资源类型', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:03', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (7, '6', 'os', '系统', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:03', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (8, '8', 'provider', '厂商', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:05', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (9, '9', 'resDomain', '所属域', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:05', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (10, '1', 'platform', '平台', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:07', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (11, '1', 'model', '型号', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:08', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (12, '1', 'resAdminMaster', '资源管理员', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:08', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (13, '1', 'busId', '业务id', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:09', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (14, '1', 'monitorState', '监控状态', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:09', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (15, '1', 'health', '健康度', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:10', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (16, '1', 'resPositon', '所属机房', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:10', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (17, '1', 'cabinetNo', '机柜编号', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:11', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (18, '1', 'uLocation', 'U位', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:11', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (19, '1', 'resourceSN', '序列号(SN)', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:12', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (20, '1', 'partitionNum', '分区数量', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:12', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (21, '1', 'cpuNucleus', 'CPU核数', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:13', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (22, '11', 'memoryTotal', '内存总大小', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:14', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (23, '1', 'maintenanceProvider', '维保厂商', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL,
+        NULL, '2021-10-14 23:27:14', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (24, '1', 'maintenanceEnd', '维保截止日期', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:15', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (25, '1', 'parentId', '所属资源编号', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:15', NULL, NULL);
+INSERT INTO `b_res_list_config_v32`
+VALUES (26, '1', 'manageIp', '管理IP', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL,
+        '2021-10-14 23:27:16', NULL, NULL);
 
 
 -- ----------------------------
 -- ----------------------------
 -- Table structure for b_res_list_tree_v32
 -- Table structure for b_res_list_tree_v32
 -- ----------------------------
 -- ----------------------------
 DROP TABLE IF EXISTS `b_res_list_tree_v32`;
 DROP TABLE IF EXISTS `b_res_list_tree_v32`;
-CREATE TABLE `b_res_list_tree_v32`  (
-  `id` int(0) NOT NULL AUTO_INCREMENT COMMENT '资源类型id',
-  `parentId` int(0) NULL DEFAULT NULL COMMENT '父资源类型',
-  `resType` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '资源类型CODE',
-  `nodeName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '节点名称',
-  `nodeDesc` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '节点描述',
-  `nodeType` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '节点分类',
-  `sort` int(0) NULL DEFAULT NULL COMMENT '排序',
-  `options` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '配置信息',
-  `detailProps` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '详情页属性、参数( JSON)',
-  `detailPage` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '详情页 对应字典：DETAIL_PAGE',
-  `ext1` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '扩展字段',
-  `ext2` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '扩展字段',
-  `ext3` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '扩展字段',
-  `ext4` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '扩展字段',
-  `ext5` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '扩展字段',
-  `querySub` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否查询子节点 0是1否，默认0，相同的资源类型值相同，否则按照否处理',
-  `excludeResType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '查询排除类型(TODO) ',
-  `veiwName` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '查询视图名称，默认值：v_resource',
-  `createTime` timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  PRIMARY KEY (`id`) USING BTREE,
-  INDEX `resType`(`id`, `resType`) USING BTREE
+CREATE TABLE `b_res_list_tree_v32`
+(
+    `id`             int(0) NOT NULL AUTO_INCREMENT COMMENT '资源类型id',
+    `parentId`       int(0) NULL DEFAULT NULL COMMENT '父资源类型',
+    `resType`        varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '资源类型CODE',
+    `nodeName`       varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '节点名称',
+    `nodeDesc`       varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '节点描述',
+    `nodeType`       varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '节点分类',
+    `sort`           int(0) NULL DEFAULT NULL COMMENT '排序',
+    `options`        varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '配置信息',
+    `detailProps`    text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '详情页属性、参数( JSON)',
+    `detailPage`     varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '详情页 对应字典：DETAIL_PAGE',
+    `ext1`           varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '扩展字段',
+    `ext2`           varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '扩展字段',
+    `ext3`           varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '扩展字段',
+    `ext4`           varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '扩展字段',
+    `ext5`           varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '扩展字段',
+    `querySub`       varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否查询子节点 0是1否，默认0，相同的资源类型值相同，否则按照否处理',
+    `excludeResType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '查询排除类型(TODO) ',
+    `veiwName`       varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '查询视图名称，默认值：v_resource',
+    `createTime`     timestamp(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    PRIMARY KEY (`id`) USING BTREE,
+    INDEX            `resType`(`id`, `resType`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 50023 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '资源类型信息表' ROW_FORMAT = Dynamic;
 ) ENGINE = InnoDB AUTO_INCREMENT = 50023 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '资源类型信息表' ROW_FORMAT = Dynamic;
 
 
 -- ----------------------------
 -- ----------------------------
 -- Records of b_res_list_tree_v32
 -- Records of b_res_list_tree_v32
 -- ----------------------------
 -- ----------------------------
-INSERT INTO `b_res_list_tree_v32` VALUES (11100, 0, 'HOST_MINICOMPUTER', '整机', '计算存储', '', 11100, '', '', '', '', '', '', '', '', '', '', 'v_resource_minipc', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (11102, 0, 'HOST_MINICOMPUTER_PARTITION', '分区', '计算存储', '', 11102, '', '', '', '', '', '', '', '', '', '', 'v_resource_minipc_part', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (11200, 0, 'HOST_X86SERVER', 'PC服务器', '计算存储', '', 11200, '', '', '', '', '', '', '', '', '', '', 'v_resource_pc', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (11300, 0, 'HOST_ONECOMPUTER', '一体机', '计算存储', '', 11300, '', '', '', '', '', '', '', '', '', '', 'v_resource_pc', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (12100, 0, 'VIRTUALIZATION_VMWARE', 'VMWARE', '计算存储', '', 12100, '', NULL, '', '', '', '', '', '', '', '', 'v_resource_vmware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (12110, 12100, 'VIRTUALIZATION_VMWARE_CLUSTER', 'vm资源池', '计算存储', '', 12110, '', '', '', '', '', '', '', '', '', '', 'v_resource_vmware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (12120, 12100, 'VIRTUALIZATION_VMWARE_PHYSICSHOST', 'vm宿主机', '计算存储', '', 12120, '', '', '', '', '', '', '', '', '', '', 'v_resource_vmware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (12130, 12100, 'VIRTUALIZATION_VMWARE_VHOST', 'vm虚拟机', '计算存储', '', 12130, '', '', '', '', '', '', '', '', '', '', 'v_resource_vmware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (12900, 12100, 'VIRTUALIZATION_VHOST', '虚拟机', '计算存储', '', 12900, '', '', '', '', '', '', '', '', '', '', 'v_resource_vmware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (13000, 0, 'HUAWEI_CLOUD_PLAT', '华为云', '计算存储', '', 13000, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (13100, 13000, 'HUAWEI_CLOUD_COLONY', '资源池', '计算存储', '', 13100, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (13101, 13000, 'HUAWEI_CLOUD_STORAGE', '存储', '计算存储', '', 13101, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (13102, 13000, 'HUAWEI_CLOUD_SWITCHBOARD', '交换机', '计算存储', '', 13102, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (13103, 13000, 'HUAWEI_CLOUD_FIREWALL', '防火墙', '计算存储', '', 13103, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (13110, 13000, 'HUAWEI_CLOUD_CLUSTER', '集群', '计算存储', '', 13110, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (13111, 13000, 'HUAWEI_CLOUD_CLUSTER_OST', '物理机', '计算存储', '', 13111, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (13112, 13000, 'HUAWEI_CLOUD_VIRTUALHOST', '虚拟机', '计算存储', '', 13112, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (14000, 0, 'ALI_CLOUD_PLAT', '阿里云', '计算存储', '', 14000, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_ali', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (14100, 14000, 'ALI_CLOUD_ECS', 'ECS-云服务器', '计算存储', '', 14100, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_ali', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (14200, 14000, 'ALI_CLOUD_RDS', 'RDS-云数据库', '计算存储', '', 14200, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_ali', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (14300, 14000, 'ALI_CLOUD_SLB', 'SLB-负载均衡', '计算存储', '', 14300, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_ali', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (14400, 14000, 'ALI_CLOUD_OSS', 'OSS-对象存储', '计算存储', '', 14400, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_ali', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (15000, 0, 'STORAGE', '存储设备', '计算存储', '', 15000, '', '', '', '', '', '', '', '', '', '', 'v_resource_storage', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (15100, 15000, 'STORAGE_SHARE', '共享存储', '计算存储', '', 15100, '', '', '', '', '', '', '', '', '', '', 'v_resource_storage', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (15101, 15100, 'STORAGE_SHARE_LUN', 'LUN', '计算存储', '', 15100, '', '', '', '', '', '', '', '', '', '', 'v_resource_storage_lun', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (15300, 15000, 'STORAGE_TAPELIBRARY', '物理带库', '计算存储', '', 15300, '', '', '', '', '', '', '', '', '', '', 'v_resource_storage', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (15400, 15000, 'STORAGE_VTAPELIBRARY', '虚拟带库', '计算存储', '', 15400, '', '', '', '', '', '', '', '', '', '', 'v_resource_storage', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (16000, 0, 'DATABASE', '数据库', '系统软件', '', 20001, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (16100, 16000, 'DATABASE_ORACLE', 'oracle', '系统软件', '', 16100, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (16101, 16000, 'DATABASE_RAC', 'oracle集群', '系统软件', '', 16101, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (16200, 16000, 'DATABASE_OGG', 'ogg', '系统软件', '', 16200, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (16300, 16000, 'DATABASE_MYSQL', 'mysql', '系统软件', '', 16300, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (16400, 16000, 'DATABASE_REDIS', 'redis', '系统软件', '', 16400, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (16500, 16000, 'DATABASE_ELASTICSEARCH', 'elasticsearch', '系统软件', '', 16500, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (16600, 16000, 'DATABASE_MONGODB', 'mongodb', '系统软件', '', 16600, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (17000, 0, 'MIDDLEWARE', '中间件', '系统软件', '', 20002, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (17100, 17000, 'MIDDLEWARE_WEBLOGIC', 'weblogic', '系统软件', '', 17100, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (17200, 17000, 'MIDDLEWARE_KAFKA', 'kafka', '系统软件', '', 17200, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (17300, 17000, 'MIDDLEWARE_NGINX', 'nginx', '系统软件', '', 17300, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (17400, 17000, 'MIDDLEWARE_ZOOKEEPER', 'zookeeper', '系统软件', '', 17400, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (17500, 17000, 'MIDDLEWARE_TOMCAT', 'tomcat', '系统软件', '', 17500, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (17600, 17000, 'MIDDLEWARE_MQ', 'MQ', '系统软件', '', 17600, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (18000, 0, 'NETHARDWARE', '计算机网络设备', '网络系统', '', 18000, '', '', '', '', '', '', '', '', '', '', 'v_resource_nethardware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (18100, 18000, 'NETHARDWARE_ROUTER', '路由器', '网络系统', '', 18100, '', '', '', '', '', '', '', '', '', '', 'v_resource_nethardware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (18200, 18000, 'NETHARDWARE_SWITCHBOARD', '交换机', '网络系统', '', 18200, '', '', '', '', '', '', '', '', '', '', 'v_resource_nethardware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (18300, 18000, 'NETHARDWARE_LOADBALANCING', '负载均衡', '网络系统', '', 18300, '', '', '', '', '', '', '', '', '', '', 'v_resource_nethardware', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (19000, 0, 'NETSAFE', '安全设备', '安全设备', '', 19000, '', '', '', '', '', '', '', '', '', '', 'v_resource_netsafe', '2021-10-14 11:28:32');
-INSERT INTO `b_res_list_tree_v32` VALUES (19100, 19000, 'NETSAFE_FIREWALL', '防火墙', '安全设备', '', 19100, '', '', '', '', '', '', '', '', '', '', 'v_resource_netsafe', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (11100, 0, 'HOST_MINICOMPUTER', '整机', '计算存储', '', 11100, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_minipc', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (11102, 0, 'HOST_MINICOMPUTER_PARTITION', '分区', '计算存储', '', 11102, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_minipc_part', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (11200, 0, 'HOST_X86SERVER', 'PC服务器', '计算存储', '', 11200, '', '', '', '', '', '', '', '', '', '', 'v_resource_pc',
+        '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (11300, 0, 'HOST_ONECOMPUTER', '一体机', '计算存储', '', 11300, '', '', '', '', '', '', '', '', '', '', 'v_resource_pc',
+        '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (12100, 0, 'VIRTUALIZATION_VMWARE', 'VMWARE', '计算存储', '', 12100, '', NULL, '', '', '', '', '', '', '', '',
+        'v_resource_vmware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (12110, 12100, 'VIRTUALIZATION_VMWARE_CLUSTER', 'vm资源池', '计算存储', '', 12110, '', '', '', '', '', '', '', '', '',
+        '', 'v_resource_vmware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (12120, 12100, 'VIRTUALIZATION_VMWARE_PHYSICSHOST', 'vm宿主机', '计算存储', '', 12120, '', '', '', '', '', '', '', '',
+        '', '', 'v_resource_vmware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (12130, 12100, 'VIRTUALIZATION_VMWARE_VHOST', 'vm虚拟机', '计算存储', '', 12130, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_vmware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (12900, 12100, 'VIRTUALIZATION_VHOST', '虚拟机', '计算存储', '', 12900, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_vmware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (13000, 0, 'HUAWEI_CLOUD_PLAT', '华为云', '计算存储', '', 13000, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_hw', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (13100, 13000, 'HUAWEI_CLOUD_COLONY', '资源池', '计算存储', '', 13100, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_hw', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (13101, 13000, 'HUAWEI_CLOUD_STORAGE', '存储', '计算存储', '', 13101, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_hw', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (13102, 13000, 'HUAWEI_CLOUD_SWITCHBOARD', '交换机', '计算存储', '', 13102, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_hw', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (13103, 13000, 'HUAWEI_CLOUD_FIREWALL', '防火墙', '计算存储', '', 13103, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_hw', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (13110, 13000, 'HUAWEI_CLOUD_CLUSTER', '集群', '计算存储', '', 13110, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_hw', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (13111, 13000, 'HUAWEI_CLOUD_CLUSTER_OST', '物理机', '计算存储', '', 13111, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_hw', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (13112, 13000, 'HUAWEI_CLOUD_VIRTUALHOST', '虚拟机', '计算存储', '', 13112, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_hw', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (14000, 0, 'ALI_CLOUD_PLAT', '阿里云', '计算存储', '', 14000, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_ali', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (14100, 14000, 'ALI_CLOUD_ECS', 'ECS-云服务器', '计算存储', '', 14100, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_ali', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (14200, 14000, 'ALI_CLOUD_RDS', 'RDS-云数据库', '计算存储', '', 14200, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_ali', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (14300, 14000, 'ALI_CLOUD_SLB', 'SLB-负载均衡', '计算存储', '', 14300, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_ali', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (14400, 14000, 'ALI_CLOUD_OSS', 'OSS-对象存储', '计算存储', '', 14400, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_cloud_ali', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (15000, 0, 'STORAGE', '存储设备', '计算存储', '', 15000, '', '', '', '', '', '', '', '', '', '', 'v_resource_storage',
+        '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (15100, 15000, 'STORAGE_SHARE', '共享存储', '计算存储', '', 15100, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_storage', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (15101, 15100, 'STORAGE_SHARE_LUN', 'LUN', '计算存储', '', 15100, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_storage_lun', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (15300, 15000, 'STORAGE_TAPELIBRARY', '物理带库', '计算存储', '', 15300, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_storage', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (15400, 15000, 'STORAGE_VTAPELIBRARY', '虚拟带库', '计算存储', '', 15400, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_storage', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (16000, 0, 'DATABASE', '数据库', '系统软件', '', 20001, '', '', '', '', '', '', '', '', '', '', 'v_resource_database',
+        '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (16100, 16000, 'DATABASE_ORACLE', 'oracle', '系统软件', '', 16100, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_database', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (16101, 16000, 'DATABASE_RAC', 'oracle集群', '系统软件', '', 16101, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_database', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (16200, 16000, 'DATABASE_OGG', 'ogg', '系统软件', '', 16200, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_database', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (16300, 16000, 'DATABASE_MYSQL', 'mysql', '系统软件', '', 16300, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_database', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (16400, 16000, 'DATABASE_REDIS', 'redis', '系统软件', '', 16400, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_database', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (16500, 16000, 'DATABASE_ELASTICSEARCH', 'elasticsearch', '系统软件', '', 16500, '', '', '', '', '', '', '', '', '',
+        '', 'v_resource_database', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (16600, 16000, 'DATABASE_MONGODB', 'mongodb', '系统软件', '', 16600, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_database', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (17000, 0, 'MIDDLEWARE', '中间件', '系统软件', '', 20002, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_middleware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (17100, 17000, 'MIDDLEWARE_WEBLOGIC', 'weblogic', '系统软件', '', 17100, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_middleware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (17200, 17000, 'MIDDLEWARE_KAFKA', 'kafka', '系统软件', '', 17200, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_middleware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (17300, 17000, 'MIDDLEWARE_NGINX', 'nginx', '系统软件', '', 17300, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_middleware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (17400, 17000, 'MIDDLEWARE_ZOOKEEPER', 'zookeeper', '系统软件', '', 17400, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_middleware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (17500, 17000, 'MIDDLEWARE_TOMCAT', 'tomcat', '系统软件', '', 17500, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_middleware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (17600, 17000, 'MIDDLEWARE_MQ', 'MQ', '系统软件', '', 17600, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_middleware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (18000, 0, 'NETHARDWARE', '计算机网络设备', '网络系统', '', 18000, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_nethardware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (18100, 18000, 'NETHARDWARE_ROUTER', '路由器', '网络系统', '', 18100, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_nethardware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (18200, 18000, 'NETHARDWARE_SWITCHBOARD', '交换机', '网络系统', '', 18200, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_nethardware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (18300, 18000, 'NETHARDWARE_LOADBALANCING', '负载均衡', '网络系统', '', 18300, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_nethardware', '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (19000, 0, 'NETSAFE', '安全设备', '安全设备', '', 19000, '', '', '', '', '', '', '', '', '', '', 'v_resource_netsafe',
+        '2021-10-14 11:28:32');
+INSERT INTO `b_res_list_tree_v32`
+VALUES (19100, 19000, 'NETSAFE_FIREWALL', '防火墙', '安全设备', '', 19100, '', '', '', '', '', '', '', '', '', '',
+        'v_resource_netsafe', '2021-10-14 11:28:32');
 
 
-SET FOREIGN_KEY_CHECKS = 1;
+SET
+FOREIGN_KEY_CHECKS = 1;

 # 任务地址
 # 任务地址
-[https://hgkj.5upm.com/task-view-72.html](任务地址)
-
-
 
 
+[https://hgkj.5upm.com/task-view-72.html](任务地址)
 
 
 ## 涉及SQL
 ## 涉及SQL
-`V1015_1_乙方运维数据库设计SQL.txt`
 
 
+`V1015_1_乙方运维数据库设计SQL.txt`
 
 
 ## 涉及工程
 ## 涉及工程
+
 > 1、hg-monitor-web-zj<br>
 > 1、hg-monitor-web-zj<br>

 # 代码包路径
 # 代码包路径
+
 ````
 ````
 【后端】 hg-platform\business-center\view-center-project\view-center-zj\src\main\java\com\honggroup\manageapi\bdialtestconfig
 【后端】 hg-platform\business-center\view-center-project\view-center-zj\src\main\java\com\honggroup\manageapi\bdialtestconfig
 ````
 ````
 
 
 ### 说明
 ### 说明
+
 ````
 ````
 文档管理是一个组件，文档管理和回收站使用传参的方式，来控制读取数据的接口；
 文档管理是一个组件，文档管理和回收站使用传参的方式，来控制读取数据的接口；
 ````
 ````
 
 
 ## 配置文件修改
 ## 配置文件修改
+
 **api-gateway**</br>
 **api-gateway**</br>
 配置节点security:oauth2:ignored追加配置文件:**,/api-web/manage/bustype/getAllBusId,/api-web/manage/bdialtest/getTaskIdAndBusId**
 配置节点security:oauth2:ignored追加配置文件:**,/api-web/manage/bustype/getAllBusId,/api-web/manage/bdialtest/getTaskIdAndBusId**
+
 ````
 ````
 # 增加配置文件
 # 增加配置文件
 security:
 security:
@@ -20,4 +24,5 @@ security:
 ````
 ````
 
 
 ## 涉及工程
 ## 涉及工程
+
 > 1、view-center
 > 1、view-center

 # 任务地址
 # 任务地址
+
 [https://hgkj.5upm.com/task-view-73.html](任务地址)
 [https://hgkj.5upm.com/task-view-73.html](任务地址)
 
 
 # 代码包路径
 # 代码包路径
+
 ````
 ````
 【前端】【组件】hg-monitor-web\hg-monitor-web-base\src\main\resources\static\vue3\src\components\common\document
 【前端】【组件】hg-monitor-web\hg-monitor-web-base\src\main\resources\static\vue3\src\components\common\document
 【前端】【文档管理】hg-monitor-web\hg-monitor-web-zj\src\main\resources\static\vue3\src\views\documentationManagement\index.*
 【前端】【文档管理】hg-monitor-web\hg-monitor-web-zj\src\main\resources\static\vue3\src\views\documentationManagement\index.*
@@ -10,12 +12,13 @@
 ````
 ````
 
 
 ### 说明
 ### 说明
+
 ````
 ````
 文档管理是一个组件，文档管理和回收站使用传参的方式，来控制读取数据的接口；
 文档管理是一个组件，文档管理和回收站使用传参的方式，来控制读取数据的接口；
 ````
 ````
 
 
-
 ## 可选配置文件
 ## 可选配置文件
+
 ````
 ````
 report:
 report:
   config:
   config:
@@ -26,9 +29,11 @@ report:
 ````
 ````
 
 
 ## 涉及SQL
 ## 涉及SQL
+
 `SQL/zj/V1015_2_增加文档管理表字段.sql`
 `SQL/zj/V1015_2_增加文档管理表字段.sql`
 
 
 ## 涉及工程
 ## 涉及工程
->> hg-monitor-web-zj
+
+> > hg-monitor-web-zj
 >
 >
 >> inspection-report
 >> inspection-report

 # 代码包路径
 # 代码包路径
+
 ````
 ````
 【前端】hg-monitor-web-base\src\main\resources\static\src\views\reportView
 【前端】hg-monitor-web-base\src\main\resources\static\src\views\reportView
 ````
 ````
 
 
 ### 说明
 ### 说明
+
 ````
 ````
 集成积木报表
 集成积木报表
 ````
 ````
 
 
 ### 菜单配置说明
 ### 菜单配置说明
+
 ````
 ````
 菜单URL:reportView/index/reportCode=dddd 
 菜单URL:reportView/index/reportCode=dddd 
 dddd = 展示的报表编号
 dddd = 展示的报表编号

 # 任务地址
 # 任务地址
-[https://hgkj.5upm.com/my/](任务地址)
 
 
+[https://hgkj.5upm.com/my/](任务地址)
 
 
 ## 配置文件修改
 ## 配置文件修改
+
 ````
 ````
 # 增加配置文件
 # 增加配置文件
 spring:
 spring:
@@ -11,9 +12,10 @@ spring:
 ````
 ````
 
 
 ## 涉及SQL
 ## 涉及SQL
-`例:SQL/zj/V1015_2_增加文档管理表字段.sql`
 
 
+`例:SQL/zj/V1015_2_增加文档管理表字段.sql`
 
 
 ## 涉及工程
 ## 涉及工程
+
 > 1、hg-monitor-web-zj<br>
 > 1、hg-monitor-web-zj<br>
 > 2、inspection-report
 > 2、inspection-report

 # 任务地址
 # 任务地址
+
 [https://hgkj.5upm.com/bug-view-71.html](任务地址)
 [https://hgkj.5upm.com/bug-view-71.html](任务地址)
 
 
 ## 配置文件修改
 ## 配置文件修改
+
 ````
 ````
 #增加业务健康度IP地址
 #增加业务健康度IP地址
 url:
 url:
@@ -9,4 +11,5 @@ url:
 ````
 ````
 
 
 ## 涉及工程
 ## 涉及工程
+
 > hg-monitor-web-zj
 > hg-monitor-web-zj

 ## 文档
 ## 文档
+
 文档基于vue-press实现，运行步骤：
 文档基于vue-press实现，运行步骤：
 
 
 1. npm install
 1. npm install

@@ -34,7 +34,9 @@ module.exports = {
                     children: [
                     children: [
                         {title: '版本说明', path: '/version520/'},
                         {title: '版本说明', path: '/version520/'},
                         {title: '发布', path: '/version520/20220617'},
                         {title: '发布', path: '/version520/20220617'},
+                        {title: '乙方运维', path: '/version520/operationsMaintenance'},
                         {title: '首页布局', path: '/version520/indexLayout'},
                         {title: '首页布局', path: '/version520/indexLayout'},
+                        {title: '故障管理', path: '/version520/faultDiagnosis'},
                     ]
                     ]
                 }
                 }
             ]
             ]

@@ -9,15 +9,19 @@ pre.vue-container
   border-left-style: solid;
   border-left-style: solid;
   border-color: #42b983;
   border-color: #42b983;
   border-radius: 0px;
   border-radius: 0px;
+
   & > code
   & > code
     font-size: 14px !important;
     font-size: 14px !important;
+
     & > p
     & > p
       margin: -5px 0 -20px 0;
       margin: -5px 0 -20px 0;
+
     code
     code
       background-color: #42b983 !important;
       background-color: #42b983 !important;
       padding: 3px 5px;
       padding: 3px 5px;
       border-radius: 3px;
       border-radius: 3px;
       color #000
       color #000
+
     em
     em
       color #808080
       color #808080
-      font-weight light
+      font-weight light

@@ -3,28 +3,24 @@
 .
 .
 ├─ README.md
 ├─ README.md
 ├─ foo
 ├─ foo
-│  ├─ README.md
-│  ├─ one.md
-│  └─ two.md
+│ ├─ README.md
+│ ├─ one.md
+│ └─ two.md
 └─ bar
 └─ bar
 ├─ README.md
 ├─ README.md
 ├─ three.md
 ├─ three.md
 └─ four.md
 └─ four.md
 
 
-
 | Tables        | Are           | Cool  |
 | Tables        | Are           | Cool  |
 | ------------- |:-------------:| -----:|
 | ------------- |:-------------:| -----:|
 | col 3 is      | right-aligned | $1600 |
 | col 3 is      | right-aligned | $1600 |
 | col 2 is      | centered      |   $12 |
 | col 2 is      | centered      |   $12 |
 | zebra stripes | are neat      |    $1 |
 | zebra stripes | are neat      |    $1 |
 
 
-
 :tada: :100:
 :tada: :100:
 
 
-
 [[toc]]
 [[toc]]
 
 
-
 ::: tip
 ::: tip
 这是一个提示
 这是一个提示
 :::
 :::
@@ -41,19 +37,17 @@
 这是一个详情块，在 IE / Edge 中不生效
 这是一个详情块，在 IE / Edge 中不生效
 :::
 :::
 
 
-
-
 ::: danger STOP
 ::: danger STOP
 危险区域，禁止通行
 危险区域，禁止通行
 :::
 :::
 
 
 ::: details 点击查看代码
 ::: details 点击查看代码
+
 ```js
 ```js
 console.log('你好，VuePress！')
 console.log('你好，VuePress！')
 ```
 ```
-:::
-
 
 
+:::
 
 
 ``` js
 ``` js
 export default {
 export default {
@@ -62,8 +56,6 @@ export default {
 }
 }
 ```
 ```
 
 
-
-
 ``` html
 ``` html
 <ul>
 <ul>
   <li
   <li
@@ -75,7 +67,6 @@ export default {
 </ul>
 </ul>
 ```
 ```
 
 
-
 ``` js{1,4,6-7}
 ``` js{1,4,6-7}
 export default { // Highlighted
 export default { // Highlighted
   data () {
   data () {

@@ -9,8 +9,6 @@
 | 2   | 各个现场支撑  |        29次         |
 | 2   | 各个现场支撑  |        29次         |
 | 3   | 功能点开发   |        10个         |
 | 3   | 功能点开发   |        10个         |
 
 
-
-
 ::: tip 首页明确统计规则展示
 ::: tip 首页明确统计规则展示
 在右上角展示统计规则
 在右上角展示统计规则
 :::
 :::
@@ -28,19 +26,17 @@
 这是一个详情块，在 IE / Edge 中不生效
 这是一个详情块，在 IE / Edge 中不生效
 :::
 :::
 
 
-
-
 ::: danger STOP
 ::: danger STOP
 危险区域，禁止通行
 危险区域，禁止通行
 :::
 :::
 
 
 ::: details 点击查看代码
 ::: details 点击查看代码
+
 ```js
 ```js
 console.log('你好，VuePress！')
 console.log('你好，VuePress！')
 ```
 ```
-:::
-
 
 
+:::
 
 
 ``` js
 ``` js
 export default {
 export default {
@@ -49,8 +45,6 @@ export default {
 }
 }
 ```
 ```
 
 
-
-
 ``` html
 ``` html
 <ul>
 <ul>
   <li
   <li
@@ -62,7 +56,6 @@ export default {
 </ul>
 </ul>
 ```
 ```
 
 
-
 ``` js{1,4,6-7}
 ``` js{1,4,6-7}
 export default { // Highlighted
 export default { // Highlighted
   data () {
   data () {

@@ -9,8 +9,6 @@
 | 2   | 各个现场支撑  |        29次         |
 | 2   | 各个现场支撑  |        29次         |
 | 3   | 功能点开发   |        10个         |
 | 3   | 功能点开发   |        10个         |
 
 
-
-
 ::: tip 首页明确统计规则展示
 ::: tip 首页明确统计规则展示
 在右上角展示统计规则
 在右上角展示统计规则
 :::
 :::
@@ -28,19 +26,17 @@
 这是一个详情块，在 IE / Edge 中不生效
 这是一个详情块，在 IE / Edge 中不生效
 :::
 :::
 
 
-
-
 ::: danger STOP
 ::: danger STOP
 危险区域，禁止通行
 危险区域，禁止通行
 :::
 :::
 
 
 ::: details 点击查看代码
 ::: details 点击查看代码
+
 ```js
 ```js
 console.log('你好，VuePress！')
 console.log('你好，VuePress！')
 ```
 ```
-:::
-
 
 
+:::
 
 
 ``` js
 ``` js
 export default {
 export default {
@@ -49,8 +45,6 @@ export default {
 }
 }
 ```
 ```
 
 
-
-
 ``` html
 ``` html
 <ul>
 <ul>
   <li
   <li
@@ -62,7 +56,6 @@ export default {
 </ul>
 </ul>
 ```
 ```
 
 
-
 ``` js{1,4,6-7}
 ``` js{1,4,6-7}
 export default { // Highlighted
 export default { // Highlighted
   data () {
   data () {

 &emsp; &emsp; 监控版本升级记录<br>
 &emsp; &emsp; 监控版本升级记录<br>
- 
 
 
 | Tables        | Are           | Cool  |
 | Tables        | Are           | Cool  |
 | ------------- |:-------------:| -----:|
 | ------------- |:-------------:| -----:|
@@ -7,13 +6,10 @@
 | col 2 is      | centered      |   $12 |
 | col 2 is      | centered      |   $12 |
 | zebra stripes | are neat      |    $1 |
 | zebra stripes | are neat      |    $1 |
 
 
-
 :tada: :100:
 :tada: :100:
 
 
-
 [[toc]]
 [[toc]]
 
 
-
 ::: tip
 ::: tip
 这是一个提示
 这是一个提示
 :::
 :::
@@ -30,19 +26,17 @@
 这是一个详情块，在 IE / Edge 中不生效
 这是一个详情块，在 IE / Edge 中不生效
 :::
 :::
 
 
-
-
 ::: danger STOP
 ::: danger STOP
 危险区域，禁止通行
 危险区域，禁止通行
 :::
 :::
 
 
 ::: details 点击查看代码
 ::: details 点击查看代码
+
 ```js
 ```js
 console.log('你好，VuePress！')
 console.log('你好，VuePress！')
 ```
 ```
-:::
-
 
 
+:::
 
 
 ``` js
 ``` js
 export default {
 export default {
@@ -51,8 +45,6 @@ export default {
 }
 }
 ```
 ```
 
 
-
-
 ``` html
 ``` html
 <ul>
 <ul>
   <li
   <li
@@ -64,7 +56,6 @@ export default {
 </ul>
 </ul>
 ```
 ```
 
 
-
 ``` js{1,4,6-7}
 ``` js{1,4,6-7}
 export default { // Highlighted
 export default { // Highlighted
   data () {
   data () {

+::: tip 故障管理
+功能概述：对故障诊断产生的诊断数据进行展示并对产生的故障信息进行处理 <br/>
+:::
+::: tip 故障列表
+步骤说明：点击故障管理展示故障诊断产生的诊断数据，点击故障主体查看详细数据情况。以及已经处理的相关意见<br/>
+接口：/api-web/fault/page
+:::
+![img](../picture/520/fault/fault_list.png) <br/>
+
+![img](../picture/520/fault/fault_list_detail.png) <br/>
+![img](../picture/520/fault/fault_list_detail_1.png) <br/>
+::: tip 故障诊断配置
+步骤说明：对故障诊断的增删改查的业务操作<br/>
+接口：/api-web/fault/conf/page
+:::
+![img](../picture/520/fault/fault_set.png) <br/>
+![img](../picture/520/fault/fault_set_1.png) <br/>
+![img](../picture/520/fault/fault_set_2.png) <br/>
+![img](../picture/520/fault/fault_set_3.png) <br/>
+![img](../picture/520/fault/fault_set_4.png) <br/>
+![img](../picture/520/fault/fault_set_5.png) <br/>
+
+::: tip 功能数据来源
+<br/>
+:::
+
+
+ 
+
+
+

 ::: tip 首页布局
 ::: tip 首页布局
+功能概述：首页功能主要实现了对业务、资源及告警数量的总览，它展现的是由一个个卡片组成的页面，卡片的嵌套说明了资源与业务的归属关系，每个按钮分别支持下探查看详情，方便用户对业务资源信息的查看<br/>
 layout.html：hg-monitor-web\hg-monitor-web-base\src\main\resources\static\src\views\layout.html<br/>
 layout.html：hg-monitor-web\hg-monitor-web-base\src\main\resources\static\src\views\layout.html<br/>
 layout-nx：hg-monitor-web\hg-monitor-web-base\src\main\resources\static\src\views\layout.html
 layout-nx：hg-monitor-web\hg-monitor-web-base\src\main\resources\static\src\views\layout.html
 :::
 :::
 layout:
 layout:
-<img src="/indexLayout.jpg" >
+![img](../picture/520/indexLayout/indexLayout.jpg) <br>
+
 layout-nx:
 layout-nx:
-<img src="/indexLayout-nx.png" >
+![img](../picture/520/indexLayout/indexLayout-nx.png) <br>
+
 
 
 ::: tip 功能数据来源
 ::: tip 功能数据来源
 菜单功能：`user-center`.`sys_menu`<br/>
 菜单功能：`user-center`.`sys_menu`<br/>
-主体卡片：<br/>
-  获取告警统计信息:/api-web/home/alarm/countByAlarmLevel <br/>
-  资源列表:
 :::
 :::
-::: tip 搜索条件来源
-字典：<br/>
-逻辑关系：
+::: tip 菜单信息
+菜单接口：/api-user/menus/current?type=1 </br>
+:::
+::: tip 主体卡片信息
+业务卡片及业务统计：/api-web/home/business/getBusHealthResultByAlarm?filter=2&layout=layout <br/>
+资源卡片及资源统计：/api-web/home/restype/getResTypeHealthResult <br/>
+layout-nx主体应用信息：/api-web/home/restype/getResTypeHealthResult <br/>
+:::
+::: tip 侧边伸缩功能
+
+![img](../picture/520/indexLayout/menuIsopen.png) <br>
+功能概述：对左侧菜单栏进行展开和收缩 <br/>
+菜单是否展开系统参数配置：api-web/sysConf/getByCode?code=view_menu_isopen <br/>
+```js
+INSERT INTO `cloud_backend_monitor`.`sys_conf`(`id`, `code`, `name`, `value`, `desc`, `sort`, `createTime`, `type`) VALUES ('3820d6e4bffd42e3b12192a67a78c60b', 'view_menu_isopen', '菜单初始是否展开', 'false', '参数值可选值( \'true\', \'false\' )', 1, '2021-06-22 15:06:23', 'conf_type_view');
+```
+:::
+::: tip 待办提醒功能
+功能概述：展示活动告警数量、工作日志提醒、工作日志未读提醒、重复监控资源数提醒及监控账号即将过期提醒等<br/>
+接口：/api-web/home/messageRemind
+:::
+![img](../picture/520/indexLayout/remind.png) <br/>
+::: tip 待办提醒功能操作步骤
+用户登录系统到首页后，鼠标放在上图中红色![img](../picture/520/indexLayout/remind_message.png)图标上，会悬浮活动告警数量，点击该按钮，则直接跳转到活动告警页面。
+如果用户有工作日志未填报或未查看，或者有权限的资源有重复监控，或者有权限的资源的监控账号即将过期，则会在首页右下角弹出提示信息，点击即可跳转到具体页面处理
+:::
+::: tip 登录用户信息功能概述
+修改密码：更新用户的登录密码。
+:::
+![img](../picture/520/indexLayout/updatePassword.png) <br>
+::: tip 修改密码操作步骤
+用户登录系统到首页后，鼠标放在右上角欢迎后的用户姓名，会弹出修改密码和退出按钮，点击修改密码，则会弹出修改密码弹框。
+用户输入原密码、新密码及确认密码，则可以修改密码。<br/>
+注意事项:<br/>
+a)	新密码不能与原密码一致<br/>
+b)	新密码必须符合密码安全等级（系统参数配置中配置）<br/>
+c)	新密码不能为用户最近5次使用过的密码<br/>
+:::
+::: tip 登录用户信息来源
+个人信息接口：/api-user/users/1<br/>
+扩展信息接口：/api-web/manage/ddic/findSucDdics/user_property <br/>
+扩展信息数据字典：
+```js
+INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('1b95f628b40043e9a5ceb42bf3b550f4', 'userLayout', '自定义布局', '默认:layout,个性化布局:layout-nx', 8, 'user_property', '2022-02-08 17:16:47');
+INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('270dfc935aa94c7097d0f6475b114805', 'intranetIP', '内网IP', '使用的内网Ip', 4, 'user_property', '2021-08-19 11:06:47');
+INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('50a9a82e9a9b46318383e160451dd334', 'loginSkin', '登录皮肤', '默认:default,个性化布局:default，skin1，skin2', NULL, 'user_property', '2022-03-03 21:12:06');
+INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('51dcf14aa73f4a3d9d6014297ea1b703', 'duties', '主要工作职责', '主要的工作范围以及负责的工作内容', 1, 'user_property', '2021-08-19 11:06:47');
+INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('8b008e983a2b486d9120bbb772524f1d', 'roomNumber', '房间号', '房间号', 3, 'user_property', '2021-08-19 11:06:47');
+INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('9999996bea8c222b465b8399f5b7eec', 'yunwei', '是否是运维', '是否是运维', 6, 'user_property', '2021-08-19 11:06:47');
+INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('9e7315d1e1e54107b2ce817c04929ba8', 'mobilePhone', '手机', '手机', NULL, 'user_property', '2021-08-19 11:06:47');
+INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('a049bd9694414f2bb7cde31ffa9cd7d2', 'user_property', '人员属性信息', '人员扩展属性信息是用户扩展的属性字典信息', 10021, '0', '2021-08-12 15:49:47');
+INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('a852c07bc72146bea8c222b465b8399f', 'devOpsAccount', '运维平台账号', '运维平台的账号', 6, 'user_property', '2021-08-19 11:06:47');
+INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('c5a76076491e4f01a22485caea6696c5', 'telephone', '座机', '固定电话号码', 5, 'user_property', '2021-08-19 11:06:47');
+INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('d057168ed5e946c69713d7394f5b7eec', 'stationTime', '驻场时间', '驻场时间，如：长期', 2, 'user_property', '2021-08-19 11:06:47');
+
+```
+:::
+::: tip 全局搜索功能概述
+通过关键字对资源、业务、资源类型、告警等进行全局模糊搜索，并可以通过搜索到的数据进行下探，跳转至对应的详情列表信息；
+:::
+![img](../picture/520/indexLayout/globalSearch.png) <br/>
+::: tip 全局搜索条件来源
+接口：/api-web/home/hasResult?keywords=keywords <br/>
+资源信息：/api-web/home/res-list/all?page=1&limit=7&resName=keywords <br/>
+业务类型信息：/api-web/manage/bustype/page?page=1&limit=7&busTypeName=keywords <br/>
+告警信息：/api-web/home/alarm/alarmListPage?page=1&limit=7&kpiName=keywords <br/>
+:::
+::: tip 消息推送功能概述
+系统中有新的告警产生或者是自动消除的告警时，页面上会进行弹窗提示；
 :::
 :::
+![img](../picture/520/indexLayout/message.png) <br/>
 
 
- 
 
 
 
 
 
 

+<h2>乙方运维</h2><br>
+&emsp;&emsp;乙方运维，该功能实现对乙方项目的运维人员、项目评价和项目资料等进行系统管理。其中运维人员包括人员的基本信息、资产信息、相关资料文档等；项目评价实现周期性的由相关人员对各项目从各自分管角度进行打分和评价，统一进行汇总统计和展示；相关资料实现对项目日常资料、文档资料、项目保密协议等资料进行统一管理。其中，人员的上岗、离岗和人员评价都与工作流进行对接，流程走完后相关资料及评价都已执行完成。<br>
+<h3>功能截图</h3><br>
+
+![img](../picture/520/operationsMaintenance/operation.png) <br>
+<h3>操作步骤</h3><br>
+::: tip 项目名称树
+在系统管理->基础信息->业务类型管理选择业务,点击业务名称,打开乙方运行选项即可添加项目；
+:::
+::: tip 人员信息汇总：
+展示入职、离职人员信息，且可下探查看你具体个人信息、入场资料信息；
+:::
+::: tip 项目评价汇总：
+按月汇总每月的评分总分；
+:::
+::: tip 项目资料汇总：
+展示该项目的项目日常资料、文档资料、项目保密协议等
+:::
+
+
+
+
+

 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <parent>
     <parent>

-##  commit message
+## commit message
 
 
 格式约定：`<type>(<scope>): <subject>`  (注意冒号后面有空格)
 格式约定：`<type>(<scope>): <subject>`  (注意冒号后面有空格)
 
 
@@ -43,9 +43,11 @@
 ``` bash
 ``` bash
 ~ git commit -m "feat: add a new feature"
 ~ git commit -m "feat: add a new feature"
 ```
 ```
+
 ``` bash
 ``` bash
 ~ git commit -m "fix(nav): 更正参数拼写错误"
 ~ git commit -m "fix(nav): 更正参数拼写错误"
 ```
 ```
+
 ``` bash
 ``` bash
 ~ git commit -m "docs: update README.md"
 ~ git commit -m "docs: update README.md"
 ```
 ```

 /**
 /**
  layuiAdmin pro 构建
  layuiAdmin pro 构建
-*/
+ */
 
 
 var pkg = require('./package.json');
 var pkg = require('./package.json');
 var inds = pkg.independents;
 var inds = pkg.independents;
@@ -22,77 +22,77 @@ var px2rem = require('gulp-px2rem');
 
 
 //获取参数
 //获取参数
 var argv = require('minimist')(process.argv.slice(2), {
 var argv = require('minimist')(process.argv.slice(2), {
-  default: {
-    ver: 'all'
-  }
-})
-
-  //注释
-  , note = [
-    '/** <%= pkg.name %>-v<%= pkg.version %> <%= pkg.license %> License By <%= pkg.homepage %> */\n <%= js %>'
-    , { pkg: pkg, js: ';' }
-  ]
-
-  , destDir = './dist' //构建的目标目录
-  , releaseDir = '../pack/layuiAdmin.pack/' + pkg.name + '-v' + pkg.version //发行版本目录
-
-  //任务
-  , task = {
-    //压缩 JS
-    minjs: function () {
-      var src = [
-        './src/**/*.js'
-        , '!./src/config.js'
-        , '!./src/lib/extend/echarts.js'
-      ];
-
-      return gulp.src(src).pipe(uglify())
-        .pipe(header.apply(null, note))
-        .pipe(gulp.dest(destDir));
-    }
-
-    //压缩 CSS
-    , mincss: function () {
-      var src = [
-        './src/**/*.css'
-      ]
-        , noteNew = JSON.parse(JSON.stringify(note));
-
-
-      noteNew[1].js = '';
-
-      return gulp.src(src).pipe(minify({
-        compatibility: 'ie7'
-      })).pipe(header.apply(null, noteNew))
-        .pipe(gulp.dest(destDir));
-    }
-
-    //复制文件夹
-    , mv: function () {
-      gulp.src('./src/config.js')
-        .pipe(gulp.dest(destDir));
-
-      gulp.src('./src/lib/extend/echarts.js')
-        .pipe(gulp.dest(destDir + '/lib/extend'));
-
-      gulp.src([
-        './src/style/**/*',
-        '!./src/style/css/**/*',
-      ])
-        .pipe(gulp.dest(destDir + '/style'));
-
-      return gulp.src('./src/views/**/*')
-        .pipe(gulp.dest(destDir + '/views'));
-    }
-  };
+        default: {
+            ver: 'all'
+        }
+    })
+
+    //注释
+    , note = [
+        '/** <%= pkg.name %>-v<%= pkg.version %> <%= pkg.license %> License By <%= pkg.homepage %> */\n <%= js %>'
+        , {pkg: pkg, js: ';'}
+    ]
+
+    , destDir = './dist' //构建的目标目录
+    , releaseDir = '../pack/layuiAdmin.pack/' + pkg.name + '-v' + pkg.version //发行版本目录
+
+    //任务
+    , task = {
+        //压缩 JS
+        minjs: function () {
+            var src = [
+                './src/**/*.js'
+                , '!./src/config.js'
+                , '!./src/lib/extend/echarts.js'
+            ];
+
+            return gulp.src(src).pipe(uglify())
+                .pipe(header.apply(null, note))
+                .pipe(gulp.dest(destDir));
+        }
+
+        //压缩 CSS
+        , mincss: function () {
+            var src = [
+                './src/**/*.css'
+            ]
+                , noteNew = JSON.parse(JSON.stringify(note));
+
+
+            noteNew[1].js = '';
+
+            return gulp.src(src).pipe(minify({
+                compatibility: 'ie7'
+            })).pipe(header.apply(null, noteNew))
+                .pipe(gulp.dest(destDir));
+        }
+
+        //复制文件夹
+        , mv: function () {
+            gulp.src('./src/config.js')
+                .pipe(gulp.dest(destDir));
+
+            gulp.src('./src/lib/extend/echarts.js')
+                .pipe(gulp.dest(destDir + '/lib/extend'));
+
+            gulp.src([
+                './src/style/**/*',
+                '!./src/style/css/**/*',
+            ])
+                .pipe(gulp.dest(destDir + '/style'));
+
+            return gulp.src('./src/views/**/*')
+                .pipe(gulp.dest(destDir + '/views'));
+        }
+    };
 
 
 
 
 //清理
 //清理
 gulp.task('clear', function (cb) {
 gulp.task('clear', function (cb) {
-  return del(['./dist/*'], cb);
+    return del(['./dist/*'], cb);
 });
 });
 gulp.task('clearRelease', function (cb) {
 gulp.task('clearRelease', function (cb) {
-  return del(['./json/*', releaseDir], cb);
+    return del(['./json/*', releaseDir], cb);
 });
 });
 
 
 gulp.task('minjs', task.minjs);
 gulp.task('minjs', task.minjs);
@@ -100,90 +100,90 @@ gulp.task('mincss', task.mincss);
 gulp.task('mv', task.mv);
 gulp.task('mv', task.mv);
 
 
 gulp.task('src', function () { //命令：gulp src
 gulp.task('src', function () { //命令：gulp src
-  return gulp.src('./dev-pro/**/*')
-    .pipe(gulp.dest('./src'));
+    return gulp.src('./dev-pro/**/*')
+        .pipe(gulp.dest('./src'));
 });
 });
 
 
 //构建核心源文件
 //构建核心源文件
 gulp.task('default', ['clear', 'src'], function () { //命令：gulp
 gulp.task('default', ['clear', 'src'], function () { //命令：gulp
-  for (var key in task) {
-    task[key]();
-  }
+    for (var key in task) {
+        task[key]();
+    }
 });
 });
 
 
 //发行 - layuiAdmin 官方使用
 //发行 - layuiAdmin 官方使用
 gulp.task('release', function () { //命令：gulp && gulp release
 gulp.task('release', function () { //命令：gulp && gulp release
 
 
-  //复制核心文件
-  gulp.src('./dist/**/*')
-    .pipe(gulp.dest(releaseDir + '/dist'));
-
-  gulp.src('./src/**/*')
-    .pipe(gulp.dest(releaseDir + '/src'));
-
-  //复制 json
-  gulp.src('./dev/json/**/*')
-    .pipe(gulp.dest('./json'))
-    .pipe(gulp.dest('./start/json'))
-    .pipe(gulp.dest(releaseDir + '/start/json'));
-
-  //复制并转义宿主页面
-  gulp.src('./dev/index.html')
-    .pipe(replace(/\<\!-- clear s --\>([\s\S]*?)\<\!-- clear e --\>/, ''))
-    .pipe(replace('//local.res.layui.com/layui/src', 'layui'))
-    .pipe(replace("base: '../dev-pro/'", "base: '../dist/'"))
-    .pipe(replace('@@version@@', pkg.version))
-    .pipe(gulp.dest('./start'))
-    .pipe(gulp.dest(releaseDir + '/start'));
-
-  //复制帮助文件
-  gulp.src([
-    './帮助/*'
-    , '!./帮助/说明.txt'
-  ]).pipe(gulp.dest(releaseDir + '/帮助'));
-
-  gulp.src([
-    './帮助/说明.txt'
-  ]).pipe(gulp.dest(releaseDir));
-
-
-  //复制 gulpfile
-  gulp.src([
-    'gulpfile.js'
-    , 'package.json'
-  ]).pipe(gulp.dest(releaseDir));
-
-  //说明
-  gulp.src('../pack/说明.txt')
-    .pipe(gulp.dest('../pack/layuiAdmin.pack'));
-
-  //复制 layui
-  return gulp.src('../../../../res/layui/rc/**/*')
-    .pipe(gulp.dest('./start/layui'))
-    .pipe(gulp.dest(releaseDir + '/start/layui'))
+    //复制核心文件
+    gulp.src('./dist/**/*')
+        .pipe(gulp.dest(releaseDir + '/dist'));
+
+    gulp.src('./src/**/*')
+        .pipe(gulp.dest(releaseDir + '/src'));
+
+    //复制 json
+    gulp.src('./dev/json/**/*')
+        .pipe(gulp.dest('./json'))
+        .pipe(gulp.dest('./start/json'))
+        .pipe(gulp.dest(releaseDir + '/start/json'));
+
+    //复制并转义宿主页面
+    gulp.src('./dev/index.html')
+        .pipe(replace(/\<\!-- clear s --\>([\s\S]*?)\<\!-- clear e --\>/, ''))
+        .pipe(replace('//local.res.layui.com/layui/src', 'layui'))
+        .pipe(replace("base: '../dev-pro/'", "base: '../dist/'"))
+        .pipe(replace('@@version@@', pkg.version))
+        .pipe(gulp.dest('./start'))
+        .pipe(gulp.dest(releaseDir + '/start'));
+
+    //复制帮助文件
+    gulp.src([
+        './帮助/*'
+        , '!./帮助/说明.txt'
+    ]).pipe(gulp.dest(releaseDir + '/帮助'));
+
+    gulp.src([
+        './帮助/说明.txt'
+    ]).pipe(gulp.dest(releaseDir));
+
+
+    //复制 gulpfile
+    gulp.src([
+        'gulpfile.js'
+        , 'package.json'
+    ]).pipe(gulp.dest(releaseDir));
+
+    //说明
+    gulp.src('../pack/说明.txt')
+        .pipe(gulp.dest('../pack/layuiAdmin.pack'));
+
+    //复制 layui
+    return gulp.src('../../../../res/layui/rc/**/*')
+        .pipe(gulp.dest('./start/layui'))
+        .pipe(gulp.dest(releaseDir + '/start/layui'))
 });
 });
 
 
 // 编译sass zx
 // 编译sass zx
 gulp.task('base', function () {
 gulp.task('base', function () {
-  gulp.src('src/style/css/scss/**/*.scss')
-    .pipe(sass().on('error', sass.logError))
-    .pipe(replace('../../../font', '../font'))
-    .pipe(replace('../../../img', '../img'))
-    .pipe(replace('../../img', '../img'))
-    .pipe(autoPreFixer({
-      overrideBrowserslist: [
-        'last 2 versions', 'not ie <= 8', 'iOS >= 9', 'Android >= 4.0', 'since 2013'
-      ],
-      grid: true
-    }))
-    // .pipe(px2rem({
-    //   replace: true,
-    //   rootValue: 37.5
-    // }))
-    .pipe(concat('main.css'))
-    .pipe(gulp.dest('src/style/css'));
+    gulp.src('src/style/css/scss/**/*.scss')
+        .pipe(sass().on('error', sass.logError))
+        .pipe(replace('../../../font', '../font'))
+        .pipe(replace('../../../img', '../img'))
+        .pipe(replace('../../img', '../img'))
+        .pipe(autoPreFixer({
+            overrideBrowserslist: [
+                'last 2 versions', 'not ie <= 8', 'iOS >= 9', 'Android >= 4.0', 'since 2013'
+            ],
+            grid: true
+        }))
+        // .pipe(px2rem({
+        //   replace: true,
+        //   rootValue: 37.5
+        // }))
+        .pipe(concat('main.css'))
+        .pipe(gulp.dest('src/style/css'));
 });
 });
 
 
 gulp.task('w', function () {
 gulp.task('w', function () {
-  gulp.watch('src/style/css/scss/**/*.scss', ['base']);
+    gulp.watch('src/style/css/scss/**/*.scss', ['base']);
 });
 });

@@ -31,33 +31,33 @@ Dual licensed under the MIT and GPL licenses.
  *   >>> Math.uuid(8, 16) // 8 character ID (base=16)
  *   >>> Math.uuid(8, 16) // 8 character ID (base=16)
  *   "098F4D35"
  *   "098F4D35"
  */
  */
-(function() {
-  // Private array of chars to use
-  var CHARS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
+(function () {
+    // Private array of chars to use
+    var CHARS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
 
 
-  Math.uuid = function (len, radix) {
-    var chars = CHARS, uuid = [], i;
-    radix = radix || chars.length;
-    if (len) {
-      // Compact form
-      for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random()*radix];
-    } else {
-      // rfc4122, version 4 form
-      var r;
+    Math.uuid = function (len, radix) {
+        var chars = CHARS, uuid = [], i;
+        radix = radix || chars.length;
+        if (len) {
+            // Compact form
+            for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix];
+        } else {
+            // rfc4122, version 4 form
+            var r;
 
 
-      // rfc4122 requires these characters
-      uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
-      uuid[14] = '4';
+            // rfc4122 requires these characters
+            uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
+            uuid[14] = '4';
 
 
-      // Fill in random data.  At i==19 set the high bits of clock sequence as
-      // per rfc4122, sec. 4.1.5
-      for (i = 0; i < 36; i++) {
-        if (!uuid[i]) {
-          r = 0 | Math.random()*16;
-          uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
+            // Fill in random data.  At i==19 set the high bits of clock sequence as
+            // per rfc4122, sec. 4.1.5
+            for (i = 0; i < 36; i++) {
+                if (!uuid[i]) {
+                    r = 0 | Math.random() * 16;
+                    uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
+                }
+            }
         }
         }
-      }
-    }
-    return uuid.join('');
-  };
+        return uuid.join('');
+    };
 })();
 })();

@@ -7,47 +7,47 @@
 
 
  */
  */
 
 
-layui.define(['laytpl', 'layer', 'element', 'util'], function(exports){
+layui.define(['laytpl', 'layer', 'element', 'util'], function (exports) {
     exports('setter', {
     exports('setter', {
         container: 'LAY_app' //容器ID
         container: 'LAY_app' //容器ID
-        ,base: layui.cache.base //记录layuiAdmin文件夹所在路径
-        ,views: layui.cache.base + 'views/' //视图所在目录
-        ,entry: 'index' //默认视图文件名
-        ,engine: '.html' //视图文件后缀名
-        ,pageTabs: true //是否开启页面选项卡功能。单页版不推荐开启
+        , base: layui.cache.base //记录layuiAdmin文件夹所在路径
+        , views: layui.cache.base + 'views/' //视图所在目录
+        , entry: 'index' //默认视图文件名
+        , engine: '.html' //视图文件后缀名
+        , pageTabs: true //是否开启页面选项卡功能。单页版不推荐开启
 
 
-        ,name: ' '
-        ,tableName: 'layuiAdmin' //本地存储表名
-        ,MOD_NAME: 'admin' //模块事件名
+        , name: ' '
+        , tableName: 'layuiAdmin' //本地存储表名
+        , MOD_NAME: 'admin' //模块事件名
 
 
-        ,debug: true //是否开启调试模式。如开启，接口异常时会抛出异常 URL 等信息
+        , debug: true //是否开启调试模式。如开启，接口异常时会抛出异常 URL 等信息
 
 
-        ,interceptor: true //是否开启未登入拦截
+        , interceptor: true //是否开启未登入拦截
 
 
         //自定义请求字段
         //自定义请求字段
-        ,request: {
+        , request: {
             tokenName: 'access_token' //自动携带 token 的字段名。可设置 false 不携带。
             tokenName: 'access_token' //自动携带 token 的字段名。可设置 false 不携带。
         }
         }
 
 
         //自定义响应字段
         //自定义响应字段
-        ,response: {
+        , response: {
             statusName: 'code' //数据状态的字段名称
             statusName: 'code' //数据状态的字段名称
-            ,statusCode: {
+            , statusCode: {
                 ok: 0 //数据状态一切正常的状态码
                 ok: 0 //数据状态一切正常的状态码
-                ,logout: 1001 //登录状态失效的状态码
+                , logout: 1001 //登录状态失效的状态码
             }
             }
-            ,msgName: 'msg' //状态信息的字段名称
-            ,dataName: 'data' //数据详情的字段名称
+            , msgName: 'msg' //状态信息的字段名称
+            , dataName: 'data' //数据详情的字段名称
         }
         }
 
 
         //独立页面路由，可随意添加（无需写参数）
         //独立页面路由，可随意添加（无需写参数）
-        ,indPage: [
+        , indPage: [
             '/user/login', //登入页
             '/user/login', //登入页
             '/page/forward' // 听云访问系统页面
             '/page/forward' // 听云访问系统页面
         ]
         ]
 
 
         //扩展的第三方模块
         //扩展的第三方模块
-        ,extend: [
+        , extend: [
             'lay',
             'lay',
             'swiper',
             'swiper',
             'jtopo',
             'jtopo',
@@ -78,85 +78,85 @@ layui.define(['laytpl', 'layer', 'element', 'util'], function(exports){
         ]
         ]
 
 
         //主题配置
         //主题配置
-        ,theme: {
+        , theme: {
             //内置主题配色方案
             //内置主题配色方案
             color: [{
             color: [{
                 main: '#20222A' //主题色
                 main: '#20222A' //主题色
-                ,selected: '#009688' //选中色
-                ,alias: 'default' //默认别名
-            },{
+                , selected: '#009688' //选中色
+                , alias: 'default' //默认别名
+            }, {
                 main: '#03152A'
                 main: '#03152A'
-                ,selected: '#3B91FF'
-                ,alias: 'dark-blue' //藏蓝
-            },{
+                , selected: '#3B91FF'
+                , alias: 'dark-blue' //藏蓝
+            }, {
                 main: '#2E241B'
                 main: '#2E241B'
-                ,selected: '#A48566'
-                ,alias: 'coffee' //咖啡
-            },{
+                , selected: '#A48566'
+                , alias: 'coffee' //咖啡
+            }, {
                 main: '#50314F'
                 main: '#50314F'
-                ,selected: '#7A4D7B'
-                ,alias: 'purple-red' //紫红
-            },{
+                , selected: '#7A4D7B'
+                , alias: 'purple-red' //紫红
+            }, {
                 main: '#344058'
                 main: '#344058'
-                ,logo: '#1E9FFF'
-                ,selected: '#1E9FFF'
-                ,alias: 'ocean' //海洋
-            },{
+                , logo: '#1E9FFF'
+                , selected: '#1E9FFF'
+                , alias: 'ocean' //海洋
+            }, {
                 main: '#3A3D49'
                 main: '#3A3D49'
-                ,logo: '#2F9688'
-                ,selected: '#5FB878'
-                ,alias: 'green' //墨绿
-            },{
+                , logo: '#2F9688'
+                , selected: '#5FB878'
+                , alias: 'green' //墨绿
+            }, {
                 main: '#20222A'
                 main: '#20222A'
-                ,logo: '#F78400'
-                ,selected: '#F78400'
-                ,alias: 'red' //橙色
-            },{
+                , logo: '#F78400'
+                , selected: '#F78400'
+                , alias: 'red' //橙色
+            }, {
                 main: '#28333E'
                 main: '#28333E'
-                ,logo: '#AA3130'
-                ,selected: '#AA3130'
-                ,alias: 'fashion-red' //时尚红
-            },{
+                , logo: '#AA3130'
+                , selected: '#AA3130'
+                , alias: 'fashion-red' //时尚红
+            }, {
                 main: '#24262F'
                 main: '#24262F'
-                ,logo: '#3A3D49'
-                ,selected: '#009688'
-                ,alias: 'classic-black' //经典黑
-            },{
+                , logo: '#3A3D49'
+                , selected: '#009688'
+                , alias: 'classic-black' //经典黑
+            }, {
                 logo: '#226A62'
                 logo: '#226A62'
-                ,header: '#2F9688'
-                ,alias: 'green-header' //墨绿头
-            },{
+                , header: '#2F9688'
+                , alias: 'green-header' //墨绿头
+            }, {
                 main: '#344058'
                 main: '#344058'
-                ,logo: '#0085E8'
-                ,selected: '#1E9FFF'
-                ,header: '#1E9FFF'
-                ,alias: 'ocean-header' //海洋头
-            },{
+                , logo: '#0085E8'
+                , selected: '#1E9FFF'
+                , header: '#1E9FFF'
+                , alias: 'ocean-header' //海洋头
+            }, {
                 header: '#393D49'
                 header: '#393D49'
-                ,alias: 'classic-black-header' //经典黑
-            },{
+                , alias: 'classic-black-header' //经典黑
+            }, {
                 main: '#50314F'
                 main: '#50314F'
-                ,logo: '#50314F'
-                ,selected: '#7A4D7B'
-                ,header: '#50314F'
-                ,alias: 'purple-red-header' //紫红头
-            },{
+                , logo: '#50314F'
+                , selected: '#7A4D7B'
+                , header: '#50314F'
+                , alias: 'purple-red-header' //紫红头
+            }, {
                 main: '#28333E'
                 main: '#28333E'
-                ,logo: '#28333E'
-                ,selected: '#AA3130'
-                ,header: '#AA3130'
-                ,alias: 'fashion-red-header' //时尚红头
-            },{
+                , logo: '#28333E'
+                , selected: '#AA3130'
+                , header: '#AA3130'
+                , alias: 'fashion-red-header' //时尚红头
+            }, {
                 main: '#28333E'
                 main: '#28333E'
-                ,logo: '#009688'
-                ,selected: '#009688'
-                ,header: '#009688'
-                ,alias: 'green-header' //墨绿头
+                , logo: '#009688'
+                , selected: '#009688'
+                , header: '#009688'
+                , alias: 'green-header' //墨绿头
             }]
             }]
 
 
             //初始的颜色索引，对应上面的配色方案数组索引
             //初始的颜色索引，对应上面的配色方案数组索引
             //如果本地已经有主题色记录，则以本地记录为优先，除非请求本地数据（localStorage）
             //如果本地已经有主题色记录，则以本地记录为优先，除非请求本地数据（localStorage）
-            ,initColorIndex: 1
+            , initColorIndex: 1
         }
         }
     });
     });
 });
 });

@@ -3,7 +3,7 @@
  * @author yh
  * @author yh
  * @date 2021/4/23 14:03
  * @date 2021/4/23 14:03
  **/
  **/
-layui.define(['commonDetail','common'], function (exports) {
+layui.define(['commonDetail', 'common'], function (exports) {
     var commonDetail = layui.commonDetail;
     var commonDetail = layui.commonDetail;
     var common = layui.common;
     var common = layui.common;
     //对外暴露的接口
     //对外暴露的接口
@@ -11,10 +11,10 @@ layui.define(['commonDetail','common'], function (exports) {
         var resId = '';
         var resId = '';
         var resType = '';
         var resType = '';
         var showFlag = common.getUrlParam("show");
         var showFlag = common.getUrlParam("show");
-        if(showFlag  && showFlag == '0'){
+        if (showFlag && showFlag == '0') {
             resId = common.getUrlParam("resId");
             resId = common.getUrlParam("resId");
             resType = common.getUrlParam("resType");
             resType = common.getUrlParam("resType");
-        }else{
+        } else {
             resId = data.resId;
             resId = data.resId;
             resType = data.resType;
             resType = data.resType;
         }
         }
@@ -33,27 +33,27 @@ layui.define(['commonDetail','common'], function (exports) {
 
 
         //渲染页面
         //渲染页面
         function reload() {
         function reload() {
-            commonDetail.renderText("a_cloud_physicshost_baseinfo",resId,jbxxKpi);
+            commonDetail.renderText("a_cloud_physicshost_baseinfo", resId, jbxxKpi);
             //cpu使用率
             //cpu使用率
             // commonDetail.renderGauge("a_cloud_physicshost_cpurate",resId,"KPI7054BC34",true);
             // commonDetail.renderGauge("a_cloud_physicshost_cpurate",resId,"KPI7054BC34",true);
-            commonDetail.renderLineCharat("a_cloud_physicshost_cpurate",resId,"KPI7054BC34","CPU使用率","cpu");
+            commonDetail.renderLineCharat("a_cloud_physicshost_cpurate", resId, "KPI7054BC34", "CPU使用率", "cpu");
             //内存使用率
             //内存使用率
             // commonDetail.renderGauge("a_cloud_physicshost_memeryrate",resId,"KPI31CB8D97",true);
             // commonDetail.renderGauge("a_cloud_physicshost_memeryrate",resId,"KPI31CB8D97",true);
-            commonDetail.renderLineCharat("a_cloud_physicshost_memeryrate",resId,"KPI31CB8D97","内存使用率","mem");
+            commonDetail.renderLineCharat("a_cloud_physicshost_memeryrate", resId, "KPI31CB8D97", "内存使用率", "mem");
             //文件系统信息
             //文件系统信息
-            commonDetail.renderTable("a_cloud_physicshost_filesystem",false,resId,filesystemkpi,'文件系统信息','filesystem-');
+            commonDetail.renderTable("a_cloud_physicshost_filesystem", false, resId, filesystemkpi, '文件系统信息', 'filesystem-');
             //网络接口信息
             //网络接口信息
-            commonDetail.renderTable("a_cloud_physicshost_interface",false,resId,interfacekpi,'网络接口信息','interface-');
+            commonDetail.renderTable("a_cloud_physicshost_interface", false, resId, interfacekpi, '网络接口信息', 'interface-');
             //存储信息
             //存储信息
-            commonDetail.renderTable("a_cloud_physicshost_storage",false,resId,storagekpi,'设备主机信息','storage-');
+            commonDetail.renderTable("a_cloud_physicshost_storage", false, resId, storagekpi, '设备主机信息', 'storage-');
             //活动告警
             //活动告警
-            commonDetail.renderActiveAlarms("a_cloud_physicshost_alarms",resId);
+            commonDetail.renderActiveAlarms("a_cloud_physicshost_alarms", resId);
         }
         }
 
 
         //定时任务
         //定时任务
         var timer = setInterval(function () {
         var timer = setInterval(function () {
             reload()
             reload()
-        },commonDetail.timerTime);
+        }, commonDetail.timerTime);
         commonDetail.detailTimer.push(timer);
         commonDetail.detailTimer.push(timer);
 
 
     });
     });

 /** 关于系统*/
 /** 关于系统*/
-layui.define([ 'table', 'form', 'admin', 'common','sessions','upload'], function (exports) {
+layui.define(['table', 'form', 'admin', 'common', 'sessions', 'upload'], function (exports) {
     var $ = layui.$;
     var $ = layui.$;
     var form = layui.form;
     var form = layui.form;
     var tree = layui.tree;
     var tree = layui.tree;
@@ -20,107 +20,107 @@ layui.define([ 'table', 'form', 'admin', 'common','sessions','upload'], function
         //检索事件
         //检索事件
         serachEvent();
         serachEvent();
         //上传操作
         //上传操作
-        $("#doc_upload").on("click",function () {
+        $("#doc_upload").on("click", function () {
             var $content = $("#doc-upload-form");
             var $content = $("#doc-upload-form");
             //打开选择文件弹框
             //打开选择文件弹框
             layer.open({
             layer.open({
                 type: 1
                 type: 1
-                ,title: "选择文件" //不显示标题栏
-                ,closeBtn: false
-                ,area: ['500px', '300px']
-                ,shade: 0.8
-                ,id: 'doc-upload-form-id' //设定一个id，防止重复弹出
-                ,btn: ['上传', '取消']
-                ,content: $content.html()
-                ,yes: function(index, layero){
-                    if($("#doc-display-file-name").val()){
+                , title: "选择文件" //不显示标题栏
+                , closeBtn: false
+                , area: ['500px', '300px']
+                , shade: 0.8
+                , id: 'doc-upload-form-id' //设定一个id，防止重复弹出
+                , btn: ['上传', '取消']
+                , content: $content.html()
+                , yes: function (index, layero) {
+                    if ($("#doc-display-file-name").val()) {
                         //点击上传按钮
                         //点击上传按钮
                         $("#doc-upload-actionbtn").trigger("click");
                         $("#doc-upload-actionbtn").trigger("click");
-                    }else{
+                    } else {
                         layer.msg('请选择要上传的文件!', {
                         layer.msg('请选择要上传的文件!', {
-                            icon: 7,time:3000
+                            icon: 7, time: 3000
                         });
                         });
                     }
                     }
                     return false;
                     return false;
                 }
                 }
             });
             });
 
 
-            var param = {"category":nodeId,"access_token":localStorage.getItem("access_token")};
+            var param = {"category": nodeId, "access_token": localStorage.getItem("access_token")};
             //上传
             //上传
             var uploadFile = upload.render({
             var uploadFile = upload.render({
                 elem: '#doc-display-file-name'
                 elem: '#doc-display-file-name'
-                , url: common.domainName+'/api-web/inspection/document/upload'
+                , url: common.domainName + '/api-web/inspection/document/upload'
                 , auto: false
                 , auto: false
                 , accept: 'file'
                 , accept: 'file'
-                , data:param
+                , data: param
                 , exts: 'xls|doc|pdf|rar|zip|docx|xlsx|txt|jpg|log'
                 , exts: 'xls|doc|pdf|rar|zip|docx|xlsx|txt|jpg|log'
-                ,choose: function(obj){
+                , choose: function (obj) {
                     var files = this.files = obj.pushFile(); //将每次选择的文件追加到文件队列
                     var files = this.files = obj.pushFile(); //将每次选择的文件追加到文件队列
                     //读取本地文件
                     //读取本地文件
-                    obj.preview(function(index, file, result){
+                    obj.preview(function (index, file, result) {
                         // 验证文件是否合规
                         // 验证文件是否合规
                         admin.req({
                         admin.req({
-                            url: common.domainName+'/api-web/inspection/document/check?fileName='+file.name,
+                            url: common.domainName + '/api-web/inspection/document/check?fileName=' + file.name,
                             async: false
                             async: false
                         }).done(function (res) {
                         }).done(function (res) {
                             // 10 文件不符合规则 20 文件不存在  21 文件已存在
                             // 10 文件不符合规则 20 文件不存在  21 文件已存在
-                            if(res.data == 20){
+                            if (res.data == 20) {
                                 $("#doc-display-file-name").val(file.name);
                                 $("#doc-display-file-name").val(file.name);
-                            }else{
-                                if(res.data == 10){
+                            } else {
+                                if (res.data == 10) {
                                     layer.msg('文件名不符合规则！', {
                                     layer.msg('文件名不符合规则！', {
-                                        icon: 7,time:3000
+                                        icon: 7, time: 3000
                                     });
                                     });
                                     delete files[index];
                                     delete files[index];
-                                }else{
+                                } else {
                                     $("#doc-display-file-name").val(file.name);
                                     $("#doc-display-file-name").val(file.name);
                                     layer.msg('检测到该文件已存在，执行上传操作文件将被覆盖！', {
                                     layer.msg('检测到该文件已存在，执行上传操作文件将被覆盖！', {
-                                        icon: 7,time:3000
+                                        icon: 7, time: 3000
                                     });
                                     });
                                 }
                                 }
                             }
                             }
                         });
                         });
                     });
                     });
                 }
                 }
-                ,done: function(res){
+                , done: function (res) {
                     // 上传成功
                     // 上传成功
-                    if(res && res["status"] == 1){
+                    if (res && res["status"] == 1) {
                         delete res["createTime"];
                         delete res["createTime"];
                         // 获取用户信息
                         // 获取用户信息
                         // res["authUser"] = param["authUser"];
                         // res["authUser"] = param["authUser"];
                         res["access_token"] = accessToken;
                         res["access_token"] = accessToken;
-                        res["docType"] ="doc";
+                        res["docType"] = "doc";
                         // 发起保存操作
                         // 发起保存操作
                         admin.req({
                         admin.req({
                             url: common.domainName + '/api-web/inspection/document/save',
                             url: common.domainName + '/api-web/inspection/document/save',
                             async: false,
                             async: false,
                             type: "post",
                             type: "post",
-                            data : res
+                            data: res
                         }).done(function (res) {
                         }).done(function (res) {
-                            if(res.data){
+                            if (res.data) {
                                 layer.msg('文档上传成功!', {
                                 layer.msg('文档上传成功!', {
-                                    icon: 1,time:2000
-                                },function () {
+                                    icon: 1, time: 2000
+                                }, function () {
                                     layer.closeAll();
                                     layer.closeAll();
                                     reloadDocTable(nodeId);
                                     reloadDocTable(nodeId);
                                 });
                                 });
-                            }else{
+                            } else {
                                 layer.msg('文档上传失败!', {
                                 layer.msg('文档上传失败!', {
-                                    icon: 7,time:2000
+                                    icon: 7, time: 2000
                                 });
                                 });
                             }
                             }
                         });
                         });
                     }
                     }
                 }
                 }
-                ,error: function(index, upload){
+                , error: function (index, upload) {
                     // 上传失败
                     // 上传失败
                     layer.msg('文件上传时发生故障，请稍后再试！', {
                     layer.msg('文件上传时发生故障，请稍后再试！', {
-                        icon: 7,time:3000
+                        icon: 7, time: 3000
                     });
                     });
                 }
                 }
             });
             });
             //上传请求操作
             //上传请求操作
-            $("#doc-upload-actionbtn").on("click",function(){
+            $("#doc-upload-actionbtn").on("click", function () {
                 uploadFile.upload();
                 uploadFile.upload();
             })
             })
         });
         });
@@ -129,7 +129,7 @@ layui.define([ 'table', 'form', 'admin', 'common','sessions','upload'], function
             var ids = [];
             var ids = [];
             var data = table.checkStatus('aboutSystem_table').data;
             var data = table.checkStatus('aboutSystem_table').data;
             if (data.length == 0) {
             if (data.length == 0) {
-                layer.msg('请选择要下载的文件!', { icon: 7,time:3000 });
+                layer.msg('请选择要下载的文件!', {icon: 7, time: 3000});
                 return false;
                 return false;
             }
             }
             //将选中的报表ID放到集合中
             //将选中的报表ID放到集合中
@@ -137,7 +137,7 @@ layui.define([ 'table', 'form', 'admin', 'common','sessions','upload'], function
                 ids.push(obj.id);
                 ids.push(obj.id);
             });
             });
             ids = ids.toString();
             ids = ids.toString();
-            var path = common.domainName + '/api-web/inspection/document/download?access_token='+accessToken+"&ids="+ids;
+            var path = common.domainName + '/api-web/inspection/document/download?access_token=' + accessToken + "&ids=" + ids;
             window.open(path);
             window.open(path);
 
 
         });
         });
@@ -172,59 +172,64 @@ layui.define([ 'table', 'form', 'admin', 'common','sessions','upload'], function
                 , url: common.domainName + '/api-web/inspection/document/list'
                 , url: common.domainName + '/api-web/inspection/document/list'
                 , where: {
                 , where: {
                     access_token: accessToken,
                     access_token: accessToken,
-                    name:$("#doc_keyword").val(),
-                    docNo:$("#doc_code").val(),
-                    category:nodeId,
-                    createUser:'',
+                    name: $("#doc_keyword").val(),
+                    docNo: $("#doc_code").val(),
+                    category: nodeId,
+                    createUser: '',
                     flag: 'true',
                     flag: 'true',
-                    docType:"doc"
+                    docType: "doc"
                 }
                 }
                 , height: 'full'
                 , height: 'full'
                 , page: {
                 , page: {
                     layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
                     layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
-                    ,theme: '#1E9FFF'
+                    , theme: '#1E9FFF'
                 }
                 }
-                ,limit: common.limit
-                ,limits: common.limits
+                , limit: common.limit
+                , limits: common.limits
                 , even: true
                 , even: true
                 , cols: [[
                 , cols: [[
-                    {type: 'checkbox',width:50}
-                    , {field: 'docNo', title: '文档编号', align: 'center',width:150}
-                    , {field: 'name', title: '文档名称', align: 'left',
-                        templet: '<div><span data-id="{{d.id}}" data-path="{{d.localPath}}" class="layui-table-link preview-btn">{{d.name}}</span></div>' }
-                    , {field: 'categoryName', title: '文档类型', align: 'center',width:200}
-                    , {field: 'createUserName', title: '提交人', align: 'center',width:150}
-                    , {field: 'createTime', title: '提交时间', align: 'center',width:170
-                        ,templet:'<div>{{ layui.util.toDateString(d.createTime, "yyyy-MM-dd HH:mm:ss") }}</div>'}
+                    {type: 'checkbox', width: 50}
+                    , {field: 'docNo', title: '文档编号', align: 'center', width: 150}
                     , {
                     , {
-                        field: 'path', title: '下载', align: 'center',width:100,
-                        templet:function (v) {
-                            var url = common.domainName + '/api-web/inspection/document/download?access_token='+accessToken+"&ids="+v.id;
-                            return '<a class=" layui-table-link" href="'+url+'">下载</a>';
+                        field: 'name', title: '文档名称', align: 'left',
+                        templet: '<div><span data-id="{{d.id}}" data-path="{{d.localPath}}" class="layui-table-link preview-btn">{{d.name}}</span></div>'
+                    }
+                    , {field: 'categoryName', title: '文档类型', align: 'center', width: 200}
+                    , {field: 'createUserName', title: '提交人', align: 'center', width: 150}
+                    , {
+                        field: 'createTime', title: '提交时间', align: 'center', width: 170
+                        , templet: '<div>{{ layui.util.toDateString(d.createTime, "yyyy-MM-dd HH:mm:ss") }}</div>'
+                    }
+                    , {
+                        field: 'path', title: '下载', align: 'center', width: 100,
+                        templet: function (v) {
+                            var url = common.domainName + '/api-web/inspection/document/download?access_token=' + accessToken + "&ids=" + v.id;
+                            return '<a class=" layui-table-link" href="' + url + '">下载</a>';
                         }
                         }
                     }
                     }
-                ]],done:function () {
+                ]], done: function () {
                     $('.preview-btn').on('click', function () {
                     $('.preview-btn').on('click', function () {
                         var id = $(this).data('id')
                         var id = $(this).data('id')
                         var localPath = $(this).data('path')
                         var localPath = $(this).data('path')
-                        common.openReport(id,'','','','',1)
+                        common.openReport(id, '', '', '', '', 1)
                     })
                     })
                 }
                 }
             });
             });
         }
         }
+
         //刷新表格
         //刷新表格
         function reloadDocTable() {
         function reloadDocTable() {
             documentTable.reload({
             documentTable.reload({
                 where: {
                 where: {
                     access_token: accessToken,
                     access_token: accessToken,
-                    name:$("#doc_keyword").val(),
-                    docNo:$("#doc_code").val(),
-                    createUser:'',
-                    category:nodeId,
+                    name: $("#doc_keyword").val(),
+                    docNo: $("#doc_code").val(),
+                    createUser: '',
+                    category: nodeId,
                     flag: 'true',
                     flag: 'true',
-                    docType:"doc"
+                    docType: "doc"
                 }
                 }
             })
             })
         }
         }
     });
     });
-});
+});

 //活动告警
 //活动告警
-layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 'sessions','commonDetail','soulTable', 'treeTable'], function (exports) {
+layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 'sessions', 'commonDetail', 'soulTable', 'treeTable'], function (exports) {
     var $ = layui.$;
     var $ = layui.$;
     var form = layui.form;
     var form = layui.form;
     var layer = layui.layer;
     var layer = layui.layer;
@@ -9,7 +9,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
     var laytpl = layui.laytpl;
     var laytpl = layui.laytpl;
     var treeTable = layui.treeTable;
     var treeTable = layui.treeTable;
     var common = layui.common;
     var common = layui.common;
-    var commonDetail=layui.commonDetail;
+    var commonDetail = layui.commonDetail;
     var domainName = common.domainName;
     var domainName = common.domainName;
     var todayStr = '';
     var todayStr = '';
     //对外暴露的接口
     //对外暴露的接口
@@ -25,8 +25,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
         var alarmNo = router.search.alarmNo;//告警编号
         var alarmNo = router.search.alarmNo;//告警编号
         var busIdSelect;
         var busIdSelect;
         var busTypeList = [];
         var busTypeList = [];
-        if(!bizId){
-            bizId='';
+        if (!bizId) {
+            bizId = '';
         }
         }
         if (resId) {
         if (resId) {
             resId = decodeURIComponent(resId);
             resId = decodeURIComponent(resId);
@@ -87,7 +87,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                                 parentId: item.parentId
                                 parentId: item.parentId
                             }
                             }
                         });
                         });
-                        var bizTree=common.pidToChildren(bizList, 'value', 'parentId');
+                        var bizTree = common.pidToChildren(bizList, 'value', 'parentId');
 
 
                         // 影响业务下拉框
                         // 影响业务下拉框
                         busIdSelect = xmSelect.render({
                         busIdSelect = xmSelect.render({
@@ -119,11 +119,11 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                             data: bizTree,
                             data: bizTree,
                             on: function (data) {
                             on: function (data) {
                                 if (data.arr.length != 0) {
                                 if (data.arr.length != 0) {
-                                    var str='';
-                                    $.each(data.arr,function (i,v) {
-                                        str+=v.value+',';
+                                    var str = '';
+                                    $.each(data.arr, function (i, v) {
+                                        str += v.value + ',';
                                     })
                                     })
-                                    bizId = str.substring(0,str.length-1);
+                                    bizId = str.substring(0, str.length - 1);
                                 } else {
                                 } else {
                                     bizId = '';
                                     bizId = '';
                                 }
                                 }
@@ -131,9 +131,9 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                                 reloadTable();
                                 reloadTable();
                             }
                             }
                         });
                         });
-                        if(busIdSelect){
+                        if (busIdSelect) {
                             //追加样式
                             //追加样式
-                            $('#bisTypeSearchBox').find('.xm-body').eq(0).css("width","230px");
+                            $('#bisTypeSearchBox').find('.xm-body').eq(0).css("width", "230px");
                         }
                         }
                     } else {
                     } else {
                         layer.msg('获取业务失败', {icon: 2});
                         layer.msg('获取业务失败', {icon: 2});
@@ -145,13 +145,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
             });
             });
 
 
             $.ajax({
             $.ajax({
-                url: common.domainName + '/api-web/manage/kpi/findKpiInAlarm?access_token='+accessToken+'&tableName=b_alarm',
+                url: common.domainName + '/api-web/manage/kpi/findKpiInAlarm?access_token=' + accessToken + '&tableName=b_alarm',
                 type: "get",
                 type: "get",
-                success:function (res) {
+                success: function (res) {
                     var kpis = res.data;
                     var kpis = res.data;
                     var html = '<option value="">=指标名称=</option>'
                     var html = '<option value="">=指标名称=</option>'
-                    $.each(kpis,function (i,e) {
-                        html+='<option value="'+e.kpiId+'">'+e.kpiName+'</option>'
+                    $.each(kpis, function (i, e) {
+                        html += '<option value="' + e.kpiId + '">' + e.kpiName + '</option>'
                     })
                     })
                     $("#alarmKpiSearchBox").html('');
                     $("#alarmKpiSearchBox").html('');
                     $("#alarmKpiSearchBox").append(html);
                     $("#alarmKpiSearchBox").append(html);
@@ -198,7 +198,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                         height: 'auto',
                         height: 'auto',
                         data: resTypeTree,
                         data: resTypeTree,
                         on: function (data) {
                         on: function (data) {
-                            if(data.isAdd){
+                            if (data.isAdd) {
                                 if (data.arr.length != 0) {
                                 if (data.arr.length != 0) {
                                     resType = data.arr[0].value;
                                     resType = data.arr[0].value;
                                 } else {
                                 } else {
@@ -243,22 +243,28 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                 admin.req({
                 admin.req({
                     url: common.domainName + '/api-web/home/alarm/clear/reason',
                     url: common.domainName + '/api-web/home/alarm/clear/reason',
                     type: "get",
                     type: "get",
-                    data:{
+                    data: {
                         alarmId: ids.toString()
                         alarmId: ids.toString()
                     },
                     },
-                    done:function (data) {
+                    done: function (data) {
                         var clearReson = "暂无参考处理方案，请输入处理方案";
                         var clearReson = "暂无参考处理方案，请输入处理方案";
                         var hisReason = "";
                         var hisReason = "";
                         var reasonlist = data.reason;
                         var reasonlist = data.reason;
-                        if(reasonlist && reasonlist.length > 0){
+                        if (reasonlist && reasonlist.length > 0) {
                             hisReason = "参考方案：\n";
                             hisReason = "参考方案：\n";
-                            $.each(reasonlist,function (i,v) {
+                            $.each(reasonlist, function (i, v) {
                                 var idx = i + 1;
                                 var idx = i + 1;
-                                hisReason +=  idx +"："+v +"\n";
+                                hisReason += idx + "：" + v + "\n";
                             });
                             });
                         }
                         }
 
 
-                        layer.prompt({id: "alarms_clear_id", title: '告警消除', area: ['400px'], formType: 2,value: hisReason}, function (text, index) {
+                        layer.prompt({
+                            id: "alarms_clear_id",
+                            title: '告警消除',
+                            area: ['400px'],
+                            formType: 2,
+                            value: hisReason
+                        }, function (text, index) {
                             admin.req({
                             admin.req({
                                 url: common.domainName + '/api-web/home/alarm/clear'
                                 url: common.domainName + '/api-web/home/alarm/clear'
                                 , type: "post"
                                 , type: "post"
@@ -546,10 +552,10 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                                 , btn: ['发送', '关闭']
                                 , btn: ['发送', '关闭']
                                 , yes: function () {
                                 , yes: function () {
                                     var names = [];
                                     var names = [];
-                                    $("input[class='userName']:checked").each(function(i){
+                                    $("input[class='userName']:checked").each(function (i) {
                                         names.push($(this).attr("data-name"));
                                         names.push($(this).attr("data-name"));
                                     });
                                     });
-                                    if(names.length<1){
+                                    if (names.length < 1) {
                                         layer.msg('请最少选择一个用户', {icon: 7, time: 2000});
                                         layer.msg('请最少选择一个用户', {icon: 7, time: 2000});
                                         return;
                                         return;
                                     }
                                     }
@@ -558,7 +564,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                                         , type: "post"
                                         , type: "post"
                                         , data: {
                                         , data: {
                                             ids: ids.toString(),
                                             ids: ids.toString(),
-                                            names:names.toString(),
+                                            names: names.toString(),
                                             access_token: accessToken
                                             access_token: accessToken
                                         }
                                         }
                                         , done: function (res) {
                                         , done: function (res) {
@@ -589,7 +595,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
             domId: 'activewarningTable',
             domId: 'activewarningTable',
             moduleId: 'activewarning',
             moduleId: 'activewarning',
             resType: ''
             resType: ''
-        },function (retCols) {
+        }, function (retCols) {
             var cols = [
             var cols = [
                 {type: 'checkbox', fixed: 'left'}
                 {type: 'checkbox', fixed: 'left'}
                 , {
                 , {
@@ -611,7 +617,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                 }
                 }
                 , {
                 , {
                     field: 'resName', title: '资源名称', width: 230, sort: true,
                     field: 'resName', title: '资源名称', width: 230, sort: true,
-                    templet:`
+                    templet: `
                     <div>
                     <div>
                         {{# if (d.confirmStatus == 0 || d.confirmStatus == null) {  }} 
                         {{# if (d.confirmStatus == 0 || d.confirmStatus == null) {  }} 
                             <i lay-tips="新的告警未确认，告警确认后消失！" class="shake iconfont" style="color: red;font-size: 28px;">&#xe68b;</i>
                             <i lay-tips="新的告警未确认，告警确认后消失！" class="shake iconfont" style="color: red;font-size: 28px;">&#xe68b;</i>
@@ -693,7 +699,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                     durationVal: $('#inline-condition-duration input[name="durationVal"]').val(),
                     durationVal: $('#inline-condition-duration input[name="durationVal"]').val(),
                     durationUnit: $('#inline-condition-duration select[name="durationUnit"]').val(),
                     durationUnit: $('#inline-condition-duration select[name="durationUnit"]').val(),
                     netFlag: netFlag,
                     netFlag: netFlag,
-                    resType:resType
+                    resType: resType
                 }
                 }
                 , height: 'full-245'
                 , height: 'full-245'
                 , cellMinWidth: 80
                 , cellMinWidth: 80
@@ -726,7 +732,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                             durationVal: $('#inline-condition-duration input[name="durationVal"]').val(),
                             durationVal: $('#inline-condition-duration input[name="durationVal"]').val(),
                             durationUnit: $('#inline-condition-duration select[name="durationUnit"]').val(),
                             durationUnit: $('#inline-condition-duration select[name="durationUnit"]').val(),
                             netFlag: netFlag,
                             netFlag: netFlag,
-                            resType:resType
+                            resType: resType
                         },
                         },
                         success: function (res) {
                         success: function (res) {
                             var map = res.map;
                             var map = res.map;
@@ -765,13 +771,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                                         var adminName = '';
                                         var adminName = '';
                                         var manageIp = '';
                                         var manageIp = '';
                                         var collProtocol = '';
                                         var collProtocol = '';
-                                        var sign='false';
+                                        var sign = 'false';
                                         $.ajax({
                                         $.ajax({
-                                            url: common.domainName + "/api-web/home/resource/findById?resId="+resId + '&access_token='+ accessToken,
+                                            url: common.domainName + "/api-web/home/resource/findById?resId=" + resId + '&access_token=' + accessToken,
                                             async: false,
                                             async: false,
-                                            type:'get',
+                                            type: 'get',
                                             success: function (res) {
                                             success: function (res) {
-                                                sign=res.str;
+                                                sign = res.str;
                                                 var data = res.object;
                                                 var data = res.object;
                                                 resType = data.resType;
                                                 resType = data.resType;
                                                 adminName = data.adminName;
                                                 adminName = data.adminName;
@@ -780,7 +786,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                                                 resTypeName = data.resTypeName;
                                                 resTypeName = data.resTypeName;
                                             }
                                             }
                                         })
                                         })
-                                        if(sign=='false'){
+                                        if (sign == 'false') {
                                             layer.msg('当前用户暂无此资源权限!', {icon: 7, time: 3000});
                                             layer.msg('当前用户暂无此资源权限!', {icon: 7, time: 3000});
                                             return false;
                                             return false;
                                         }
                                         }
@@ -800,7 +806,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                                                 title += ip + '|';
                                                 title += ip + '|';
                                             }
                                             }
                                         }
                                         }
-                                        if (resType === 'HOST_X86SERVER' && collProtocol && collProtocol.indexOf('SNMP') !== -1 ) {
+                                        if (resType === 'HOST_X86SERVER' && collProtocol && collProtocol.indexOf('SNMP') !== -1) {
                                             if (manageIp) {
                                             if (manageIp) {
                                                 title += '管理IP-' + manageIp + '|';
                                                 title += '管理IP-' + manageIp + '|';
                                             }
                                             }
@@ -944,13 +950,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
             });
             });
         }
         }
 
 
-        $("#todayOrAllBtn").unbind().on("click",function () {
+        $("#todayOrAllBtn").unbind().on("click", function () {
             var $that = $(this);
             var $that = $(this);
             var str = $(this).text();
             var str = $(this).text();
-            if(str.indexOf("今日") > -1){
+            if (str.indexOf("今日") > -1) {
                 $that.text("全部告警")
                 $that.text("全部告警")
                 todayStr = common.getToday('day');
                 todayStr = common.getToday('day');
-            }else{
+            } else {
                 todayStr = ''
                 todayStr = ''
                 $that.text("今日告警")
                 $that.text("今日告警")
             }
             }
@@ -960,14 +966,14 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
 
 
         //刷新表格
         //刷新表格
         function reloadTable(type) {
         function reloadTable(type) {
-            if (type != 'sort'){
+            if (type != 'sort') {
                 sortKey = '';
                 sortKey = '';
             }
             }
             activeAlarmTable.reload({
             activeAlarmTable.reload({
                 page: {
                 page: {
                     curr: 1
                     curr: 1
                 }
                 }
-                ,where: {
+                , where: {
                     access_token: accessToken,
                     access_token: accessToken,
                     kpiName: $("#activewarningkw").val(),
                     kpiName: $("#activewarningkw").val(),
                     busId: bizId,
                     busId: bizId,
@@ -982,8 +988,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                     alarmKpi: $("#alarmKpiSearchBox").val(),
                     alarmKpi: $("#alarmKpiSearchBox").val(),
                     durationVal: $('#inline-condition-duration input[name="durationVal"]').val(),
                     durationVal: $('#inline-condition-duration input[name="durationVal"]').val(),
                     durationUnit: $('#inline-condition-duration select[name="durationUnit"]').val(),
                     durationUnit: $('#inline-condition-duration select[name="durationUnit"]').val(),
-                    alarmTimeDay:todayStr,
-                    resType:resType
+                    alarmTimeDay: todayStr,
+                    resType: resType
                 }
                 }
             });
             });
         }
         }
@@ -1019,6 +1025,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                 var el = target.find('span');
                 var el = target.find('span');
                 var checked = target.find('input').prop('checked');
                 var checked = target.find('input').prop('checked');
                 localStorage.setItem('alarm_auto__flush', checked);
                 localStorage.setItem('alarm_auto__flush', checked);
+
                 function fn() {
                 function fn() {
                     var second = el.data('second');
                     var second = el.data('second');
                     var checked = target.find('input').prop('checked');
                     var checked = target.find('input').prop('checked');
@@ -1038,13 +1045,15 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                         fn();
                         fn();
                     }
                     }
                 }
                 }
+
                 if (checked) {
                 if (checked) {
                     timer = setTimeout(fn, 1000);
                     timer = setTimeout(fn, 1000);
                 } else {
                 } else {
                     clearTimeout(timer);
                     clearTimeout(timer);
                 }
                 }
             }
             }
-            form.on("checkbox(warnActiveAutoFlush)",function (data) {
+
+            form.on("checkbox(warnActiveAutoFlush)", function (data) {
                 autoFlush(autoBtn);
                 autoFlush(autoBtn);
             })
             })
             /*autoBtn.change(function () {
             /*autoBtn.change(function () {
@@ -1081,4 +1090,4 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
 
 
         }
         }
     });
     });
-});
+});

 //告警策略
 //告警策略
-layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], function (exports) {
+layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], function (exports) {
     var $ = layui.$;
     var $ = layui.$;
     var form = layui.form;
     var form = layui.form;
     var laydate = layui.laydate;
     var laydate = layui.laydate;
@@ -16,33 +16,33 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
         //初始化日期组件
         //初始化日期组件
         laydate.render({
         laydate.render({
             elem: '#seriousTimes'
             elem: '#seriousTimes'
-            ,type: 'time'
-            ,range: true
+            , type: 'time'
+            , range: true
         });
         });
         laydate.render({
         laydate.render({
             elem: '#importantTimes'
             elem: '#importantTimes'
-            ,type: 'time'
-            ,range: true
+            , type: 'time'
+            , range: true
         });
         });
         laydate.render({
         laydate.render({
             elem: '#commonlyTimes'
             elem: '#commonlyTimes'
-            ,type: 'time'
-            ,range: true
+            , type: 'time'
+            , range: true
         });
         });
         var resType = localStorage.getItem("currentResType");
         var resType = localStorage.getItem("currentResType");
-
+        var NoticeMergeFlag = 'off';
         // 获取合并通知开关是否开启
         // 获取合并通知开关是否开启
         getNoticeMergeFlag();
         getNoticeMergeFlag();
-        var NoticeMergeFlag = 'off';
-        function getNoticeMergeFlag(){
+
+        function getNoticeMergeFlag() {
             admin.req({
             admin.req({
                 url: common.domainName + '/api-web/manage/ddic/findSucDdics/noticeMergeFlag'
                 url: common.domainName + '/api-web/manage/ddic/findSucDdics/noticeMergeFlag'
                 , method: 'POST'
                 , method: 'POST'
                 , async: false
                 , async: false
                 , success: function (res) {
                 , success: function (res) {
                     $.each(res.data, function (i, v) {
                     $.each(res.data, function (i, v) {
-                        if(v.ddicCode == 'on'){
-                            NoticeMergeFlag= 'on';
+                        if (v.ddicCode == 'on') {
+                            NoticeMergeFlag = 'on';
                             $('#noticeMergeTab').show();
                             $('#noticeMergeTab').show();
                         }
                         }
                     });
                     });
@@ -51,17 +51,17 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
         }
         }
 
 
         //编辑
         //编辑
-        if(data && data.id){
+        if (data && data.id) {
             admin.req({
             admin.req({
-                url:domainName +  '/api-web/alarmPolicy/getbyId/'+data.id
-                ,done:function (res){
+                url: domainName + '/api-web/alarmPolicy/getbyId/' + data.id
+                , done: function (res) {
                     exprToChar(res.object, 'alarmContentExpr');
                     exprToChar(res.object, 'alarmContentExpr');
                     exprToChar(res.object, 'cleanPolicy');
                     exprToChar(res.object, 'cleanPolicy');
                     exprToChar(res.object, 'commonlyExpr');
                     exprToChar(res.object, 'commonlyExpr');
                     exprToChar(res.object, 'importantExpr');
                     exprToChar(res.object, 'importantExpr');
                     exprToChar(res.object, 'seriousExpr');
                     exprToChar(res.object, 'seriousExpr');
-                    form.val("add-alarmpolicy-form",res.object);
-                    $("#alarm-policy-kpiName").val(res.object.kpiId +" "+ res.object.kpiName);
+                    form.val("add-alarmpolicy-form", res.object);
+                    $("#alarm-policy-kpiName").val(res.object.kpiId + " " + res.object.kpiName);
                     $("#seriousTimes").val(res.object.seriousTimes);
                     $("#seriousTimes").val(res.object.seriousTimes);
                     $("#importantTimes").val(res.object.importantTimes);
                     $("#importantTimes").val(res.object.importantTimes);
                     $("#commonlyTimes").val(res.object.commonlyTimes);
                     $("#commonlyTimes").val(res.object.commonlyTimes);
@@ -70,13 +70,13 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
             });
             });
             // 获取通知合并策略的表达式
             // 获取通知合并策略的表达式
             admin.req({
             admin.req({
-                url:domainName +  '/api-web/policyMerge/get?noticeMergePolicyId='+data.id
-                ,done:function (res){
+                url: domainName + '/api-web/policyMerge/get?noticeMergePolicyId=' + data.id
+                , done: function (res) {
                     $("#noticeMergeFlagExpr").val(res.data[0].noticeMergeExpr);
                     $("#noticeMergeFlagExpr").val(res.data[0].noticeMergeExpr);
                 }
                 }
             });
             });
 
 
-        }else{
+        } else {
             $("#seriousTimes").val('00:00:00 - 23:59:59');
             $("#seriousTimes").val('00:00:00 - 23:59:59');
             $("#importantTimes").val('00:00:00 - 23:59:59');
             $("#importantTimes").val('00:00:00 - 23:59:59');
             $("#commonlyTimes").val('00:00:00 - 23:59:59');
             $("#commonlyTimes").val('00:00:00 - 23:59:59');
@@ -86,14 +86,14 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
             return false;
             return false;
         });
         });
         //全天
         //全天
-        $(".allday").on("click",function (){
+        $(".allday").on("click", function () {
             var id = $(this).data("flag");
             var id = $(this).data("flag");
-            $("#"+id).val('00:00:00 - 23:59:59');
+            $("#" + id).val('00:00:00 - 23:59:59');
         });
         });
         //工作时间
         //工作时间
-        $(".worktime").on("click",function (){
+        $(".worktime").on("click", function () {
             var id = $(this).data("flag");
             var id = $(this).data("flag");
-            $("#"+id).val('08:00:00 - 19:59:59');
+            $("#" + id).val('08:00:00 - 19:59:59');
         });
         });
         $('.noticeExpr').unbind('click').on('click', function () {
         $('.noticeExpr').unbind('click').on('click', function () {
             var id = $(this).prop('id');
             var id = $(this).prop('id');
@@ -105,7 +105,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
             editNoticeExpr($(this).val(), alarmTimes, id);
             editNoticeExpr($(this).val(), alarmTimes, id);
         });
         });
         //指标信息
         //指标信息
-        if(data.kpiId){
+        if (data.kpiId) {
             $("#alarm-policy-kpiId").val(data.kpiId);
             $("#alarm-policy-kpiId").val(data.kpiId);
             $("#alarm-policy-kpiName").val(data.kpiId + " " + data.name);
             $("#alarm-policy-kpiName").val(data.kpiId + " " + data.name);
         }
         }
@@ -113,48 +113,48 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
         //告警规则类型切换事件
         //告警规则类型切换事件
         form.on('radio(alarm-policy-rule-type)', function (data) {
         form.on('radio(alarm-policy-rule-type)', function (data) {
             var flag = $(data.elem).data("flag");
             var flag = $(data.elem).data("flag");
-            if(data.value == '1'){
+            if (data.value == '1') {
                 $(`.${flag}-tab-item`).find("div.cont-base").show();
                 $(`.${flag}-tab-item`).find("div.cont-base").show();
-            }else{
+            } else {
                 $(`.${flag}-tab-item`).find("div.cont-base").hide();
                 $(`.${flag}-tab-item`).find("div.cont-base").hide();
                 $(`#${flag}Policy`).val('');
                 $(`#${flag}Policy`).val('');
             }
             }
         });
         });
         //选择指标
         //选择指标
-        $("#alarmpolicy-form-select-kpi, #alarm-policy-kpiName").unbind('click').on("click",function (){
-            common.openWin("template/res/reskpilist","选择指标", {resType:null},["选择","取消"], function () {
+        $("#alarmpolicy-form-select-kpi, #alarm-policy-kpiName").unbind('click').on("click", function () {
+            common.openWin("template/res/reskpilist", "选择指标", {resType: null}, ["选择", "取消"], function () {
                 var data = layui.reskpilist().getData();
                 var data = layui.reskpilist().getData();
-                if(data && data.length != 1){
-                    layer.msg('只能选择一个指标！', {icon: 7,time:3000});
+                if (data && data.length != 1) {
+                    layer.msg('只能选择一个指标！', {icon: 7, time: 3000});
                     return false;
                     return false;
                 }
                 }
-                if(data && data.length > 0){
+                if (data && data.length > 0) {
                     $("#alarm-policy-kpiId").val(data[0].kpiId);
                     $("#alarm-policy-kpiId").val(data[0].kpiId);
                     $("#alarm-policy-kpiName").val(data[0].kpiId + " " + data[0].kpiName);
                     $("#alarm-policy-kpiName").val(data[0].kpiId + " " + data[0].kpiName);
                     $("#alarmPolicyName").val(data[0].kpiName + "告警策略");
                     $("#alarmPolicyName").val(data[0].kpiName + "告警策略");
 
 
-                    var arry = [ "base", "cpu", "mem"];
+                    var arry = ["base", "cpu", "mem"];
                     return true;
                     return true;
                 }
                 }
-           });
+            });
         });
         });
 
 
         //增加一行策略表达式输入框
         //增加一行策略表达式输入框
-        $("i.policy-input-add").off("click").on("click",function (){
+        $("i.policy-input-add").off("click").on("click", function () {
             var id = $(this).data("id");
             var id = $(this).data("id");
             clonePolicyDoms(id);
             clonePolicyDoms(id);
         });
         });
         //删除告警策略规则行
         //删除告警策略规则行
-        $("i.policy-input-del").on("click",function (){
+        $("i.policy-input-del").on("click", function () {
             var id = $(this).data("id");
             var id = $(this).data("id");
             $(`#${id}`).remove();
             $(`#${id}`).remove();
         });
         });
 
 
 
 
         //生成策略
         //生成策略
-        $("a.createpolicybtn").on("click",function (){
+        $("a.createpolicybtn").on("click", function () {
             var kpiId = $("#alarm-policy-kpiId").val();
             var kpiId = $("#alarm-policy-kpiId").val();
-            if(!kpiId){
+            if (!kpiId) {
                 layer.msg("请先选择指标！", {
                 layer.msg("请先选择指标！", {
                     icon: 7
                     icon: 7
                     , time: 3000
                     , time: 3000
@@ -162,30 +162,44 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
                 return false;
                 return false;
             }
             }
             var policyFlag = $(this).data("flag");
             var policyFlag = $(this).data("flag");
-            var conOjb = {"0":">","1":"<","2":"=","3":">=","4":"<=","5":"equals","6":"contains","7":"startsWith","8":"endsWith"};
+            var conOjb = {
+                "0": ">",
+                "1": "<",
+                "2": "=",
+                "3": ">=",
+                "4": "<=",
+                "5": "equals",
+                "6": "contains",
+                "7": "startsWith",
+                "8": "endsWith"
+            };
             var doms = $(`[id^=${policyFlag}-policy-box]`);
             var doms = $(`[id^=${policyFlag}-policy-box]`);
             var policyStr = '';
             var policyStr = '';
-            $(doms).each(function(i,v){
+            $(doms).each(function (i, v) {
                 var domId = $(v).attr("id");
                 var domId = $(v).attr("id");
-                if(domId.indexOf("condition") != -1){//条件
+                if (domId.indexOf("condition") != -1) {//条件
                     var open = $(v).find('.layui-form-switch').hasClass("layui-form-onswitch");
                     var open = $(v).find('.layui-form-switch').hasClass("layui-form-onswitch");
-                    if(open){  policyStr += "||" }else{ policyStr += "&&" }
-                }else{ //值
-                    var conditon = $(v).find("."+policyFlag+"_condition").val();
-                    var cls = policyFlag +"_value";
-                    var conval =  $(v).find('[flag="'+cls+'"]').val().trim();
-                    if(conval){
-                        if(conditon < 5){ //数字类的
+                    if (open) {
+                        policyStr += "||"
+                    } else {
+                        policyStr += "&&"
+                    }
+                } else { //值
+                    var conditon = $(v).find("." + policyFlag + "_condition").val();
+                    var cls = policyFlag + "_value";
+                    var conval = $(v).find('[flag="' + cls + '"]').val().trim();
+                    if (conval) {
+                        if (conditon < 5) { //数字类的
                             policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`;
                             policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`;
-                        }else{ //字符串类的
+                        } else { //字符串类的
                             policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`;
                             policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`;
                         }
                         }
                     }
                     }
                 }
                 }
             });
             });
-            if(policyStr){
+            if (policyStr) {
                 $(`#${policyFlag}Policy`).val(policyStr);
                 $(`#${policyFlag}Policy`).val(policyStr);
-            }else{
+            } else {
                 layer.msg("请先输入策略值！", {
                 layer.msg("请先输入策略值！", {
                     icon: 7
                     icon: 7
                     , time: 3000
                     , time: 3000
@@ -195,7 +209,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
         });
         });
 
 
         //保存策略
         //保存策略
-        $("#alarmpolicy-form-save-id").on("click",function (){
+        $("#alarmpolicy-form-save-id").on("click", function () {
             var data = form.val("add-alarmpolicy-form");
             var data = form.val("add-alarmpolicy-form");
             //移除非数进性的属性
             //移除非数进性的属性
             delete data['serious-policy-type'];
             delete data['serious-policy-type'];
@@ -209,7 +223,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
             data.commonlyTimes = $("#commonlyTimes").val();
             data.commonlyTimes = $("#commonlyTimes").val();
             var that = this;
             var that = this;
 
 
-            if(!data.kpiId){
+            if (!data.kpiId) {
                 layer.msg("请先选择指标！", {
                 layer.msg("请先选择指标！", {
                     icon: 7
                     icon: 7
                     , time: 3000
                     , time: 3000
@@ -217,7 +231,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
                 return false;
                 return false;
             }
             }
 
 
-            if(!data.kpiId || data.kpiId == ''){
+            if (!data.kpiId || data.kpiId == '') {
                 layer.msg("请先选择指标！", {
                 layer.msg("请先选择指标！", {
                     icon: 7
                     icon: 7
                     , time: 3000
                     , time: 3000
@@ -225,7 +239,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
                 return false;
                 return false;
             }
             }
 
 
-            if(!data.alarmContentExpr || data.alarmContentExpr == ''){
+            if (!data.alarmContentExpr || data.alarmContentExpr == '') {
                 layer.msg("请先填写告警内容描述表达式！", {
                 layer.msg("请先填写告警内容描述表达式！", {
                     icon: 7
                     icon: 7
                     , time: 3000
                     , time: 3000
@@ -233,8 +247,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
                 return false;
                 return false;
             }
             }
 
 
-            if(NoticeMergeFlag && NoticeMergeFlag == 'on'){
-                if(!data.alarmContentExpr || data.alarmContentExpr == ''){
+            if (NoticeMergeFlag && NoticeMergeFlag == 'on') {
+                if (!data.alarmContentExpr || data.alarmContentExpr == '') {
                     layer.msg("请先填写告警内容描述表达式！", {
                     layer.msg("请先填写告警内容描述表达式！", {
                         icon: 7
                         icon: 7
                         , time: 3000
                         , time: 3000
@@ -247,7 +261,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
             var importantPolicy = data.seriousPolicy;
             var importantPolicy = data.seriousPolicy;
             var importantExpr = data.importantPolicy;
             var importantExpr = data.importantPolicy;
             var commonlyPolicy = data.commonlyPolicy;
             var commonlyPolicy = data.commonlyPolicy;
-            if((!importantPolicy || importantPolicy == '') && (!importantExpr || importantExpr == '') && (!commonlyPolicy || commonlyPolicy == '')){
+            if ((!importantPolicy || importantPolicy == '') && (!importantExpr || importantExpr == '') && (!commonlyPolicy || commonlyPolicy == '')) {
                 layer.msg("严重、重要和一般告警的表达式必须有一项不为空！", {
                 layer.msg("严重、重要和一般告警的表达式必须有一项不为空！", {
                     icon: 7
                     icon: 7
                     , time: 3000
                     , time: 3000
@@ -255,7 +269,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
                 return false;
                 return false;
             }
             }
 
 
-            if(!data.noticeMergeFlagExpr || data.noticeMergeFlagExpr == ''){
+            if (!data.noticeMergeFlagExpr || data.noticeMergeFlagExpr == '') {
                 layer.msg("请先填写通知合并策略描述表达式！", {
                 layer.msg("请先填写通知合并策略描述表达式！", {
                     icon: 7
                     icon: 7
                     , time: 3000
                     , time: 3000
@@ -268,7 +282,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
              * 保存通知合并策略
              * 保存通知合并策略
              */
              */
             var noticeMergeFlagExpr = $("#noticeMergeFlagExpr").val()
             var noticeMergeFlagExpr = $("#noticeMergeFlagExpr").val()
-            function saveNoticeMerge(id){
+
+            function saveNoticeMerge(id) {
                 var noticeMergeData = {
                 var noticeMergeData = {
                     "mergePolicyId": id,
                     "mergePolicyId": id,
                     "mergePolicyName": data.alarmPolicyName,
                     "mergePolicyName": data.alarmPolicyName,
@@ -278,44 +293,45 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
                     "kpiId": data.kpiId
                     "kpiId": data.kpiId
                 }
                 }
                 admin.req({
                 admin.req({
-                    url : domainName +  '/api-web/policyMerge/save?access_token='+accessToken
-                    ,data:JSON.stringify(noticeMergeData)
-                    ,type:'post'
-                    ,contentType: "application/json; charset=utf-8"
-                    ,done:function (res){
-                        if(!res.success){
-                            layer.msg(res.msg ?  res.msg : '通知合并策略保存失败', { offset: '15px' , icon: 7 , time: 1000 });
+                    url: domainName + '/api-web/policyMerge/save?access_token=' + accessToken
+                    , data: JSON.stringify(noticeMergeData)
+                    , type: 'post'
+                    , contentType: "application/json; charset=utf-8"
+                    , done: function (res) {
+                        if (!res.success) {
+                            layer.msg(res.msg ? res.msg : '通知合并策略保存失败', {offset: '15px', icon: 7, time: 1000});
                         }
                         }
                     }
                     }
                 });
                 });
             }
             }
+
             charToExpr(data, 'alarmContentExpr');
             charToExpr(data, 'alarmContentExpr');
             charToExpr(data, 'cleanPolicy');
             charToExpr(data, 'cleanPolicy');
             charToExpr(data, 'commonlyExpr');
             charToExpr(data, 'commonlyExpr');
             charToExpr(data, 'importantExpr');
             charToExpr(data, 'importantExpr');
             charToExpr(data, 'seriousExpr');
             charToExpr(data, 'seriousExpr');
 
 
-            form.on('submit(add-alarmpolicy-form)',function () {
+            form.on('submit(add-alarmpolicy-form)', function () {
                 delete data.noticeMergeFlagExpr;
                 delete data.noticeMergeFlagExpr;
                 admin.req({
                 admin.req({
-                    url : domainName +  '/api-web/alarmPolicy/save?access_token='+accessToken
-                    ,data:JSON.stringify(data)
-                    ,type:'post'
-                    ,contentType: "application/json; charset=utf-8"
-                    ,done:function (res){
-                        if(res.success){
+                    url: domainName + '/api-web/alarmPolicy/save?access_token=' + accessToken
+                    , data: JSON.stringify(data)
+                    , type: 'post'
+                    , contentType: "application/json; charset=utf-8"
+                    , done: function (res) {
+                        if (res.success) {
                             // 保存通知合并策略
                             // 保存通知合并策略
                             saveNoticeMerge(res.str);
                             saveNoticeMerge(res.str);
 
 
-                            localStorage.setItem("detailPageOfcustomPolicyId",res.str)
-                            layer.msg(res.msg, { offset: '15px' , icon: 1 , time: 1000 },function (){
+                            localStorage.setItem("detailPageOfcustomPolicyId", res.str)
+                            layer.msg(res.msg, {offset: '15px', icon: 1, time: 1000}, function () {
                                 localStorage.removeItem("currentResType");
                                 localStorage.removeItem("currentResType");
-                                if(layui.alarmpolicyIndex && layui.alarmpolicyIndex()){
+                                if (layui.alarmpolicyIndex && layui.alarmpolicyIndex()) {
                                     layui.alarmpolicyIndex().reloadAlarmPolicy()
                                     layui.alarmpolicyIndex().reloadAlarmPolicy()
                                 }
                                 }
                             });
                             });
-                        }else{
-                            layer.msg(res.msg, { offset: '15px' , icon: 7 , time: 1000 });
+                        } else {
+                            layer.msg(res.msg, {offset: '15px', icon: 7, time: 1000});
                         }
                         }
                     }
                     }
                 });
                 });
@@ -325,24 +341,24 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
         });
         });
 
 
         //克隆告警策略元素
         //克隆告警策略元素
-        function clonePolicyDoms(id){
+        function clonePolicyDoms(id) {
             var times = new Date().getTime()
             var times = new Date().getTime()
             var cond = `<div class="layui-form-item cont-base" id="${id}-${times}-condition">
             var cond = `<div class="layui-form-item cont-base" id="${id}-${times}-condition">
                             <input type="checkbox" checked="" lay-skin="switch" lay-text="或|且">
                             <input type="checkbox" checked="" lay-skin="switch" lay-text="或|且">
                         </div>`;
                         </div>`;
             var clone = $(`#${id}`).clone();
             var clone = $(`#${id}`).clone();
-            clone.attr("id",id+"-"+times).find("i.policy-input-add").addClass("hide")
-                .parent().parent().find("i.policy-input-del").attr("data-id",id + "-"+times).removeClass("hide")
+            clone.attr("id", id + "-" + times).find("i.policy-input-add").addClass("hide")
+                .parent().parent().find("i.policy-input-del").attr("data-id", id + "-" + times).removeClass("hide")
                 .parent().parent().find("input.layui-input").val("");
                 .parent().parent().find("input.layui-input").val("");
             $(`#${id}`).after(clone).after(cond);
             $(`#${id}`).after(clone).after(cond);
 
 
             form.render();
             form.render();
             //渲染新增事件
             //渲染新增事件
-            $("i.policy-input-add").off("click").on("click",function (){
+            $("i.policy-input-add").off("click").on("click", function () {
                 clonePolicyDoms($(this).data("id"));
                 clonePolicyDoms($(this).data("id"));
             });
             });
             //删除告警策略规则行
             //删除告警策略规则行
-            $("i.policy-input-del").off("click").on("click",function (){
+            $("i.policy-input-del").off("click").on("click", function () {
                 var id = $(this).data("id");
                 var id = $(this).data("id");
                 $(`#${id}`).remove();
                 $(`#${id}`).remove();
                 $(`#${id}-condition`).remove();
                 $(`#${id}-condition`).remove();
@@ -350,7 +366,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
         }
         }
 
 
         function editNoticeExpr(noticeExpr, alarmTimes, noticeType) {
         function editNoticeExpr(noticeExpr, alarmTimes, noticeType) {
-            var title  = `<a class="layui-icon layui-icon-edit win_title_icon"></a>编辑通知表达式`;
+            var title = `<a class="layui-icon layui-icon-edit win_title_icon"></a>编辑通知表达式`;
             common.openWin('baseconfig/alarmpolicy/noticeExprEdit', title, {
             common.openWin('baseconfig/alarmpolicy/noticeExprEdit', title, {
                 noticeExpr,
                 noticeExpr,
                 alarmTimes,
                 alarmTimes,
@@ -373,7 +389,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
         //如果是详情页过来的，则不能改变指标和默认状态
         //如果是详情页过来的，则不能改变指标和默认状态
         if (data && data.from === 'detail') {
         if (data && data.from === 'detail') {
             $("#alarmpolicy-form-select-kpi, #alarm-policy-kpiName").off('click');
             $("#alarmpolicy-form-select-kpi, #alarm-policy-kpiName").off('click');
-            $('#add-alarmpolicy-form').find('[name="policyType"]').attr("disabled","disabled");
+            $('#add-alarmpolicy-form').find('[name="policyType"]').attr("disabled", "disabled");
         }
         }
     });
     });
 });
 });

 //告警策略
 //告警策略
-layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect','treeTable'], function (exports) {
+layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect', 'treeTable'], function (exports) {
     var $ = layui.$;
     var $ = layui.$;
     var form = layui.form;
     var form = layui.form;
     var layer = layui.layer;
     var layer = layui.layer;
@@ -20,7 +20,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
 
 
         if (data && data.type == 'alarmTemplate') {
         if (data && data.type == 'alarmTemplate') {
             $('#alarmpolicy_policyType').val('0');
             $('#alarmpolicy_policyType').val('0');
-            $('#alarmpolicy_policyType').attr('disabled','disabled');
+            $('#alarmpolicy_policyType').attr('disabled', 'disabled');
         } else {
         } else {
             $('#alarmpolicy_policyType').val('1');
             $('#alarmpolicy_policyType').val('1');
         }
         }
@@ -32,28 +32,28 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
             }
             }
         });
         });
         //查询按钮点击事件  joke add 20210428
         //查询按钮点击事件  joke add 20210428
-        $('#alarmpolicyQueryBtn').on('click',function () {
+        $('#alarmpolicyQueryBtn').on('click', function () {
             reloadAlarmPolicyTable();
             reloadAlarmPolicyTable();
         });
         });
 
 
         //指标类型
         //指标类型
-        form.on('select(alarmpolicy_kpitype)', function(){
+        form.on('select(alarmpolicy_kpitype)', function () {
             reloadAlarmPolicyTable();
             reloadAlarmPolicyTable();
         });
         });
 
 
         //指标分类
         //指标分类
-        form.on('select(alarmpolicy_category)', function(){
+        form.on('select(alarmpolicy_category)', function () {
             reloadAlarmPolicyTable();
             reloadAlarmPolicyTable();
         });
         });
 
 
         //策略类型分类
         //策略类型分类
-        form.on('select(alarmpolicy_policyType)', function(){
+        form.on('select(alarmpolicy_policyType)', function () {
             reloadAlarmPolicyTable();
             reloadAlarmPolicyTable();
         });
         });
 
 
         form.render(null, 'alarmpolicy-form');
         form.render(null, 'alarmpolicy-form');
         //新增
         //新增
-        $("#alarmpolicy_create").unbind("click").on("click",function () {
+        $("#alarmpolicy_create").unbind("click").on("click", function () {
             if ($.inArray('back:alarmpolicy:save', checkList) == -1) {
             if ($.inArray('back:alarmpolicy:save', checkList) == -1) {
                 layer.msg('暂无权限!', {icon: 7, time: 3000});
                 layer.msg('暂无权限!', {icon: 7, time: 3000});
                 return;
                 return;
@@ -62,7 +62,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
         });
         });
 
 
         //同步
         //同步
-        $("#alarmpolicy_sync").on("click",function (){
+        $("#alarmpolicy_sync").on("click", function () {
             if ($.inArray('back:alarmpolicy:synchronization', checkList) == -1) {
             if ($.inArray('back:alarmpolicy:synchronization', checkList) == -1) {
                 layer.msg('暂无权限!', {icon: 7, time: 3000});
                 layer.msg('暂无权限!', {icon: 7, time: 3000});
                 return;
                 return;
@@ -70,7 +70,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
             syncAlarmPolicy();
             syncAlarmPolicy();
         });
         });
         //删除
         //删除
-        $("#alarmpolicy_delete").unbind("click").on("click",function () {
+        $("#alarmpolicy_delete").unbind("click").on("click", function () {
             deleteAlarmPolicy();
             deleteAlarmPolicy();
         });
         });
 
 
@@ -78,55 +78,64 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
         var alarmpolicyTable = table.render({
         var alarmpolicyTable = table.render({
             elem: '#alarmpolicyTable'
             elem: '#alarmpolicyTable'
             , url: domainName + '/api-web/alarmPolicy/page'
             , url: domainName + '/api-web/alarmPolicy/page'
-            , where:{
-                access_token:accessToken,
-                alarmPolicyName:$("#alarmpolicykw").val(),
-                kpiIdent:$('#alarmpolicy_category').val(),
-                resType:$('#alarmpolicy_kpitype').val(),
-                policyType:$('#alarmpolicy_policyType').val(),
+            , where: {
+                access_token: accessToken,
+                alarmPolicyName: $("#alarmpolicykw").val(),
+                kpiIdent: $('#alarmpolicy_category').val(),
+                resType: $('#alarmpolicy_kpitype').val(),
+                policyType: $('#alarmpolicy_policyType').val(),
                 resName: resName
                 resName: resName
             }
             }
             , height: 'full-200'
             , height: 'full-200'
             , page: {
             , page: {
                 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
                 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
-                ,theme: '#1E9FFF'//自定义分页主题颜色
+                , theme: '#1E9FFF'//自定义分页主题颜色
             }
             }
-            , end: function(e){
+            , end: function (e) {
                 form.render();
                 form.render();
             }
             }
             , even: true
             , even: true
             , cols: [[
             , cols: [[
                 {type: 'checkbox'}
                 {type: 'checkbox'}
-                , {field: 'policyType', title: '策略类型', align: 'center', sort: true, width:120,
-                    templet: function(d){
+                , {
+                    field: 'policyType', title: '策略类型', align: 'center', sort: true, width: 120,
+                    templet: function (d) {
                         var checked = '';
                         var checked = '';
-                        if(d.policyType == '1'){ //默认
+                        if (d.policyType == '1') { //默认
                             checked = "checked";
                             checked = "checked";
                         }
                         }
                         return `<input type="checkbox" id="${d.alarmPolicyId}" data-kpiid="${d.kpiId}" name="close" ${checked} lay-skin="switch" lay-filter="switchPolicyType" lay-text="默认|非默认">`;
                         return `<input type="checkbox" id="${d.alarmPolicyId}" data-kpiid="${d.kpiId}" name="close" ${checked} lay-skin="switch" lay-filter="switchPolicyType" lay-text="默认|非默认">`;
-                    }}
+                    }
+                }
                 , {
                 , {
                     field: 'alarmPolicyName', title: '策略名称', align: 'center', sort: true,
                     field: 'alarmPolicyName', title: '策略名称', align: 'center', sort: true,
                     templet: '<div><span data-id="{{d.alarmPolicyId}}" class="layui-table-link view-alarmPolicy-name">{{d.alarmPolicyName}}</span></div>'
                     templet: '<div><span data-id="{{d.alarmPolicyId}}" class="layui-table-link view-alarmPolicy-name">{{d.alarmPolicyName}}</span></div>'
                 }
                 }
-                , {title: '资源类型', align: 'center',templet:function (d){
+                , {
+                    title: '资源类型', align: 'center', templet: function (d) {
                         return `${d.resTypeName}`
                         return `${d.resTypeName}`
-                    }}
-                , {field: 'kpiName', title: '指标', align: 'center', width:240}
-                , {title: '策略内容', align: 'center',templet:function (d){
+                    }
+                }
+                , {field: 'kpiName', title: '指标', align: 'center', width: 240}
+                , {
+                    title: '策略内容', align: 'center', templet: function (d) {
                         return `告警策略表达式：严重告警：【${d.seriousPolicy}】,<br>重要告警：【${d.importantPolicy}】,<br>一般告警：【${d.commonlyPolicy}】`;
                         return `告警策略表达式：严重告警：【${d.seriousPolicy}】,<br>重要告警：【${d.importantPolicy}】,<br>一般告警：【${d.commonlyPolicy}】`;
-                    }}
-                , {field: 'alarmTempTotal', title: '所属告警模板量', align: 'center', sort: true, width:180,
-                    templet:function (d){
-                        if(d.alarmTempTotal != '0'){
+                    }
+                }
+                , {
+                    field: 'alarmTempTotal', title: '所属告警模板量', align: 'center', sort: true, width: 180,
+                    templet: function (d) {
+                        if (d.alarmTempTotal != '0') {
                             return `<div><span data-id="${d.alarmPolicyId}" class="layui-table-link view-alarm-template-total">${d.alarmTempTotal}</span></div>`;
                             return `<div><span data-id="${d.alarmPolicyId}" class="layui-table-link view-alarm-template-total">${d.alarmTempTotal}</span></div>`;
-                        }else{
+                        } else {
                             return d.alarmTempTotal;
                             return d.alarmTempTotal;
                         }
                         }
-                    }}
+                    }
+                }
                 // , {field: 'kpiTypes', title: '指标类型', align: 'center', sort: true,minWith:180}
                 // , {field: 'kpiTypes', title: '指标类型', align: 'center', sort: true,minWith:180}
-                , {field: 'kpiIdent', title: '指标类型', align: 'center', width:120, templet: function(d){
-                        switch (d.kpiIdent){
+                , {
+                    field: 'kpiIdent', title: '指标类型', align: 'center', width: 120, templet: function (d) {
+                        switch (d.kpiIdent) {
                             case "0":
                             case "0":
                                 return "基本指标";
                                 return "基本指标";
                             case "1":
                             case "1":
@@ -137,49 +146,52 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
                                 return "告警指标";
                                 return "告警指标";
 
 
                         }
                         }
-                    }}
-                , {field: 'syncFlag',title: '同步状态',align: 'center', sort: true,width:120,
-                    templet: function(d){
+                    }
+                }
+                , {
+                    field: 'syncFlag', title: '同步状态', align: 'center', sort: true, width: 120,
+                    templet: function (d) {
                         if (d.policyType == '1') { //默认
                         if (d.policyType == '1') { //默认
-                            if(d.syncFlag != 1){ //未同步
+                            if (d.syncFlag != 1) { //未同步
                                 return `<input type="checkbox" id="${d.alarmPolicyId}" name="close"  lay-skin="switch" lay-filter="switchSyncPolicy" lay-text="已同步|未同步">`;
                                 return `<input type="checkbox" id="${d.alarmPolicyId}" name="close"  lay-skin="switch" lay-filter="switchSyncPolicy" lay-text="已同步|未同步">`;
-                            }else{
+                            } else {
                                 return ' <button type="button" class="layui-btn layui-bg-green  layui-btn-radius layui-btn-xs p-0-15">已同步</button>';
                                 return ' <button type="button" class="layui-btn layui-bg-green  layui-btn-radius layui-btn-xs p-0-15">已同步</button>';
                             }
                             }
                         } else {
                         } else {
                             return ''
                             return ''
                         }
                         }
                     }
                     }
-                 }
-                , {title: '操作', align: 'center',width:100, fixed: 'right',
+                }
+                , {
+                    title: '操作', align: 'center', width: 100, fixed: 'right',
                     templet: '<div>' +
                     templet: '<div>' +
-                        '<button data-id="{{d.alarmPolicyId}}" lay-tips="删除" type="button" class="layui-btn layui-btn-xs layui-btn-normal delete-alarmPolicy-btn"><i class="layui-icon layui-icon-delete"></i></button>'+
+                        '<button data-id="{{d.alarmPolicyId}}" lay-tips="删除" type="button" class="layui-btn layui-btn-xs layui-btn-normal delete-alarmPolicy-btn"><i class="layui-icon layui-icon-delete"></i></button>' +
                         '</div>'
                         '</div>'
                 }
                 }
             ]],
             ]],
-            done:function () {
+            done: function () {
                 //设置默认
                 //设置默认
-                form.on('switch(switchPolicyType)', function(obj){
+                form.on('switch(switchPolicyType)', function (obj) {
                     var alarmPolicyId = obj.elem.id;
                     var alarmPolicyId = obj.elem.id;
                     var alarmPolicyKpiId = $(obj.elem).data("kpiid");
                     var alarmPolicyKpiId = $(obj.elem).data("kpiid");
-                    var isChecked = obj.elem.checked?"1":"0";
+                    var isChecked = obj.elem.checked ? "1" : "0";
                     admin.req({
                     admin.req({
-                        url:common.domainName + '/api-web/alarmPolicy/default'
-                        , type : 'post'
-                        , data:{
-                            id:alarmPolicyId,
-                            type:isChecked,
-                            kpiId:alarmPolicyKpiId
+                        url: common.domainName + '/api-web/alarmPolicy/default'
+                        , type: 'post'
+                        , data: {
+                            id: alarmPolicyId,
+                            type: isChecked,
+                            kpiId: alarmPolicyKpiId
                         }
                         }
                     }).done(function (res) {
                     }).done(function (res) {
-                        layer.msg(res.msg, { offset: '15px' , icon: 1, time: 2000},function (){
+                        layer.msg(res.msg, {offset: '15px', icon: 1, time: 2000}, function () {
                             reloadAlarmPolicyTable();
                             reloadAlarmPolicyTable();
                         });
                         });
                     });
                     });
                 });
                 });
 
 
                 //点击名称编辑
                 //点击名称编辑
-                $(".view-alarmPolicy-name").off("click").on("click",function () {
+                $(".view-alarmPolicy-name").off("click").on("click", function () {
                     if ($.inArray('back:alarmpolicy:update', checkList) == -1) {
                     if ($.inArray('back:alarmpolicy:update', checkList) == -1) {
                         layer.msg('暂无权限!', {icon: 7, time: 3000});
                         layer.msg('暂无权限!', {icon: 7, time: 3000});
                         return;
                         return;
@@ -188,19 +200,19 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
                 });
                 });
 
 
                 //查看告警策略所属模板列表
                 //查看告警策略所属模板列表
-                $(".view-alarm-template-total").on("click",function (){
+                $(".view-alarm-template-total").on("click", function () {
                     var id = $(this).data("id");
                     var id = $(this).data("id");
-                    common.openWin('baseconfig/alarmtemplate/list',"告警模板",{policyId:id})
+                    common.openWin('baseconfig/alarmtemplate/list', "告警模板", {policyId: id})
                 });
                 });
 
 
                 //设置同步
                 //设置同步
-                form.on('switch(switchSyncPolicy)', function(obj){
+                form.on('switch(switchSyncPolicy)', function (obj) {
                     var alarmPolicyId = obj.elem.id;
                     var alarmPolicyId = obj.elem.id;
                     syncAlarmPolicy(alarmPolicyId);
                     syncAlarmPolicy(alarmPolicyId);
                 });
                 });
 
 
                 //删除
                 //删除
-                $(".delete-alarmPolicy-btn").on("click",function () {
+                $(".delete-alarmPolicy-btn").on("click", function () {
                     var id = $(this).data("id");
                     var id = $(this).data("id");
                     deleteAlarmPolicy(id)
                     deleteAlarmPolicy(id)
                 });
                 });
@@ -208,13 +220,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
         });
         });
 
 
         //同步策略
         //同步策略
-        function syncAlarmPolicy(alarmPolicyId){
+        function syncAlarmPolicy(alarmPolicyId) {
             if (typeof (alarmPolicyId) != "string") {
             if (typeof (alarmPolicyId) != "string") {
                 var ids = [];
                 var ids = [];
                 var data = table.checkStatus('alarmpolicyTable').data;
                 var data = table.checkStatus('alarmpolicyTable').data;
                 var flag = true;
                 var flag = true;
-                if(data && data.length > 0){
-                    $.each(data,function (i,obj) {
+                if (data && data.length > 0) {
+                    $.each(data, function (i, obj) {
                         if (obj.policyType == '0') {
                         if (obj.policyType == '0') {
                             flag = false
                             flag = false
                         }
                         }
@@ -222,11 +234,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
                     });
                     });
                 }
                 }
                 if (!flag) {
                 if (!flag) {
-                    layer.msg('非默认策略类型禁止同步！',{icon: 7,time:2000})
+                    layer.msg('非默认策略类型禁止同步！', {icon: 7, time: 2000})
                     return;
                     return;
                 }
                 }
                 if (ids.length == 0) {
                 if (ids.length == 0) {
-                    layer.msg('请选择要同步的数据',{icon: 7,time:2000});
+                    layer.msg('请选择要同步的数据', {icon: 7, time: 2000});
                     return;
                     return;
                 }
                 }
                 alarmPolicyId = ids.toString();
                 alarmPolicyId = ids.toString();
@@ -245,20 +257,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
             });
             });
 
 
             admin.req({
             admin.req({
-                url:common.domainName + '/api-web/alarmPolicy/sync'
-                , data:{
-                    ids:alarmPolicyId
+                url: common.domainName + '/api-web/alarmPolicy/sync'
+                , data: {
+                    ids: alarmPolicyId
                 }
                 }
             }).done(function (res) {
             }).done(function (res) {
                 layer.close(syncload)
                 layer.close(syncload)
-                if(res.success){
-                    layer.msg(res.msg, { offset: '15px' , icon: 1 , time: 1000 },function (){
+                if (res.success) {
+                    layer.msg(res.msg, {offset: '15px', icon: 1, time: 1000}, function () {
                         reloadAlarmPolicyTable();
                         reloadAlarmPolicyTable();
                     });
                     });
-                }else{
-                    layer.msg(res.msg, { offset: '15px' , icon: 7 , time: 1000 });
+                } else {
+                    layer.msg(res.msg, {offset: '15px', icon: 7, time: 1000});
                 }
                 }
-            }).error(function (){
+            }).error(function () {
                 layer.close(syncload)
                 layer.close(syncload)
             });
             });
         }
         }
@@ -266,12 +278,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
         //刷新表格
         //刷新表格
         function reloadAlarmPolicyTable() {
         function reloadAlarmPolicyTable() {
             alarmpolicyTable.reload({
             alarmpolicyTable.reload({
-                where:{
-                    access_token:accessToken,
-                    alarmPolicyName:$("#alarmpolicykw").val(),
-                    kpiIdent:$('#alarmpolicy_category').val(),
-                    resType:$('#alarmpolicy_kpitype').val(),
-                    policyType:$('#alarmpolicy_policyType').val(),
+                where: {
+                    access_token: accessToken,
+                    alarmPolicyName: $("#alarmpolicykw").val(),
+                    kpiIdent: $('#alarmpolicy_category').val(),
+                    resType: $('#alarmpolicy_kpitype').val(),
+                    policyType: $('#alarmpolicy_policyType').val(),
                     resName: resName
                     resName: resName
                 }
                 }
             });
             });
@@ -286,13 +298,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
             if (typeof (id) != "string") {
             if (typeof (id) != "string") {
                 var ids = [];
                 var ids = [];
                 var data = table.checkStatus('alarmpolicyTable').data;
                 var data = table.checkStatus('alarmpolicyTable').data;
-                if(data && data.length > 0){
-                    $.each(data,function (i,obj) {
+                if (data && data.length > 0) {
+                    $.each(data, function (i, obj) {
                         ids.push(obj.alarmPolicyId);
                         ids.push(obj.alarmPolicyId);
                     });
                     });
                 }
                 }
                 if (ids.length == 0) {
                 if (ids.length == 0) {
-                    layer.msg('请选择要删除的数据',{icon: 7,time:2000});
+                    layer.msg('请选择要删除的数据', {icon: 7, time: 2000});
                     return;
                     return;
                 }
                 }
                 id = ids.toString();
                 id = ids.toString();
@@ -303,8 +315,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
             }, function () {
             }, function () {
                 admin.req({
                 admin.req({
                     url: common.domainName + '/api-web/alarmPolicy/delete'
                     url: common.domainName + '/api-web/alarmPolicy/delete'
-                    ,type:"delete"
-                    ,data:{ids:id}
+                    , type: "delete"
+                    , data: {ids: id}
                 }).done(function (res) {
                 }).done(function (res) {
                     layer.msg('删除成功', {
                     layer.msg('删除成功', {
                         offset: '15px'
                         offset: '15px'
@@ -362,7 +374,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
                     height: 'auto',
                     height: 'auto',
                     data: resTypeTree,
                     data: resTypeTree,
                     on: function (data) {
                     on: function (data) {
-                        if(data.isAdd){
+                        if (data.isAdd) {
                             if (data.arr.length != 0) {
                             if (data.arr.length != 0) {
                                 resName = data.arr[0].name;
                                 resName = data.arr[0].name;
                             } else {
                             } else {
@@ -376,13 +388,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
         });
         });
 
 
         //新增、编辑策略表单
         //新增、编辑策略表单
-        function openPolicyForm(id){
-            var title = id?"编辑策略":"新增策略";
-            title  = `<a class="layui-icon layui-icon-edit win_title_icon"></a>${title}`;
-            common.openWin('baseconfig/alarmpolicy/add',title, {id:id},['保存','取消'],function () {
+        function openPolicyForm(id) {
+            var title = id ? "编辑策略" : "新增策略";
+            title = `<a class="layui-icon layui-icon-edit win_title_icon"></a>${title}`;
+            common.openWin('baseconfig/alarmpolicy/add', title, {id: id}, ['保存', '取消'], function () {
                 $("#alarmpolicy-form-save-id").trigger("click");
                 $("#alarmpolicy-form-save-id").trigger("click");
                 return true;
                 return true;
-            },null,['90%','90%']);
+            }, null, ['90%', '90%']);
         }
         }
 
 
         //获取选中的数据
         //获取选中的数据
@@ -390,6 +402,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
             return table.checkStatus('alarmpolicyTable').data;
             return table.checkStatus('alarmpolicyTable').data;
         }
         }
 
 
-        return { getData: getCheckAlarmPolicyData,reloadAlarmPolicy:reloadAlarmPolicyTable()};
+        return {getData: getCheckAlarmPolicyData, reloadAlarmPolicy: reloadAlarmPolicyTable()};
     });
     });
 });
 });

 //告警订阅表单
 //告警订阅表单
-layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','orgusergroup'], function (exports) {
+layui.define(['form', 'admin', 'laydate', 'table', 'common', 'sessions', 'cron', 'orgusergroup'], function (exports) {
     var $ = layui.$;
     var $ = layui.$;
     var form = layui.form;
     var form = layui.form;
     var laydate = layui.laydate;
     var laydate = layui.laydate;
@@ -24,100 +24,100 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o
         //初始化日期组件
         //初始化日期组件
         laydate.render({
         laydate.render({
             elem: '.alarm_subscribe_times'
             elem: '.alarm_subscribe_times'
-            ,type: 'time'
-            ,range: true
+            , type: 'time'
+            , range: true
         });
         });
 
 
-        if(data && data.id){
+        if (data && data.id) {
             admin.req({
             admin.req({
-                url:domainName +  '/api-web/alarmsubscribe/getbyId/'+data.id
-                ,async:false
-                ,done:function (res){
+                url: domainName + '/api-web/alarmsubscribe/getbyId/' + data.id
+                , async: false
+                , done: function (res) {
                     //处理时间段回显
                     //处理时间段回显
-                    if(res.object.times){
-                        var times=res.object.times.split(',');
-                        if(times.length>1){
-                            res.object.times=times[0];
-                            $.each(times,function(i,v){
-                                if(i>0){
+                    if (res.object.times) {
+                        var times = res.object.times.split(',');
+                        if (times.length > 1) {
+                            res.object.times = times[0];
+                            $.each(times, function (i, v) {
+                                if (i > 0) {
                                     addTimeQuantum(times[i]);
                                     addTimeQuantum(times[i]);
                                 }
                                 }
                             });
                             });
                         }
                         }
                     }
                     }
-                    form.val("add-alarmsubscribe-form",res.object);
+                    form.val("add-alarmsubscribe-form", res.object);
                     //处理回显
                     //处理回显
-                    if(res.object.subWay){
+                    if (res.object.subWay) {
                         var subWay = res.object.subWay;
                         var subWay = res.object.subWay;
-                        $("#alarmsubscribe_add_subway").find('[data-type="'+subWay+'"]').removeClass("gray").siblings().addClass("gray");
+                        $("#alarmsubscribe_add_subway").find('[data-type="' + subWay + '"]').removeClass("gray").siblings().addClass("gray");
                     }
                     }
 
 
-                    if(res.data){
-                        $.each(res.data,function (i,v){
+                    if (res.data) {
+                        $.each(res.data, function (i, v) {
                             writeTagsInfo(v);
                             writeTagsInfo(v);
                         })
                         })
                     }
                     }
 
 
-                    if (res.obj){
-                        if (res.obj.subOrgLists){
-                            $.each(res.obj.subOrgLists,function (i,v){
+                    if (res.obj) {
+                        if (res.obj.subOrgLists) {
+                            $.each(res.obj.subOrgLists, function (i, v) {
                                 v.value = v.targetId;
                                 v.value = v.targetId;
-                                writeOrgTagsInfo(v,'selecte_org_content_id')
+                                writeOrgTagsInfo(v, 'selecte_org_content_id')
                             });
                             });
                         }
                         }
-                        if (res.obj.subGroupLists){
-                            $.each(res.obj.subGroupLists,function (i,v){
+                        if (res.obj.subGroupLists) {
+                            $.each(res.obj.subGroupLists, function (i, v) {
                                 v.value = v.targetId;
                                 v.value = v.targetId;
-                                writeOrgTagsInfo(v,'selecte_group_content_id')
+                                writeOrgTagsInfo(v, 'selecte_group_content_id')
                             });
                             });
                         }
                         }
 
 
                     }
                     }
 
 
-                    if(res.object.subType == '1'){//告警订阅
+                    if (res.object.subType == '1') {//告警订阅
                         $("div.alarmLevel").show();
                         $("div.alarmLevel").show();
                         $("div.reportType").hide();
                         $("div.reportType").hide();
                         var alarmLevels = res.object.alarmLevel.split(",");
                         var alarmLevels = res.object.alarmLevel.split(",");
-                        for(var i in alarmLevels){
+                        for (var i in alarmLevels) {
                             let chkbox = $(`input[type="checkbox"][name="alarmLevel"][value="${alarmLevels[i]}"]`);
                             let chkbox = $(`input[type="checkbox"][name="alarmLevel"][value="${alarmLevels[i]}"]`);
                             if (chkbox && chkbox.length > 0) {
                             if (chkbox && chkbox.length > 0) {
                                 chkbox[0].checked = true;
                                 chkbox[0].checked = true;
                                 form.render();
                                 form.render();
                             }
                             }
                         }
                         }
-                    }else if(res.object.subType == '2'){//报表订阅
+                    } else if (res.object.subType == '2') {//报表订阅
                         $("div.alarmLevel").hide();
                         $("div.alarmLevel").hide();
                         $("div.reportType").show();
                         $("div.reportType").show();
                         var reportTypes = res.object.reportType.split(",");
                         var reportTypes = res.object.reportType.split(",");
-                        for(var i in reportTypes){
+                        for (var i in reportTypes) {
                             let chkbox = $(`input[type="checkbox"][name="reportType"][value="${reportTypes[i]}"]`);
                             let chkbox = $(`input[type="checkbox"][name="reportType"][value="${reportTypes[i]}"]`);
                             if (chkbox && chkbox.length > 0) {
                             if (chkbox && chkbox.length > 0) {
                                 chkbox[0].checked = true;
                                 chkbox[0].checked = true;
                                 form.render();
                                 form.render();
                             }
                             }
                         }
                         }
-                    }else{
+                    } else {
                         $("div.alarmLevel").hide();
                         $("div.alarmLevel").hide();
                         $("div.reportType").hide();
                         $("div.reportType").hide();
                     }
                     }
 
 
-                    if(res.object.sentFrequency && res.object.sentFrequency.indexOf("?")>0){
+                    if (res.object.sentFrequency && res.object.sentFrequency.indexOf("?") > 0) {
                         $("#sentFrequency_input").val(res.object.sentFrequency);
                         $("#sentFrequency_input").val(res.object.sentFrequency);
                         $(".sentFrequency_input").show();
                         $(".sentFrequency_input").show();
                         $(".sentFrequency_select").hide();
                         $(".sentFrequency_select").hide();
-                    }else{
+                    } else {
                         $("#sentFrequency_select").val(res.object.sentFrequency);
                         $("#sentFrequency_select").val(res.object.sentFrequency);
                         $(".sentFrequency_input").hide();
                         $(".sentFrequency_input").hide();
                         $(".sentFrequency_select").show();
                         $(".sentFrequency_select").show();
                     }
                     }
-                    switchSubType(res.object.subType,res.object)
+                    switchSubType(res.object.subType, res.object)
                     form.render();
                     form.render();
                 }
                 }
             });
             });
         }
         }
 
 
         //corn表达式
         //corn表达式
-        $("#show_corn_info").on("click",function (){
+        $("#show_corn_info").on("click", function () {
             layer.open({
             layer.open({
                 type: 1
                 type: 1
                 , title: 'Cron表达式示例'
                 , title: 'Cron表达式示例'
@@ -140,20 +140,21 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o
         });
         });
 
 
         //全天
         //全天
-        $(".allday_subscribe").on("click",function (){
+        $(".allday_subscribe").on("click", function () {
             $(this).prev().find('input[name="times"]').val('00:00:00 - 23:59:59');
             $(this).prev().find('input[name="times"]').val('00:00:00 - 23:59:59');
         });
         });
         //工作时间
         //工作时间
-        $(".worktime_subscribe").on("click",function (){
+        $(".worktime_subscribe").on("click", function () {
             $(this).prev().prev().find('input[name="times"]').val('08:00:00 - 19:59:59');
             $(this).prev().prev().find('input[name="times"]').val('08:00:00 - 19:59:59');
         });
         });
         //添加时间段
         //添加时间段
-        $("#save_subscribe").on("click",function (){
+        $("#save_subscribe").on("click", function () {
             addTimeQuantum();
             addTimeQuantum();
         });
         });
+
         //添加时间段
         //添加时间段
-        function addTimeQuantum(v){
-            var html='    <div class="layui-form-item">\n' +
+        function addTimeQuantum(v) {
+            var html = '    <div class="layui-form-item">\n' +
                 '        <div class="layui-inline-block">\n' +
                 '        <div class="layui-inline-block">\n' +
                 '            <label class="layui-form-label">通知时间段</label>\n' +
                 '            <label class="layui-form-label">通知时间段</label>\n' +
                 '            <div class="layui-input-inline">\n' +
                 '            <div class="layui-input-inline">\n' +
@@ -167,75 +168,76 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o
             //添加组件
             //添加组件
             $('#message-time-quantum-div').before(html);
             $('#message-time-quantum-div').before(html);
             //获取添加的节点
             //获取添加的节点
-            var alarm_subscribe_times=$('#message-time-quantum-div').prev().find('.alarm_subscribe_times').eq(0).get(0);
+            var alarm_subscribe_times = $('#message-time-quantum-div').prev().find('.alarm_subscribe_times').eq(0).get(0);
 
 
             laydate.render({
             laydate.render({
                 elem: alarm_subscribe_times
                 elem: alarm_subscribe_times
-                ,type: 'time'
-                ,range: true
+                , type: 'time'
+                , range: true
             });
             });
 
 
             //全天
             //全天
-            $('#message-time-quantum-div').prev().find('.allday_subscribe').on("click",function (){
+            $('#message-time-quantum-div').prev().find('.allday_subscribe').on("click", function () {
                 $(this).prev().find('.alarm_subscribe_times').val('00:00:00 - 23:59:59');
                 $(this).prev().find('.alarm_subscribe_times').val('00:00:00 - 23:59:59');
             });
             });
             //工作时间
             //工作时间
-            $('#message-time-quantum-div').prev().find('.worktime_subscribe').on("click",function (){
+            $('#message-time-quantum-div').prev().find('.worktime_subscribe').on("click", function () {
                 $(this).prev().prev().find('.alarm_subscribe_times').val('08:00:00 - 19:59:59');
                 $(this).prev().prev().find('.alarm_subscribe_times').val('08:00:00 - 19:59:59');
             });
             });
             //删除
             //删除
-            $('#message-time-quantum-div').prev().find('.del_subscribe').on("click",function (){
+            $('#message-time-quantum-div').prev().find('.del_subscribe').on("click", function () {
                 $(this).closest('.layui-form-item').remove();
                 $(this).closest('.layui-form-item').remove();
                 layer.closeAll('tips');
                 layer.closeAll('tips');
             });
             });
-            if(v){
+            if (v) {
                 $('#message-time-quantum-div').prev().find('.alarm_subscribe_times').val(v);
                 $('#message-time-quantum-div').prev().find('.alarm_subscribe_times').val(v);
             }
             }
             form.render();
             form.render();
         }
         }
+
         //订阅方式
         //订阅方式
-        $("#alarmsubscribe_add_subway li").on("click",function (){
+        $("#alarmsubscribe_add_subway li").on("click", function () {
             $(this).removeClass("gray").siblings().addClass("gray");
             $(this).removeClass("gray").siblings().addClass("gray");
             $("#alarmsubscribe_subway").val($(this).data("type"));
             $("#alarmsubscribe_subway").val($(this).data("type"));
         });
         });
 
 
         //订阅类型切换事件
         //订阅类型切换事件
         form.on('select(alarm-subscribe-subype)', function (data) {
         form.on('select(alarm-subscribe-subype)', function (data) {
-            if(data.value == '1'){
+            if (data.value == '1') {
                 $("div.alarmLevel").show();
                 $("div.alarmLevel").show();
                 $("div.reportType").hide();
                 $("div.reportType").hide();
-            }else if(data.value == '2'){
+            } else if (data.value == '2') {
                 $("div.alarmLevel").hide();
                 $("div.alarmLevel").hide();
                 $("div.reportType").show();
                 $("div.reportType").show();
-            }else{
+            } else {
                 $("div.alarmLevel").hide();
                 $("div.alarmLevel").hide();
                 $("div.reportType").hide();
                 $("div.reportType").hide();
             }
             }
-            switchSubType(data.value,undefined)
+            switchSubType(data.value, undefined)
             form.render()
             form.render()
         });
         });
 
 
         //通知类型
         //通知类型
         form.on('radio(sub_send-type)', function (data) {
         form.on('radio(sub_send-type)', function (data) {
-            if(data.value == '1'){
+            if (data.value == '1') {
                 $(".sentFrequency_select").show();
                 $(".sentFrequency_select").show();
                 $(".sentFrequency_input").hide();
                 $(".sentFrequency_input").hide();
-            }else{
+            } else {
                 $(".sentFrequency_select").hide();
                 $(".sentFrequency_select").hide();
                 $(".sentFrequency_input").show();
                 $(".sentFrequency_input").show();
             }
             }
         });
         });
 
 
-        $('#orgusergroup').on('click',function () {
+        $('#orgusergroup').on('click', function () {
 
 
         });
         });
 
 
         //选择用户
         //选择用户
-        $("#alarmsubscirbe-form-select-users").on("click",function (){
-            var selObj ={};
+        $("#alarmsubscirbe-form-select-users").on("click", function () {
+            var selObj = {};
             //回填订阅用户
             //回填订阅用户
             var selectedUserTags = $("#selecte_content_id").find("span");
             var selectedUserTags = $("#selecte_content_id").find("span");
-            if (selectedUserTags.length > 0){
+            if (selectedUserTags.length > 0) {
                 var userSelIds = new Array();
                 var userSelIds = new Array();
                 selectedUserTags.each(function () {
                 selectedUserTags.each(function () {
                     userSelIds.push($(this).data("username"));
                     userSelIds.push($(this).data("username"));
@@ -244,7 +246,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o
             }
             }
             //回填订阅部门
             //回填订阅部门
             var selecteOrgTags = $("#selecte_org_content_id").find("span");
             var selecteOrgTags = $("#selecte_org_content_id").find("span");
-            if (selecteOrgTags.length > 0){
+            if (selecteOrgTags.length > 0) {
                 var orgSelIds = new Array();
                 var orgSelIds = new Array();
                 selecteOrgTags.each(function () {
                 selecteOrgTags.each(function () {
                     orgSelIds.push($(this).data("id"));
                     orgSelIds.push($(this).data("id"));
@@ -253,7 +255,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o
             }
             }
             //回填订阅组
             //回填订阅组
             var selecteGoupTags = $("#selecte_group_content_id").find("span");
             var selecteGoupTags = $("#selecte_group_content_id").find("span");
-            if (selecteGoupTags.length > 0){
+            if (selecteGoupTags.length > 0) {
                 var groupSelIds = new Array();
                 var groupSelIds = new Array();
                 selecteGoupTags.each(function () {
                 selecteGoupTags.each(function () {
                     groupSelIds.push($(this).data("id"));
                     groupSelIds.push($(this).data("id"));
@@ -264,38 +266,39 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o
         });
         });
 
 
         //通知时间段拼接字符
         //通知时间段拼接字符
-        function times(timeVal){
-            var str='';
-            $.each($('.alarm_subscribe_times'),function (i,v) {
-                if($('.alarm_subscribe_times').eq(i).val()!=''){
-                    str+=$('.alarm_subscribe_times').eq(i).val()+',';
-                }else{
-                    timeVal.val=0;
+        function times(timeVal) {
+            var str = '';
+            $.each($('.alarm_subscribe_times'), function (i, v) {
+                if ($('.alarm_subscribe_times').eq(i).val() != '') {
+                    str += $('.alarm_subscribe_times').eq(i).val() + ',';
+                } else {
+                    timeVal.val = 0;
                 }
                 }
             })
             })
-            return str.slice(0,str.length-1);
+            return str.slice(0, str.length - 1);
         }
         }
+
         //保存
         //保存
-        var str=0;
-        $("#alarmsubscribe-form-save-id").on("click",function (){
+        var str = 0;
+        $("#alarmsubscribe-form-save-id").on("click", function () {
 
 
-            if(str==1){
+            if (str == 1) {
                 layer.msg("数据正在保存,请稍后在试！");
                 layer.msg("数据正在保存,请稍后在试！");
                 return false;
                 return false;
             }
             }
             var data = form.val("add-alarmsubscribe-form");
             var data = form.val("add-alarmsubscribe-form");
-            var val=1;
-            var timeVal={val};
+            var val = 1;
+            var timeVal = {val};
             //通知时间段
             //通知时间段
-            data.times=times(timeVal);
-            if(data.times=='' || timeVal.val==0){
+            data.times = times(timeVal);
+            if (data.times == '' || timeVal.val == 0) {
                 layer.msg("请将信息填写完整", {offset: '15px', icon: 7, time: 1500});
                 layer.msg("请将信息填写完整", {offset: '15px', icon: 7, time: 1500});
                 return false;
                 return false;
             }
             }
-            var verdict=1;
-            var timeVals={verdict};
+            var verdict = 1;
+            var timeVals = {verdict};
             //时间格式判断
             //时间格式判断
-            if(timeHorizon(data.times,timeVals)==0 || timeVals.verdict==0){
+            if (timeHorizon(data.times, timeVals) == 0 || timeVals.verdict == 0) {
                 layer.msg("请选择合理的时间范围或时间段", {offset: '15px', icon: 7, time: 1500});
                 layer.msg("请选择合理的时间范围或时间段", {offset: '15px', icon: 7, time: 1500});
                 return false;
                 return false;
             }
             }
@@ -305,11 +308,11 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o
             selectedTags.each(function () {
             selectedTags.each(function () {
                 contents.push($(this).data("id"))
                 contents.push($(this).data("id"))
                 receiveUserInfos.push({
                 receiveUserInfos.push({
-                    username:$(this).data("username"),
-                    nickname:$(this).data("nickname"),
-                    phone:$(this).data("phone"),
-                    operator:$(this).data("operator"),
-                    email:$(this).data("email")
+                    username: $(this).data("username"),
+                    nickname: $(this).data("nickname"),
+                    phone: $(this).data("phone"),
+                    operator: $(this).data("operator"),
+                    email: $(this).data("email")
                 })
                 })
             });
             });
             receiveUser = contents.toString()
             receiveUser = contents.toString()
@@ -319,7 +322,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o
             var selectedOrgs = $("#selecte_org_content_id").find("span");
             var selectedOrgs = $("#selecte_org_content_id").find("span");
             selectedOrgs.each(function () {
             selectedOrgs.each(function () {
                 receiveOrgInfos.push({
                 receiveOrgInfos.push({
-                    targetId: $(this).data("id")+'',
+                    targetId: $(this).data("id") + '',
                     type: 1
                     type: 1
                 });
                 });
             });
             });
@@ -328,47 +331,47 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o
             var selectedGroups = $("#selecte_group_content_id").find("span");
             var selectedGroups = $("#selecte_group_content_id").find("span");
             selectedGroups.each(function () {
             selectedGroups.each(function () {
                 receiveGroupInfoS.push({
                 receiveGroupInfoS.push({
-                    targetId: $(this).data("id")+'',
+                    targetId: $(this).data("id") + '',
                     type: 2
                     type: 2
                 })
                 })
             });
             });
             data.subGroupLists = receiveGroupInfoS;
             data.subGroupLists = receiveGroupInfoS;
             delete data["sub_send_type"];
             delete data["sub_send_type"];
-            form.on('submit(add-alarmsubscribe-form)',function () {
-                var alrmlevels = [],reportTypes = [];
-                $('input[name="reportType"]:checked').each(function() {
+            form.on('submit(add-alarmsubscribe-form)', function () {
+                var alrmlevels = [], reportTypes = [];
+                $('input[name="reportType"]:checked').each(function () {
                     reportTypes.push($(this).val());
                     reportTypes.push($(this).val());
                 });
                 });
-                $('input[name="alarmLevel"]:checked').each(function() {
+                $('input[name="alarmLevel"]:checked').each(function () {
                     alrmlevels.push($(this).val());
                     alrmlevels.push($(this).val());
                 });
                 });
                 data.alarmLevel = alrmlevels.toString();
                 data.alarmLevel = alrmlevels.toString();
                 data.reportType = reportTypes.toString();
                 data.reportType = reportTypes.toString();
                 //通知周期
                 //通知周期
-                if($('input[name="sub_send_type"]:checked').val() == "1"){
+                if ($('input[name="sub_send_type"]:checked').val() == "1") {
                     data.sentFrequency = $("#sentFrequency_select").val();
                     data.sentFrequency = $("#sentFrequency_select").val();
-                }else{
+                } else {
                     data.sentFrequency = $("#sentFrequency_input").val();
                     data.sentFrequency = $("#sentFrequency_input").val();
                 }
                 }
-                str=1;
+                str = 1;
                 admin.req({
                 admin.req({
-                    url : domainName +  '/api-web/alarmsubscribe/save?access_token='+accessToken
-                    ,data:JSON.stringify(data)
-                    ,type:'post'
-                    ,contentType: "application/json; charset=utf-8"
-                    ,done:function (res){
-                        if(res.success){
-                            localStorage.setItem("detailPageOfcustomSubId",res.str)
-                            layer.msg(res.msg, { offset: '15px' , icon: 1 , time: 1000 },function (){
+                    url: domainName + '/api-web/alarmsubscribe/save?access_token=' + accessToken
+                    , data: JSON.stringify(data)
+                    , type: 'post'
+                    , contentType: "application/json; charset=utf-8"
+                    , done: function (res) {
+                        if (res.success) {
+                            localStorage.setItem("detailPageOfcustomSubId", res.str)
+                            layer.msg(res.msg, {offset: '15px', icon: 1, time: 1000}, function () {
                                 receiveUserInfos = [];
                                 receiveUserInfos = [];
-                                if(layui.alarmsubscribeIndex && layui.alarmsubscribeIndex()){
+                                if (layui.alarmsubscribeIndex && layui.alarmsubscribeIndex()) {
                                     layer.closeAll();
                                     layer.closeAll();
-                                    str=0;
+                                    str = 0;
                                     layui.alarmsubscribeIndex().reloadsubscribe();
                                     layui.alarmsubscribeIndex().reloadsubscribe();
                                 }
                                 }
                             });
                             });
-                        }else{
-                            layer.msg(res.msg, { offset: '15px' , icon: 7 , time: 1000 });
+                        } else {
+                            layer.msg(res.msg, {offset: '15px', icon: 7, time: 1000});
                         }
                         }
                     }
                     }
                 });
                 });
@@ -396,30 +399,30 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o
                     //回填订阅人员
                     //回填订阅人员
                     var selectUser = returnValue.selectUser;
                     var selectUser = returnValue.selectUser;
                     // if (selectUser){  //如果有选择用户返回
                     // if (selectUser){  //如果有选择用户返回
-                        $('#selecte_content_id').html('');
-                            $.each(selectUser,function (i,v){  //处理元素，满足writeTagsInfo格式
-                                v.nickname = v.name;
-                                v.username = v.value;
-                                writeTagsInfo(v);  //将选择的用户回填到
-                            })
+                    $('#selecte_content_id').html('');
+                    $.each(selectUser, function (i, v) {  //处理元素，满足writeTagsInfo格式
+                        v.nickname = v.name;
+                        v.username = v.value;
+                        writeTagsInfo(v);  //将选择的用户回填到
+                    })
                     // }
                     // }
                     //回填订阅部门
                     //回填订阅部门
                     var selectOrg = returnValue.selectOrg;
                     var selectOrg = returnValue.selectOrg;
                     // if (selectOrg){
                     // if (selectOrg){
-                        var divId = 'selecte_org_content_id';
-                        $('#'+divId).html('');
-                            $.each(selectOrg,function (i,v){
-                                writeOrgTagsInfo(v,divId);
-                            })
+                    var divId = 'selecte_org_content_id';
+                    $('#' + divId).html('');
+                    $.each(selectOrg, function (i, v) {
+                        writeOrgTagsInfo(v, divId);
+                    })
                     // }
                     // }
                     //回填订阅组
                     //回填订阅组
                     var selectGroup = returnValue.selectGroup;
                     var selectGroup = returnValue.selectGroup;
                     // if (selectGroup){
                     // if (selectGroup){
-                        var divId = 'selecte_group_content_id';
-                        $('#'+divId).html('');
-                            $.each(selectGroup,function (i,v){
-                                writeOrgTagsInfo(v,divId);
-                            })
+                    var divId = 'selecte_group_content_id';
+                    $('#' + divId).html('');
+                    $.each(selectGroup, function (i, v) {
+                        writeOrgTagsInfo(v, divId);
+                    })
 
 
                     // }
                     // }
                     form.render();
                     form.render();
@@ -436,7 +439,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o
                <button type="button" value="${data.id}" class="tagsclose close">×</button>
                <button type="button" value="${data.id}" class="tagsclose close">×</button>
              </span>
              </span>
             `;
             `;
-            if(data.username){
+            if (data.username) {
                 //拼接标签
                 //拼接标签
                 $("#selecte_content_id").append(tags);
                 $("#selecte_content_id").append(tags);
                 //绑定标签的删除事件
                 //绑定标签的删除事件
@@ -446,29 +449,29 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o
 
 
         //写入订阅部门或组标签内容
         //写入订阅部门或组标签内容
         //data：数据  type:org/group
         //data：数据  type:org/group
-        function writeOrgTagsInfo(data,divId) {
+        function writeOrgTagsInfo(data, divId) {
             var tags = `
             var tags = `
              <span id="tags_span_${data.value}" data-id="${data.value}" data-name="${data.name}"
              <span id="tags_span_${data.value}" data-id="${data.value}" data-name="${data.name}"
                ><em>${data.name}</em> 
                ><em>${data.name}</em> 
                <button type="button" value="${data.value}" class="tagsclose close">×</button>
                <button type="button" value="${data.value}" class="tagsclose close">×</button>
              </span>
              </span>
             `;
             `;
-            if(data.value){
+            if (data.value) {
                 //拼接标签
                 //拼接标签
-                $("#"+divId).append(tags);
+                $("#" + divId).append(tags);
                 //绑定标签的删除事件
                 //绑定标签的删除事件
                 bindTagesDelEvent();
                 bindTagesDelEvent();
             }
             }
         }
         }
 
 
         //切换订阅类型
         //切换订阅类型
-        function switchSubType(subType,data) {
+        function switchSubType(subType, data) {
             var dom = $('form[name="add-alarmsubscribe-form"]');
             var dom = $('form[name="add-alarmsubscribe-form"]');
-            if (subType == '3'){
-                dom.find('input[name="sendTotal"]').attr('readonly','readonly').val('1');
-                dom.find('input[name="sub_send_type"]').attr('disabled','disabled');
-                dom.find('input[type="radio"][name="sub_send_type"][value="1"]').attr('checked','checked');
-                dom.find('#sentFrequency_select').attr('disabled','disabled').val('1');
+            if (subType == '3') {
+                dom.find('input[name="sendTotal"]').attr('readonly', 'readonly').val('1');
+                dom.find('input[name="sub_send_type"]').attr('disabled', 'disabled');
+                dom.find('input[type="radio"][name="sub_send_type"][value="1"]').attr('checked', 'checked');
+                dom.find('#sentFrequency_select').attr('disabled', 'disabled').val('1');
             } else {
             } else {
                 var sendTotal = '';
                 var sendTotal = '';
                 var sentFrequency = '1';
                 var sentFrequency = '1';
@@ -485,53 +488,54 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o
         //删除标签事件
         //删除标签事件
         function bindTagesDelEvent() {
         function bindTagesDelEvent() {
             //删除已选主体的页签
             //删除已选主体的页签
-            $("button.tagsclose").on("click",function () {
+            $("button.tagsclose").on("click", function () {
                 var id = $(this).attr("value");
                 var id = $(this).attr("value");
-                $("#tags_span_"+id).remove();
+                $("#tags_span_" + id).remove();
             });
             });
         }
         }
 
 
         //时间范围判断
         //时间范围判断
-        function  timeHorizon(times,timeVals){
-            var judge=1;
-            var list=times.split(',');
-            if(list.length.length<=1){
+        function timeHorizon(times, timeVals) {
+            var judge = 1;
+            var list = times.split(',');
+            if (list.length.length <= 1) {
                 return 1;
                 return 1;
             }
             }
             var listTime = [...new Set(list)];
             var listTime = [...new Set(list)];
-            if(list.length-listTime.length>0){
-                timeVals.verdict=0;
+            if (list.length - listTime.length > 0) {
+                timeVals.verdict = 0;
             }
             }
-            $.each(list,function (x,y) {
-                var beforeTime=dateTime(y.split(' - ')[0]);
-                var afterTime=dateTime(y.split(' - ')[1]);
+            $.each(list, function (x, y) {
+                var beforeTime = dateTime(y.split(' - ')[0]);
+                var afterTime = dateTime(y.split(' - ')[1]);
                 //判断时间段是否错误
                 //判断时间段是否错误
-                if(beforeTime>=afterTime){
-                    timeVals.verdict=0;
+                if (beforeTime >= afterTime) {
+                    timeVals.verdict = 0;
                 }
                 }
-                $.each(list,function (i,v) {
-                    if(v!=y){
+                $.each(list, function (i, v) {
+                    if (v != y) {
                         //获取开始时间
                         //获取开始时间
-                        var startTime=dateTime(v.split(' - ')[0]);
+                        var startTime = dateTime(v.split(' - ')[0]);
                         //获取结束时间
                         //获取结束时间
-                        var overTime=dateTime(v.split(' - ')[1]);
+                        var overTime = dateTime(v.split(' - ')[1]);
                         //判断是否在时间段里
                         //判断是否在时间段里
                         if (beforeTime >= startTime && beforeTime <= overTime) {
                         if (beforeTime >= startTime && beforeTime <= overTime) {
-                            judge=0;
+                            judge = 0;
                         }
                         }
-                        if(afterTime >= startTime && afterTime <= overTime){
-                            judge=0;
+                        if (afterTime >= startTime && afterTime <= overTime) {
+                            judge = 0;
                         }
                         }
                     }
                     }
                 });
                 });
             });
             });
             return judge;
             return judge;
         }
         }
+
         //时间格式转换
         //时间格式转换
-        function dateTime(timeDate){
-            var split=timeDate.split(":");
-            var myDate=new Date(2021,6,14,split[0],split[1],split[2]);
+        function dateTime(timeDate) {
+            var split = timeDate.split(":");
+            var myDate = new Date(2021, 6, 14, split[0], split[1], split[2]);
             return myDate;
             return myDate;
         }
         }
     });
     });
-});
+});

 //告警订阅
 //告警订阅
-layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function (exports) {
+layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function (exports) {
     var $ = layui.$;
     var $ = layui.$;
     var form = layui.form;
     var form = layui.form;
     var layer = layui.layer;
     var layer = layui.layer;
@@ -14,9 +14,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
         var noticeWaySelect = {};  //通知方式下拉框
         var noticeWaySelect = {};  //通知方式下拉框
         var subTypeSelect = {};  //订阅类型下拉框
         var subTypeSelect = {};  //订阅类型下拉框
         var busId = '';
         var busId = '';
-        if(data && data.policyId){
+        var userName = '';
+        if (data && data.policyId) {
             policyId = data.policyId;
             policyId = data.policyId;
-        }else{
+        } else {
             var policyId = "";
             var policyId = "";
         }
         }
         var resIdList = (data && data.resIdList) ? data.resIdList : [];
         var resIdList = (data && data.resIdList) ? data.resIdList : [];
@@ -32,20 +33,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
             }
             }
         });
         });
         //查询按钮点击事件  joke add 20210427
         //查询按钮点击事件  joke add 20210427
-        $('#alarmsubscribeQueryBtn').on('click',function () {
+        $('#alarmsubscribeQueryBtn').on('click', function () {
             reloadalarmsubscribeTable();
             reloadalarmsubscribeTable();
         })
         })
         //资源类型
         //资源类型
-        form.on('select(alarmsubscribe_type)', function(){
+        form.on('select(alarmsubscribe_type)', function () {
             reloadalarmsubscribeTable();
             reloadalarmsubscribeTable();
         });
         });
         //业务类型
         //业务类型
-        form.on('select(alarmsubscribe_noticeway)', function(){
+        form.on('select(alarmsubscribe_noticeway)', function () {
             reloadalarmsubscribeTable();
             reloadalarmsubscribeTable();
         });
         });
         form.render(null, 'alarmsubscribe-form');
         form.render(null, 'alarmsubscribe-form');
         //新增
         //新增
-        $("#alarmsubscribe_create").off("click").on("click",function () {
+        $("#alarmsubscribe_create").off("click").on("click", function () {
             if ($.inArray('back:alarmsubscribe:save', checkList) == -1) {
             if ($.inArray('back:alarmsubscribe:save', checkList) == -1) {
                 layer.msg('暂无权限!', {icon: 7, time: 3000});
                 layer.msg('暂无权限!', {icon: 7, time: 3000});
                 return;
                 return;
@@ -53,53 +54,53 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
             openAlarmsubscribeForm();
             openAlarmsubscribeForm();
         });
         });
         //删除
         //删除
-        $("#alarmsubscribe_delete").on("click",function () {
+        $("#alarmsubscribe_delete").on("click", function () {
             deletealarmsubscribe();
             deletealarmsubscribe();
         });
         });
         //同步
         //同步
-        $("#alarmsubscribe_sync").on("click",function () {
+        $("#alarmsubscribe_sync").on("click", function () {
             if ($.inArray('back:alarmsubscribe:synchronization', checkList) == -1) {
             if ($.inArray('back:alarmsubscribe:synchronization', checkList) == -1) {
                 layer.msg('暂无权限!', {icon: 7, time: 3000});
                 layer.msg('暂无权限!', {icon: 7, time: 3000});
                 return;
                 return;
             }
             }
             var ids = [];
             var ids = [];
             var data = table.checkStatus('alarmsubscribeTable').data;
             var data = table.checkStatus('alarmsubscribeTable').data;
-            if(data && data.length > 0){
-                $.each(data,function (i,obj) {
+            if (data && data.length > 0) {
+                $.each(data, function (i, obj) {
                     ids.push(obj.subId);
                     ids.push(obj.subId);
                 });
                 });
             }
             }
             if (ids.length == 0) {
             if (ids.length == 0) {
-                layer.msg('请选择要同步的数据',{icon: 7,time:2000});
+                layer.msg('请选择要同步的数据', {icon: 7, time: 2000});
                 return;
                 return;
             }
             }
             admin.req({
             admin.req({
-                url:common.domainName + '/api-web/alarmsubscribe/sync'
-                , data:{
-                    ids:ids.toString()
+                url: common.domainName + '/api-web/alarmsubscribe/sync'
+                , data: {
+                    ids: ids.toString()
                 }
                 }
             }).done(function (res) {
             }).done(function (res) {
-                if(res.success){
-                    layer.msg(res.msg, { offset: '15px' , icon: 1, time: 2000},function (){
+                if (res.success) {
+                    layer.msg(res.msg, {offset: '15px', icon: 1, time: 2000}, function () {
                         reloadalarmsubscribeTable();
                         reloadalarmsubscribeTable();
                     });
                     });
-                }else{
-                    layer.msg(res.msg, { offset: '15px' , icon: 7, time: 2000});
+                } else {
+                    layer.msg(res.msg, {offset: '15px', icon: 7, time: 2000});
                 }
                 }
             });
             });
         });
         });
-        if(resIdList && resIdList.length > 0){
+        if (resIdList && resIdList.length > 0) {
             $('#alarmsubscribe_unbind_res').removeClass('hide');
             $('#alarmsubscribe_unbind_res').removeClass('hide');
             $('#alarmsubscribe_unbind_res').unbind('click').on('click', function () {
             $('#alarmsubscribe_unbind_res').unbind('click').on('click', function () {
                 var ids = [];
                 var ids = [];
                 var data = table.checkStatus('alarmsubscribeTable').data;
                 var data = table.checkStatus('alarmsubscribeTable').data;
-                if(data && data.length > 0){
-                    $.each(data,function (i,obj) {
+                if (data && data.length > 0) {
+                    $.each(data, function (i, obj) {
                         ids.push(obj.subId);
                         ids.push(obj.subId);
                     });
                     });
                 }
                 }
                 if (ids.length == 0) {
                 if (ids.length == 0) {
-                    layer.msg('请选择数据',{icon: 7,time:2000});
+                    layer.msg('请选择数据', {icon: 7, time: 2000});
                     return;
                     return;
                 }
                 }
                 layer.confirm('确认要取消绑定吗?', {icon: 3}, function (index) {
                 layer.confirm('确认要取消绑定吗?', {icon: 3}, function (index) {
@@ -154,12 +155,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                 filterable: true,
                 filterable: true,
                 layVerType: 'msg',
                 layVerType: 'msg',
                 data: [
                 data: [
-                    {name: '微信',value: 'wechat'},
-                    {name: '短信',value: 'msg'},
-                    {name: '邮件',value: 'email'},
+                    {name: '微信', value: 'wechat'},
+                    {name: '短信', value: 'msg'},
+                    {name: '邮件', value: 'email'},
                 ]
                 ]
             })
             })
         }
         }
+
         //初始化订阅方式下拉框
         //初始化订阅方式下拉框
         function initSubWaySelect() {
         function initSubWaySelect() {
             subTypeSelect = xmSelect.render({
             subTypeSelect = xmSelect.render({
@@ -183,10 +185,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                 filterable: true,
                 filterable: true,
                 layVerType: 'msg',
                 layVerType: 'msg',
                 data: [
                 data: [
-                    {name: '告警订阅',value: '1'},
-                    {name: '报表订阅',value: '2'},
-                    {name: '系统通知订阅',value: '3'},
-                    {name: '采集器异常订阅',value: '4'}
+                    {name: '告警订阅', value: '1'},
+                    {name: '报表订阅', value: '2'},
+                    {name: '系统通知订阅', value: '3'},
+                    {name: '采集器异常订阅', value: '4'}
                 ]
                 ]
             })
             })
         }
         }
@@ -196,21 +198,22 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
         var alarmsubscribeTable = table.render({
         var alarmsubscribeTable = table.render({
             elem: '#alarmsubscribeTable'
             elem: '#alarmsubscribeTable'
             , url: domainName + '/api-web/alarmsubscribe/page'
             , url: domainName + '/api-web/alarmsubscribe/page'
-            , where:{
-                access_token:accessToken,
-                policyId:policyId,
+            , where: {
+                access_token: accessToken,
+                policyId: policyId,
                 subName: conditions.subName,
                 subName: conditions.subName,
                 subType: subTypeSelect.getValue("valueStr"),
                 subType: subTypeSelect.getValue("valueStr"),
                 subWay: noticeWaySelect.getValue("valueStr"),
                 subWay: noticeWaySelect.getValue("valueStr"),
                 resIdList: resIdList,
                 resIdList: resIdList,
-                busId: busId
+                busId: busId,
+                userName: userName
             }
             }
             , height: 'full-200'
             , height: 'full-200'
             , page: {
             , page: {
                 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
                 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
-                ,theme: '#1E9FFF'//自定义分页主题颜色
+                , theme: '#1E9FFF'//自定义分页主题颜色
             }
             }
-            , end: function(e){
+            , end: function (e) {
                 form.render();
                 form.render();
             }
             }
             // , limit: 20
             // , limit: 20
@@ -218,12 +221,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
             , cols: [[
             , cols: [[
                 {type: 'checkbox'}
                 {type: 'checkbox'}
                 , {
                 , {
-                    field: 'subName', title: '订阅名称', align: 'center', sort: true,minWidth:200,
+                    field: 'subName', title: '订阅名称', align: 'center', sort: true, minWidth: 200,
                     templet: '<div><span data-id="{{d.subId}}" class="layui-table-link view-alarmsubscribe-name">{{d.subName}}</span></div>'
                     templet: '<div><span data-id="{{d.subId}}" class="layui-table-link view-alarmsubscribe-name">{{d.subName}}</span></div>'
                 }
                 }
-                , {field: 'subType', title: '订阅类型', align: 'center', sort: true, width:120,
-                    templet: function (d){
-                        switch (d.subType){
+                , {
+                    field: 'subType', title: '订阅类型', align: 'center', sort: true, width: 120,
+                    templet: function (d) {
+                        switch (d.subType) {
                             case '1':
                             case '1':
                                 return '告警订阅'
                                 return '告警订阅'
                                 break;
                                 break;
@@ -237,10 +241,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                                 return '采集器异常订阅'
                                 return '采集器异常订阅'
                                 break;
                                 break;
                         }
                         }
-                    }}
-                , {field: 'subWay', title: '通知类型', align: 'center', sort: true, width:120,
-                    templet: function (d){
-                        switch (d.subWay){
+                    }
+                }
+                , {
+                    field: 'subWay', title: '通知类型', align: 'center', sort: true, width: 120,
+                    templet: function (d) {
+                        switch (d.subWay) {
                             case 'wechat':
                             case 'wechat':
                                 return '<div class="small-icon small-icon-wechat"></div>'
                                 return '<div class="small-icon small-icon-wechat"></div>'
                                 break;
                                 break;
@@ -270,11 +276,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                                 <span data-id="${d.subId}" class="layui-table-link view-alarmsubscribe-busId" lay-tips="业务系统">${d.busSubTotal}</span>
                                 <span data-id="${d.subId}" class="layui-table-link view-alarmsubscribe-busId" lay-tips="业务系统">${d.busSubTotal}</span>
                                 </div>`;
                                 </div>`;
 
 
-                    }}
-                , {field: 'tempType', title: '通知说明', align: 'left', sort: true, width:240,
-                    templet: function (d){
+                    }
+                }
+                , {
+                    field: 'tempType', title: '通知说明', align: 'left', sort: true, width: 240,
+                    templet: function (d) {
                         var sendWay = '';
                         var sendWay = '';
-                        switch (d.subWay){
+                        switch (d.subWay) {
                             case 'wechat':
                             case 'wechat':
                                 sendWay = '微信'
                                 sendWay = '微信'
                                 break;
                                 break;
@@ -285,28 +293,33 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                                 sendWay = '短信';
                                 sendWay = '短信';
                                 break;
                                 break;
                         }
                         }
-                        var unit = d.sentFrequency && d.sentFrequency.indexOf("?")>0?"":"分钟一次";
-                        return  `${sendWay}通知${d.sendTotal}次；频率${d.sentFrequency}${unit}`;
-                    }}
-                , {field: 'userTotal', title: '订阅人数', align: 'right', sort: true, width:120,
-                    templet:function (d){
-                        if(d.userTotal != '0'){
+                        var unit = d.sentFrequency && d.sentFrequency.indexOf("?") > 0 ? "" : "分钟一次";
+                        return `${sendWay}通知${d.sendTotal}次；频率${d.sentFrequency}${unit}`;
+                    }
+                }
+                , {
+                    field: 'userTotal', title: '订阅人数', align: 'right', sort: true, width: 120,
+                    templet: function (d) {
+                        if (d.userTotal != '0') {
                             return `<div><span data-id="${d.subId}" class="layui-table-link view-alarmsubscribe-users-total">${d.userTotal}</span></div>`;
                             return `<div><span data-id="${d.subId}" class="layui-table-link view-alarmsubscribe-users-total">${d.userTotal}</span></div>`;
-                        }else{
+                        } else {
                             return d.userTotal;
                             return d.userTotal;
                         }
                         }
-                    }}
-                , {field: 'times', title: '允许通知时间段', align: 'center', sort: true, width:180}
-                , {field: 'syncFlag',title: '同步状态',align: 'center', sort: true,width:120,
-                    templet: function(d){
-                        if(d.syncFlag == 0){ //未同步
+                    }
+                }
+                , {field: 'times', title: '允许通知时间段', align: 'center', sort: true, width: 180}
+                , {
+                    field: 'syncFlag', title: '同步状态', align: 'center', sort: true, width: 120,
+                    templet: function (d) {
+                        if (d.syncFlag == 0) { //未同步
                             return `<input type="checkbox" id="${d.subId}" name="close"  lay-skin="switch" lay-filter="switchSyncalarmsubscribe" lay-text="已同步|未同步">`;
                             return `<input type="checkbox" id="${d.subId}" name="close"  lay-skin="switch" lay-filter="switchSyncalarmsubscribe" lay-text="已同步|未同步">`;
-                        }else{
+                        } else {
                             return ' <button type="button" class="layui-btn layui-bg-green  layui-btn-radius layui-btn-xs p-0-15">已同步</button>';
                             return ' <button type="button" class="layui-btn layui-bg-green  layui-btn-radius layui-btn-xs p-0-15">已同步</button>';
                         }
                         }
                     }
                     }
-                 }
-                , {title: '操作', align: 'center',minWidth:200,fixed: 'right', toolbar:
+                }
+                , {
+                    title: '操作', align: 'center', minWidth: 200, fixed: 'right', toolbar:
                         '<div>' +
                         '<div>' +
                         '<button data-id="{{d.subId}}" lay-tips="删除" type="button" class="layui-btn layui-btn-xs layui-btn-normal delete-alarmsubscribe-btn"><i class="layui-icon layui-icon-delete"></i></button>' +
                         '<button data-id="{{d.subId}}" lay-tips="删除" type="button" class="layui-btn layui-btn-xs layui-btn-normal delete-alarmsubscribe-btn"><i class="layui-icon layui-icon-delete"></i></button>' +
                         '<button data-id="{{d.subId}}" lay-tips="资源订阅" type="button" class="layui-btn layui-btn-xs layui-btn-normal alarmsubscribe-resource-btn"><i class="iconfont">&#XE523;</i></button>' +
                         '<button data-id="{{d.subId}}" lay-tips="资源订阅" type="button" class="layui-btn layui-btn-xs layui-btn-normal alarmsubscribe-resource-btn"><i class="iconfont">&#XE523;</i></button>' +
@@ -317,9 +330,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                         '</div>'
                         '</div>'
                 }
                 }
             ]],
             ]],
-            done:function () {
+            done: function () {
                 //点击名称编辑
                 //点击名称编辑
-                $(".view-alarmsubscribe-name").on("click",function () {
+                $(".view-alarmsubscribe-name").on("click", function () {
                     if ($.inArray('back:alarmsubscribe:update', checkList) == -1) {
                     if ($.inArray('back:alarmsubscribe:update', checkList) == -1) {
                         layer.msg('暂无权限!', {icon: 7, time: 3000});
                         layer.msg('暂无权限!', {icon: 7, time: 3000});
                         return;
                         return;
@@ -328,16 +341,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                 });
                 });
 
 
                 //绑定对象列表
                 //绑定对象列表
-                $(".view-alarmsubscribe-target").on("click",function (){
+                $(".view-alarmsubscribe-target").on("click", function () {
                     var id = $(this).data("id");
                     var id = $(this).data("id");
                     admin.req({
                     admin.req({
-                        url:domainName + '/api-web/bSubscribeBind/bindlist/'+id
-                        ,data:{subId:id}
-                        ,done:function (res){
-                            if(res.data && res.data.length > 0){
-                                var resbind = "",kpibind="",restypebind="",bizbind = "";
-                                $.each(res.data,function (i,v){
-                                    switch (v.type){
+                        url: domainName + '/api-web/bSubscribeBind/bindlist/' + id
+                        , data: {subId: id}
+                        , done: function (res) {
+                            if (res.data && res.data.length > 0) {
+                                var resbind = "", kpibind = "", restypebind = "", bizbind = "";
+                                $.each(res.data, function (i, v) {
+                                    switch (v.type) {
                                         case "res": //资源订阅
                                         case "res": //资源订阅
                                             resbind += `<li>${v.mainName} - ${v.relationName}</li>`;
                                             resbind += `<li>${v.mainName} - ${v.relationName}</li>`;
                                             break;
                                             break;
@@ -380,16 +393,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                 });
                 });
 
 
                 //订阅人
                 //订阅人
-                $(".view-alarmsubscribe-users-total").on("click",function (){
+                $(".view-alarmsubscribe-users-total").on("click", function () {
                     var id = $(this).data("id");
                     var id = $(this).data("id");
                     admin.req({
                     admin.req({
-                        url:domainName + '/api-web/alarmsubscribe/users'
-                        ,data:{subId:id}
-                        ,done:function (res){
-                            if(res.data && res.data.length > 0){
+                        url: domainName + '/api-web/alarmsubscribe/users'
+                        , data: {subId: id}
+                        , done: function (res) {
+                            if (res.data && res.data.length > 0) {
                                 var trs = '';
                                 var trs = '';
-                                $.each(res.data,function (i,v){
-                                    trs += `<tr><td>${i+1}</td><td>${v.username}</td><td>${v.nickname}</td><td>${v.email}</td>
+                                $.each(res.data, function (i, v) {
+                                    trs += `<tr><td>${i + 1}</td><td>${v.username}</td><td>${v.nickname}</td><td>${v.email}</td>
                                     <td>${v.phone}</td><td>${v.operator}</td><td>${v.resTotal}</td><td>${v.bizTotal}</td></tr>`;
                                     <td>${v.phone}</td><td>${v.operator}</td><td>${v.resTotal}</td><td>${v.bizTotal}</td></tr>`;
                                 });
                                 });
                                 var tb = `<div class="layui-form" style="padding: 0 10px;">
                                 var tb = `<div class="layui-form" style="padding: 0 10px;">
@@ -416,49 +429,50 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                 });
                 });
 
 
                 //设置同步
                 //设置同步
-                form.on('switch(switchSyncalarmsubscribe)', function(obj){
+                form.on('switch(switchSyncalarmsubscribe)', function (obj) {
                     var alarmsubscribeId = obj.elem.id;
                     var alarmsubscribeId = obj.elem.id;
                     admin.req({
                     admin.req({
-                        url:common.domainName + '/api-web/alarmsubscribe/sync'
-                        , data:{
-                            ids:alarmsubscribeId
+                        url: common.domainName + '/api-web/alarmsubscribe/sync'
+                        , data: {
+                            ids: alarmsubscribeId
                         }
                         }
                     }).done(function (res) {
                     }).done(function (res) {
-                        if(res.success){
-                            layer.msg(res.msg, { offset: '15px' , icon: 1, time: 2000},function (){
+                        if (res.success) {
+                            layer.msg(res.msg, {offset: '15px', icon: 1, time: 2000}, function () {
                                 reloadalarmsubscribeTable();
                                 reloadalarmsubscribeTable();
                             });
                             });
-                        }else{
-                            layer.msg(res.msg, { offset: '15px' , icon: 7, time: 2000});
+                        } else {
+                            layer.msg(res.msg, {offset: '15px', icon: 7, time: 2000});
                         }
                         }
                     });
                     });
                 });
                 });
 
 
                 //删除
                 //删除
-                $(".delete-alarmsubscribe-btn").on("click",function () {
+                $(".delete-alarmsubscribe-btn").on("click", function () {
                     var id = $(this).data("id");
                     var id = $(this).data("id");
                     deletealarmsubscribe(id)
                     deletealarmsubscribe(id)
                 });
                 });
 
 
                 //查看资源订阅列表
                 //查看资源订阅列表
-                $(".view-alarmsubscribe-resource").on("click",function (){
-                    if($(this).text() == '0'){
+                $(".view-alarmsubscribe-resource").on("click", function () {
+                    if ($(this).text() == '0') {
                         layer.msg('暂无订阅资源，请先订阅！', {icon: 7, time: 3000});
                         layer.msg('暂无订阅资源，请先订阅！', {icon: 7, time: 3000});
                         return false;
                         return false;
                     }
                     }
 
 
 
 
                     var subId = $(this).data("id");
                     var subId = $(this).data("id");
-                    function getTableData(callback,selectBusId,selectResCode) {
+
+                    function getTableData(callback, selectBusId, selectResCode) {
                         layer.load(2);
                         layer.load(2);
                         var busId = '';
                         var busId = '';
                         var resTypeCode = '';
                         var resTypeCode = '';
                         var busType = xmSelect.get('#dyglResListBusType');
                         var busType = xmSelect.get('#dyglResListBusType');
                         var resType = xmSelect.get('#dyglResListResType');
                         var resType = xmSelect.get('#dyglResListResType');
-                        if(selectBusId == undefined){
+                        if (selectBusId == undefined) {
                             try {
                             try {
                                 busId = busType[0].getValue()[0].value;
                                 busId = busType[0].getValue()[0].value;
-                            }catch (e) {
+                            } catch (e) {
 
 
                             }
                             }
                         } else {
                         } else {
@@ -466,36 +480,37 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                         }
                         }
 
 
 
 
-                        if(selectResCode == undefined){
+                        if (selectResCode == undefined) {
                             try {
                             try {
                                 resTypeCode = resType[0].getValue()[0].value;
                                 resTypeCode = resType[0].getValue()[0].value;
-                            }catch (e) {
+                            } catch (e) {
 
 
                             }
                             }
                         } else {
                         } else {
-                            resTypeCode =  selectResCode;
+                            resTypeCode = selectResCode;
                         }
                         }
 
 
 
 
-
                         admin.req({
                         admin.req({
-                            url:domainName + '/api-web/alarmsubscribe/ressublsit'
-                            ,data:{
-                                subId:subId,
-                                busId:busId,
-                                resTypeCode:resTypeCode,
-                                keyword:$('#condition-resType-keyword').val()
+                            url: domainName + '/api-web/alarmsubscribe/ressublsit'
+                            , data: {
+                                subId: subId,
+                                busId: busId,
+                                resTypeCode: resTypeCode,
+                                keyword: $('#condition-resType-keyword').val()
                             }
                             }
-                            ,done:function (res){
+                            , done: function (res) {
                                 layer.closeAll('loading');
                                 layer.closeAll('loading');
                                 callback(res);
                                 callback(res);
                             }
                             }
                         });
                         });
                     }
                     }
+
                     getTableData(function (res) {
                     getTableData(function (res) {
                         var tb = reloadData(res);
                         var tb = reloadData(res);
                         open(tb);
                         open(tb);
                     });
                     });
+
                     function open(tb) {
                     function open(tb) {
 
 
                         var resTypeSelect;
                         var resTypeSelect;
@@ -506,7 +521,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                             , area: ['80%', '90%']
                             , area: ['80%', '90%']
                             , id: 'alarm_subscribe_resource_list_id' //设定一个id，防止重复弹出
                             , id: 'alarm_subscribe_resource_list_id' //设定一个id，防止重复弹出
                             , content: tb,
                             , content: tb,
-                            success:function () {
+                            success: function () {
                                 //绑定业务下拉选择数据
                                 //绑定业务下拉选择数据
                                 admin.req({
                                 admin.req({
                                     url: domainName + '/api-web/home/business/findAllBusType',
                                     url: domainName + '/api-web/home/business/findAllBusType',
@@ -520,7 +535,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                                                     parentId: item.parentId
                                                     parentId: item.parentId
                                                 }
                                                 }
                                             });
                                             });
-                                            var bizTree=common.pidToChildren(bizList, 'value', 'parentId');
+                                            var bizTree = common.pidToChildren(bizList, 'value', 'parentId');
 
 
                                             // 影响业务下拉框
                                             // 影响业务下拉框
                                             xmSelect.render({
                                             xmSelect.render({
@@ -556,10 +571,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                                                     // } else {
                                                     // } else {
                                                     //     busId = '';
                                                     //     busId = '';
                                                     // }
                                                     // }
-                                                    if(data.arr[0]){
-                                                        reloadTbody(data.arr[0].value,undefined);
+                                                    if (data.arr[0]) {
+                                                        reloadTbody(data.arr[0].value, undefined);
                                                     } else {
                                                     } else {
-                                                        reloadTbody('',undefined);
+                                                        reloadTbody('', undefined);
                                                     }
                                                     }
 
 
                                                 }
                                                 }
@@ -613,10 +628,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                                             height: 'auto',
                                             height: 'auto',
                                             data: resTypeTree,
                                             data: resTypeTree,
                                             on: function (data) {
                                             on: function (data) {
-                                                if(data.arr[0]){
-                                                    reloadTbody(undefined,data.arr[0].value);
+                                                if (data.arr[0]) {
+                                                    reloadTbody(undefined, data.arr[0].value);
                                                 } else {
                                                 } else {
-                                                    reloadTbody(undefined,'');
+                                                    reloadTbody(undefined, '');
                                                 }
                                                 }
                                             }
                                             }
                                         });
                                         });
@@ -628,28 +643,28 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                                     if (e.keyCode === 13) {
                                     if (e.keyCode === 13) {
                                         var bus = xmSelect.get('#dyglResListBusType', true);
                                         var bus = xmSelect.get('#dyglResListBusType', true);
                                         var resType = xmSelect.get('#dyglResListResType', true);
                                         var resType = xmSelect.get('#dyglResListResType', true);
-                                        reloadTbody(bus.getValue('valueStr'),resType.getValue('valueStr'));
+                                        reloadTbody(bus.getValue('valueStr'), resType.getValue('valueStr'));
                                     }
                                     }
                                 });
                                 });
                             }
                             }
                         });
                         });
 
 
                         //删除
                         //删除
-                        $("#alarm_subscribe_resource_list_id table tbody").on("click", "span.resource_sublist_del",function (){
+                        $("#alarm_subscribe_resource_list_id table tbody").on("click", "span.resource_sublist_del", function () {
                             var id = $(this).attr("id");
                             var id = $(this).attr("id");
                             admin.req({
                             admin.req({
-                                url:common.domainName+'/api-web/alarmsubscribe/delete/ressub',
-                                data:{id:id},
-                                type:"delete",
-                                done:function (res){
-                                    if(res.success){
-                                        layer.msg("删除成功",{icon:1,time:3000},function (){
+                                url: common.domainName + '/api-web/alarmsubscribe/delete/ressub',
+                                data: {id: id},
+                                type: "delete",
+                                done: function (res) {
+                                    if (res.success) {
+                                        layer.msg("删除成功", {icon: 1, time: 3000}, function () {
                                             //reloadalarmsubscribeTable();
                                             //reloadalarmsubscribeTable();
                                             reloadTbody();
                                             reloadTbody();
                                         });
                                         });
-                                        $("#"+id).parent().parent().remove();
-                                    }else{
-                                        layer.msg("删除失败，请与管理员联系",{icon:7,time:3000});
+                                        $("#" + id).parent().parent().remove();
+                                    } else {
+                                        layer.msg("删除失败，请与管理员联系", {icon: 7, time: 3000});
                                     }
                                     }
                                 }
                                 }
                             });
                             });
@@ -657,12 +672,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                     }
                     }
 
 
 
 
-                    function reloadTbody(busId,resCode) {
+                    function reloadTbody(busId, resCode) {
                         getTableData(function (res) {
                         getTableData(function (res) {
                             var trs = '';
                             var trs = '';
-                            if(res.data && res.data.length > 0){
-                                $.each(res.data,function (i,v){
-                                    trs += `<tr><td>${i+1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
+                            if (res.data && res.data.length > 0) {
+                                $.each(res.data, function (i, v) {
+                                    trs += `<tr><td>${i + 1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
                                                         <td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
                                                         <td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
                                 });
                                 });
                             }
                             }
@@ -671,14 +686,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                             $('#alarm_subscribe_resource_list_id table tbody').html(trs);
                             $('#alarm_subscribe_resource_list_id table tbody').html(trs);
 
 
 
 
-                        },busId,resCode);
+                        }, busId, resCode);
 
 
                     }
                     }
 
 
                     function reloadData(res) {
                     function reloadData(res) {
                         var trs = '';
                         var trs = '';
-                        $.each(res.data,function (i,v){
-                            trs += `<tr><td>${i+1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
+                        $.each(res.data, function (i, v) {
+                            trs += `<tr><td>${i + 1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td>
                                         <td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
                                         <td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`;
                         });
                         });
                         var tb = `
                         var tb = `
@@ -713,26 +728,34 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                 });
                 });
 
 
                 //查看指标订阅列表
                 //查看指标订阅列表
-                $(".view-alarmsubscribe-kpi").on("click",function (){
-                    if($(this).text() == '0'){
+                $(".view-alarmsubscribe-kpi").on("click", function () {
+                    if ($(this).text() == '0') {
                         layer.msg('暂无订阅指标，请先订阅！', {icon: 7, time: 3000});
                         layer.msg('暂无订阅指标，请先订阅！', {icon: 7, time: 3000});
                         return false;
                         return false;
                     }
                     }
                     var subId = $(this).data("id");
                     var subId = $(this).data("id");
                     admin.req({
                     admin.req({
-                        url:domainName + '/api-web/alarmsubscribe/kpisublsit'
-                        ,data:{subId:subId}
-                        ,done:function (res){
-                            if(res.data && res.data.length > 0){
+                        url: domainName + '/api-web/alarmsubscribe/kpisublsit'
+                        , data: {subId: subId}
+                        , done: function (res) {
+                            if (res.data && res.data.length > 0) {
                                 var trs = '';
                                 var trs = '';
-                                $.each(res.data,function (i,v){
+                                $.each(res.data, function (i, v) {
                                     var kpiIdent = '';
                                     var kpiIdent = '';
-                                    if(v.kpiIdent == '0'){ kpiIdent = "基本指标";}
-                                    if(v.kpiIdent == '1'){ kpiIdent = "性能指标";}
-                                    if(v.kpiIdent == '2'){ kpiIdent = "状态指标";}
-                                    if(v.kpiIdent == '3'){ kpiIdent = "告警指标";}
+                                    if (v.kpiIdent == '0') {
+                                        kpiIdent = "基本指标";
+                                    }
+                                    if (v.kpiIdent == '1') {
+                                        kpiIdent = "性能指标";
+                                    }
+                                    if (v.kpiIdent == '2') {
+                                        kpiIdent = "状态指标";
+                                    }
+                                    if (v.kpiIdent == '3') {
+                                        kpiIdent = "告警指标";
+                                    }
 
 
-                                    trs += `<tr><td>${i+1}</td><td>${v.resId}</td><td>${v.kpiId}</td><td>${v.kpiName}</td>
+                                    trs += `<tr><td>${i + 1}</td><td>${v.resId}</td><td>${v.kpiId}</td><td>${v.kpiName}</td>
                                         <td>${kpiIdent}</td><td><span id="${v.relId}" class="link resource_kpi_sublist_del">删除</span></td></tr>`;
                                         <td>${kpiIdent}</td><td><span id="${v.relId}" class="link resource_kpi_sublist_del">删除</span></td></tr>`;
                                 });
                                 });
                                 var tb = `<div class="layui-form" style="padding: 0 10px;">
                                 var tb = `<div class="layui-form" style="padding: 0 10px;">
@@ -753,18 +776,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                                 });
                                 });
 
 
                                 //删除
                                 //删除
-                                $("span.resource_kpi_sublist_del").on("click",function (){
+                                $("span.resource_kpi_sublist_del").on("click", function () {
                                     var id = $(this).attr("id");
                                     var id = $(this).attr("id");
                                     admin.req({
                                     admin.req({
-                                        url:common.domainName+'/api-web/alarmsubscribe/delete/kpisub',
-                                        data:{id:id},
-                                        type:"delete",
-                                        done:function (res){
-                                            if(res.success){
-                                                layer.msg("删除成功",{icon:1,time:3000},function (){
+                                        url: common.domainName + '/api-web/alarmsubscribe/delete/kpisub',
+                                        data: {id: id},
+                                        type: "delete",
+                                        done: function (res) {
+                                            if (res.success) {
+                                                layer.msg("删除成功", {icon: 1, time: 3000}, function () {
                                                     reloadalarmsubscribeTable();
                                                     reloadalarmsubscribeTable();
                                                 });
                                                 });
-                                                $("#"+id).parent().parent().remove();
+                                                $("#" + id).parent().parent().remove();
                                             } else {
                                             } else {
                                                 layer.msg("删除失败，请与管理员联系", {icon: 7, time: 3000});
                                                 layer.msg("删除失败，请与管理员联系", {icon: 7, time: 3000});
                                             }
                                             }
@@ -778,7 +801,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
 
 
                 //查看资源类型订阅列表
                 //查看资源类型订阅列表
                 $(".view-alarmsubscribe-resType").on("click", function () {
                 $(".view-alarmsubscribe-resType").on("click", function () {
-                    if($(this).text() == '0'){
+                    if ($(this).text() == '0') {
                         layer.msg('暂无订阅资源类型，请先订阅！', {icon: 7, time: 3000});
                         layer.msg('暂无订阅资源类型，请先订阅！', {icon: 7, time: 3000});
                         return false;
                         return false;
                     }
                     }
@@ -794,7 +817,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
 
 
                 //查看业务类型订阅列表
                 //查看业务类型订阅列表
                 $(".view-alarmsubscribe-busId").on("click", function () {
                 $(".view-alarmsubscribe-busId").on("click", function () {
-                    if($(this).text() == '0'){
+                    if ($(this).text() == '0') {
                         layer.msg('暂无订阅业务系统，请先订阅！', {icon: 7, time: 3000});
                         layer.msg('暂无订阅业务系统，请先订阅！', {icon: 7, time: 3000});
                         return false;
                         return false;
                     }
                     }
@@ -819,30 +842,30 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                     oldData = $.map(oldData, function (item) {
                     oldData = $.map(oldData, function (item) {
                         return item.resId;
                         return item.resId;
                     })
                     })
-                    common.openWin("template/res/reslist","选择资源",{oldData:oldData},["选择"], function () {
+                    common.openWin("template/res/reslist", "选择资源", {oldData: oldData}, ["选择"], function () {
                         var data = table.checkStatus('reslist_resListTable').data;
                         var data = table.checkStatus('reslist_resListTable').data;
-                        if(data.length == 0){
-                            layer.msg("请至少选择一条数据！",{icon:7,time:3000});
+                        if (data.length == 0) {
+                            layer.msg("请至少选择一条数据！", {icon: 7, time: 3000});
                             return false;
                             return false;
                         }
                         }
                         var resIds = [];
                         var resIds = [];
-                        $.each(data,function (i,v){
+                        $.each(data, function (i, v) {
                             resIds.push(v.resId);
                             resIds.push(v.resId);
                         })
                         })
 
 
                         admin.req({
                         admin.req({
-                            url:common.domainName+'/api-web/manage/resource/resourceSub?resIds='+resIds.toString()+'&subId='+subId,
-                            done:function (res){
-                                if(res.success){
+                            url: common.domainName + '/api-web/manage/resource/resourceSub?resIds=' + resIds.toString() + '&subId=' + subId,
+                            done: function (res) {
+                                if (res.success) {
                                     layer.msg('资源订阅成功', {
                                     layer.msg('资源订阅成功', {
                                         offset: '15px'
                                         offset: '15px'
                                         , icon: 1
                                         , icon: 1
                                         , time: 2000
                                         , time: 2000
-                                    },function () {
+                                    }, function () {
                                         reloadalarmsubscribeTable();
                                         reloadalarmsubscribeTable();
                                         layer.closeAll();
                                         layer.closeAll();
                                     });
                                     });
-                                }else{
+                                } else {
                                     layer.msg('资源订阅失败，请稍后重试', {
                                     layer.msg('资源订阅失败，请稍后重试', {
                                         offset: '15px'
                                         offset: '15px'
                                         , icon: 7
                                         , icon: 7
@@ -856,64 +879,64 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                 });
                 });
 
 
                 //指标订阅
                 //指标订阅
-                $(".alarmsubscribe-kpi-btn").on("click",function (){
+                $(".alarmsubscribe-kpi-btn").on("click", function () {
                     if ($.inArray('back:alarmsubscribe:target', checkList) == -1) {
                     if ($.inArray('back:alarmsubscribe:target', checkList) == -1) {
                         layer.msg('暂无权限!', {icon: 7, time: 3000});
                         layer.msg('暂无权限!', {icon: 7, time: 3000});
                         return;
                         return;
                     }
                     }
                     var subId = $(this).data("id");
                     var subId = $(this).data("id");
-                    var oldData = getResOrKpiBySubId(subId,'kpi');
-                    var oldKpiData = Array.from(new Set($.map(oldData,function (item) {
+                    var oldData = getResOrKpiBySubId(subId, 'kpi');
+                    var oldKpiData = Array.from(new Set($.map(oldData, function (item) {
                         return item.kpiId;
                         return item.kpiId;
                     })))
                     })))
 
 
-                    common.openWin("baseconfig/kpi/index","选择指标",{oldData:oldKpiData},["选择"], function () {
+                    common.openWin("baseconfig/kpi/index", "选择指标", {oldData: oldKpiData}, ["选择"], function () {
                         var kpilist = table.checkStatus('kpi_table').data;
                         var kpilist = table.checkStatus('kpi_table').data;
-                        if(kpilist.length == 0){
-                            layer.msg("请至少选择一个指标数据！",{icon:7,time:3000});
+                        if (kpilist.length == 0) {
+                            layer.msg("请至少选择一个指标数据！", {icon: 7, time: 3000});
                             return false;
                             return false;
                         }
                         }
                         var kpiIds = [];
                         var kpiIds = [];
-                        $.each(kpilist,function (i,v){
+                        $.each(kpilist, function (i, v) {
                             kpiIds.push(v.kpiId);
                             kpiIds.push(v.kpiId);
                         });
                         });
-                        var oldResData = Array.from(new Set($.map(oldData,function (item) {
+                        var oldResData = Array.from(new Set($.map(oldData, function (item) {
                             return item.resId;
                             return item.resId;
                         })))
                         })))
 
 
-                        common.openWin("template/res/reslist","选择资源",{oldData:oldResData},["选择"], function () {
+                        common.openWin("template/res/reslist", "选择资源", {oldData: oldResData}, ["选择"], function () {
                             var reslist = table.checkStatus('reslist_resListTable').data;
                             var reslist = table.checkStatus('reslist_resListTable').data;
-                            if(reslist.length == 0){
-                                layer.msg("请至少选择一个资源！",{icon:7,time:3000});
+                            if (reslist.length == 0) {
+                                layer.msg("请至少选择一个资源！", {icon: 7, time: 3000});
                                 return false;
                                 return false;
                             }
                             }
                             var resIds = [];
                             var resIds = [];
-                            $.each(reslist,function (i,v){
+                            $.each(reslist, function (i, v) {
                                 resIds.push(v.resId);
                                 resIds.push(v.resId);
                             });
                             });
 
 
                             var kpisubLoading = layer.load(2);
                             var kpisubLoading = layer.load(2);
                             admin.req({
                             admin.req({
-                                url:common.domainName+'/api-web/alarmsubscribe/kpisub',
-                                type:'post',
-                                data:{
-                                    resIds:resIds.toString(),
-                                    kpiIds:kpiIds.toString(),
-                                    subId:subId,
-                                    access_token:accessToken
+                                url: common.domainName + '/api-web/alarmsubscribe/kpisub',
+                                type: 'post',
+                                data: {
+                                    resIds: resIds.toString(),
+                                    kpiIds: kpiIds.toString(),
+                                    subId: subId,
+                                    access_token: accessToken
                                 },
                                 },
-                                done:function (res){
-                                    if(res.success){
+                                done: function (res) {
+                                    if (res.success) {
                                         layer.close(kpisubLoading);
                                         layer.close(kpisubLoading);
                                         layer.msg('指标订阅成功', {
                                         layer.msg('指标订阅成功', {
                                             offset: '15px'
                                             offset: '15px'
                                             , icon: 1
                                             , icon: 1
                                             , time: 2000
                                             , time: 2000
-                                        },function () {
+                                        }, function () {
                                             reloadalarmsubscribeTable();
                                             reloadalarmsubscribeTable();
                                             layer.closeAll();
                                             layer.closeAll();
                                         });
                                         });
-                                    }else{
+                                    } else {
                                         layer.msg('指标订阅失败，请稍后重试！', {
                                         layer.msg('指标订阅失败，请稍后重试！', {
                                             offset: '15px'
                                             offset: '15px'
                                             , icon: 7
                                             , icon: 7
@@ -938,11 +961,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                         {
                         {
                             //"resTypes": list,"showType":0
                             //"resTypes": list,"showType":0
                         }, ["选择"], function () {
                         }, ["选择"], function () {
-                        //找到选择的资源类型 并且订阅
-                        var resourcetype = layui.resourcetype({"resTypes": list});
-                        var data = resourcetype.getResTypeChecks();
-                        insertResTypeOrBusId(data, 0, subId);
-                    });
+                            //找到选择的资源类型 并且订阅
+                            var resourcetype = layui.resourcetype({"resTypes": list});
+                            var data = resourcetype.getResTypeChecks();
+                            insertResTypeOrBusId(data, 0, subId);
+                        });
                 });
                 });
 
 
                 //业务类型订阅
                 //业务类型订阅
@@ -954,15 +977,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                         {
                         {
                             //busIds: list
                             //busIds: list
                         }, ["选择"], function () {
                         }, ["选择"], function () {
-                        //找到选择的所有业务 并且订阅
-                        var bustype = layui.bustype({"busIds": list});
-                        var data = bustype.getData();
-                        insertResTypeOrBusId(data, 1, subId);
-                    });
+                            //找到选择的所有业务 并且订阅
+                            var bustype = layui.bustype({"busIds": list});
+                            var data = bustype.getData();
+                            insertResTypeOrBusId(data, 1, subId);
+                        });
                 });
                 });
 
 
                 // 排除订阅指标
                 // 排除订阅指标
-                $(".alarmsubscribe-exclude-kpi").on("click",function () {
+                $(".alarmsubscribe-exclude-kpi").on("click", function () {
                     var subId = $(this).data("id");
                     var subId = $(this).data("id");
                     var title = `<a class="layui-icon layui-icon-templeate-1"></a>告警订阅排除订阅指标`;
                     var title = `<a class="layui-icon layui-icon-templeate-1"></a>告警订阅排除订阅指标`;
                     layer.open({
                     layer.open({
@@ -1057,7 +1080,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                     subType: subTypeSelect.getValue('valueStr'),
                     subType: subTypeSelect.getValue('valueStr'),
                     subWay: noticeWaySelect.getValue("valueStr"),
                     subWay: noticeWaySelect.getValue("valueStr"),
                     resIdList: resIdList,
                     resIdList: resIdList,
-                    busId: busId
+                    busId: busId,
+                    userName: userName
                 }
                 }
             });
             });
         }
         }
@@ -1071,13 +1095,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
             if (typeof (id) != "string") {
             if (typeof (id) != "string") {
                 var ids = [];
                 var ids = [];
                 var data = table.checkStatus('alarmsubscribeTable').data;
                 var data = table.checkStatus('alarmsubscribeTable').data;
-                if(data && data.length > 0){
-                    $.each(data,function (i,obj) {
+                if (data && data.length > 0) {
+                    $.each(data, function (i, obj) {
                         ids.push(obj.subId);
                         ids.push(obj.subId);
                     });
                     });
                 }
                 }
                 if (ids.length == 0) {
                 if (ids.length == 0) {
-                    layer.msg('请选择要删除的数据',{icon: 7,time:2000});
+                    layer.msg('请选择要删除的数据', {icon: 7, time: 2000});
                     return;
                     return;
                 }
                 }
                 id = ids.toString();
                 id = ids.toString();
@@ -1088,8 +1112,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
             }, function () {
             }, function () {
                 admin.req({
                 admin.req({
                     url: common.domainName + '/api-web/alarmsubscribe/delete'
                     url: common.domainName + '/api-web/alarmsubscribe/delete'
-                    ,type:"delete"
-                    ,data:{ids:id}
+                    , type: "delete"
+                    , data: {ids: id}
                 }).done(function (res) {
                 }).done(function (res) {
                     layer.msg('删除成功', {
                     layer.msg('删除成功', {
                         offset: '15px'
                         offset: '15px'
@@ -1117,7 +1141,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                             parentId: item.parentId
                             parentId: item.parentId
                         }
                         }
                     });
                     });
-                    var bizTree=common.pidToChildren(bizList, 'value', 'parentId');
+                    var bizTree = common.pidToChildren(bizList, 'value', 'parentId');
 
 
                     // 影响业务下拉框
                     // 影响业务下拉框
                     xmSelect.render({
                     xmSelect.render({
@@ -1159,11 +1183,55 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                 }
                 }
             }
             }
         });
         });
+        //用户
+        $.ajax({
+            url: domainName + '/api-user/users/getAll',
+            data: {
+                access_token: accessToken
+            },
+            success: function (response) {
+                if (response) {
+                    var busTypeList = response;
+                    var bizList = response.map(item => {
+                        return {
+                            name: item.nickname,
+                            value: item.username,
+                            parentId: item.parentId
+                        }
+                    });
+                    var bizTree=common.pidToChildren(bizList, 'value', 'parentId');
+
+                    // 影响业务下拉框
+                    xmSelect.render({
+                        el: '#alarmsubscribe_user',
+                        name: 'bizId',
+                        tips: '=订阅用户=',
+                        toolbar: {
+                            show: true,
+                            list: ['ALL', 'CLEAR']
+                        },
+                        filterable: true,
+                        layVerType: 'msg',
+                        data: bizTree,
+                        on: function (data) {
+                            if (data.arr.length > 0) {
+                                userName = data.arr.map(t=>t.value).join(',');
+                            } else {
+                                userName = '';
+                            }
+                            reloadalarmsubscribeTable();
+                        }
+                    });
+                } else {
+                    layer.msg('获取用户失败', {icon: 2});
+                }
+            }
+        });
         //获取选中的数据
         //获取选中的数据
         function getCheckSubscribeData() {
         function getCheckSubscribeData() {
             return table.checkStatus('alarmsubscTable').data;
             return table.checkStatus('alarmsubscTable').data;
         }
         }
 
 
-        return { getSubscribeData: getCheckSubscribeData,reloadsubscribe:reloadalarmsubscribeTable};
+        return {getSubscribeData: getCheckSubscribeData, reloadsubscribe: reloadalarmsubscribeTable};
     });
     });
 });
 });