Showing
34 changed files
with
1419 additions
and
1072 deletions
Too many changes to show.
To preserve performance only 34 of 34+ files are displayed.
1 | # **说明** | 1 | # **说明** |
2 | + | ||
2 | - hg-monitor-web-base 基于天津现有功能作为基类 | 3 | - hg-monitor-web-base 基于天津现有功能作为基类 |
3 | - hg-monitor-web-tj 天津21年10月后的个性化开发 | 4 | - hg-monitor-web-tj 天津21年10月后的个性化开发 |
4 | - hg-monitor-web-zj 杭州功能开发 | 5 | - hg-monitor-web-zj 杭州功能开发 |
5 | 6 | ||
6 | - | ||
7 | # **基础功能优化** | 7 | # **基础功能优化** |
8 | + | ||
8 | - 如果影响多个现场,则直接修改base工程下对应的接口和页面 | 9 | - 如果影响多个现场,则直接修改base工程下对应的接口和页面 |
9 | - 各个地方的个性化优化,则使用文件覆盖的方式修改代码(在对应工程目录下创建相同的目录结构) | 10 | - 各个地方的个性化优化,则使用文件覆盖的方式修改代码(在对应工程目录下创建相同的目录结构) |
10 | 11 | ||
11 | # **功能升级** | 12 | # **功能升级** |
13 | + | ||
12 | - 某一个现场的功能需要在各个现场都升级的,则将代码复制到base中 | 14 | - 某一个现场的功能需要在各个现场都升级的,则将代码复制到base中 |
13 | - 如果升级某一个现场的版本,则将文件复制过去即可 | 15 | - 如果升级某一个现场的版本,则将文件复制过去即可 |
1 | -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'); | 1 | +INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, |
2 | + `createTime`) | ||
3 | +VALUES ('3a83b4dafeff44fe85e32ae824146b91', 'topoBindKpiIds', '拓扑绑定指标', '拓扑绑定指标', 1, '0', '2021-11-18 14:55:53'); | ||
2 | 4 | ||
3 | -INSERT INTO sys_ddic (ddicId, ddicCode,ddicName,ddicDesc,ddicSort,ddicCategory,createTime ) | ||
4 | -select UUID(),kpiId,kpiName,kpiType, 0 as ddicSort,'topoBindKpiIds' as ddicCategory,NOW() as createTime from b_kpi where kpiIdent = 1 or isWarning = 1 | 5 | +INSERT INTO sys_ddic (ddicId, ddicCode, ddicName, ddicDesc, ddicSort, ddicCategory, createTime) |
6 | +select UUID(), kpiId, kpiName, kpiType, 0 as ddicSort, 'topoBindKpiIds' as ddicCategory, NOW() as createTime | ||
7 | +from b_kpi | ||
8 | +where kpiIdent = 1 | ||
9 | + or isWarning = 1 |
@@ -9,6 +9,10 @@ ALTER TABLE `inspection-report`.`b_insepectionreport_type` | @@ -9,6 +9,10 @@ ALTER TABLE `inspection-report`.`b_insepectionreport_type` | ||
9 | ADD COLUMN `status` int(1) DEFAULT '0' COMMENT '删除状态 0 正常,1删除,默认0'; | 9 | ADD COLUMN `status` int(1) DEFAULT '0' COMMENT '删除状态 0 正常,1删除,默认0'; |
10 | 10 | ||
11 | -- 授权所有type | 11 | -- 授权所有type |
12 | -INSERT INTO b_inspection_document_auth ( id, docId, userName, roleId ) SELECT UUID( ), id, 'admin' AS userName, '' AS roleId FROM b_insepectionreport_type; | ||
13 | -INSERT INTO b_inspection_document_auth ( id, docId, userName, roleId ) SELECT UUID( ), id, 'admin' AS userName, '' AS roleId FROM b_insepectionreport_document; | 12 | +INSERT INTO b_inspection_document_auth (id, docId, userName, roleId) |
13 | +SELECT UUID(), id, 'admin' AS userName, '' AS roleId | ||
14 | +FROM b_insepectionreport_type; | ||
15 | +INSERT INTO b_inspection_document_auth (id, docId, userName, roleId) | ||
16 | +SELECT UUID(), id, 'admin' AS userName, '' AS roleId | ||
17 | +FROM b_insepectionreport_document; | ||
14 | 18 |
@@ -15,13 +15,15 @@ | @@ -15,13 +15,15 @@ | ||
15 | */ | 15 | */ |
16 | 16 | ||
17 | SET NAMES utf8mb4; | 17 | SET NAMES utf8mb4; |
18 | -SET FOREIGN_KEY_CHECKS = 0; | 18 | +SET |
19 | +FOREIGN_KEY_CHECKS = 0; | ||
19 | 20 | ||
20 | -- ---------------------------- | 21 | -- ---------------------------- |
21 | -- Table structure for b_res_list_tree_v32 | 22 | -- Table structure for b_res_list_tree_v32 |
22 | -- ---------------------------- | 23 | -- ---------------------------- |
23 | DROP TABLE IF EXISTS `b_res_list_tree_v32`; | 24 | DROP TABLE IF EXISTS `b_res_list_tree_v32`; |
24 | -CREATE TABLE `b_res_list_tree_v32` ( | 25 | +CREATE TABLE `b_res_list_tree_v32` |
26 | +( | ||
25 | `id` int(0) NOT NULL AUTO_INCREMENT COMMENT '资源类型id', | 27 | `id` int(0) NOT NULL AUTO_INCREMENT COMMENT '资源类型id', |
26 | `parentId` int(0) NULL DEFAULT NULL COMMENT '父资源类型', | 28 | `parentId` int(0) NULL DEFAULT NULL COMMENT '父资源类型', |
27 | `resType` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '资源类型CODE', | 29 | `resType` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '资源类型CODE', |
@@ -48,53 +50,150 @@ CREATE TABLE `b_res_list_tree_v32` ( | @@ -48,53 +50,150 @@ CREATE TABLE `b_res_list_tree_v32` ( | ||
48 | -- ---------------------------- | 50 | -- ---------------------------- |
49 | -- Records of b_res_list_tree_v32 | 51 | -- Records of b_res_list_tree_v32 |
50 | -- ---------------------------- | 52 | -- ---------------------------- |
51 | -INSERT INTO `b_res_list_tree_v32` VALUES (11100, 0, 'HOST_MINICOMPUTER', '整机', '计算存储', '', 11100, '', '', '', '', '', '', '', '', '', '', 'v_resource_minipc', '2021-10-14 11:28:32'); | ||
52 | -INSERT INTO `b_res_list_tree_v32` VALUES (11102, 0, 'HOST_MINICOMPUTER_PARTITION', '分区', '计算存储', '', 11102, '', '', '', '', '', '', '', '', '', '', 'v_resource_minipc_part', '2021-10-14 11:28:32'); | ||
53 | -INSERT INTO `b_res_list_tree_v32` VALUES (11200, 0, 'HOST_X86SERVER', 'PC服务器', '计算存储', '', 11200, '', '', '', '', '', '', '', '', '', '', 'v_resource_pc', '2021-10-14 11:28:32'); | ||
54 | -INSERT INTO `b_res_list_tree_v32` VALUES (11300, 0, 'HOST_ONECOMPUTER', '一体机', '计算存储', '', 11300, '', '', '', '', '', '', '', '', '', '', 'v_resource_pc', '2021-10-14 11:28:32'); | ||
55 | -INSERT INTO `b_res_list_tree_v32` VALUES (12100, 0, 'VIRTUALIZATION_VMWARE', 'VMWARE', '计算存储', '', 12100, '', NULL, '', '', '', '', '', '', '', '', 'v_resource_vmware', '2021-10-14 11:28:32'); | ||
56 | -INSERT INTO `b_res_list_tree_v32` VALUES (12110, 12100, 'VIRTUALIZATION_VMWARE_CLUSTER', 'vm资源池', '计算存储', '', 12110, '', '', '', '', '', '', '', '', '', '', 'v_resource_vmware', '2021-10-14 11:28:32'); | ||
57 | -INSERT INTO `b_res_list_tree_v32` VALUES (12120, 12100, 'VIRTUALIZATION_VMWARE_PHYSICSHOST', 'vm宿主机', '计算存储', '', 12120, '', '', '', '', '', '', '', '', '', '', 'v_resource_vmware', '2021-10-14 11:28:32'); | ||
58 | -INSERT INTO `b_res_list_tree_v32` VALUES (12130, 12100, 'VIRTUALIZATION_VMWARE_VHOST', 'vm虚拟机', '计算存储', '', 12130, '', '', '', '', '', '', '', '', '', '', 'v_resource_vmware', '2021-10-14 11:28:32'); | ||
59 | -INSERT INTO `b_res_list_tree_v32` VALUES (12900, 12100, 'VIRTUALIZATION_VHOST', '虚拟机', '计算存储', '', 12900, '', '', '', '', '', '', '', '', '', '', 'v_resource_vmware', '2021-10-14 11:28:32'); | ||
60 | -INSERT INTO `b_res_list_tree_v32` VALUES (13000, 0, 'HUAWEI_CLOUD_PLAT', '华为云', '计算存储', '', 13000, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
61 | -INSERT INTO `b_res_list_tree_v32` VALUES (13100, 13000, 'HUAWEI_CLOUD_COLONY', '资源池', '计算存储', '', 13100, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
62 | -INSERT INTO `b_res_list_tree_v32` VALUES (13101, 13000, 'HUAWEI_CLOUD_STORAGE', '存储', '计算存储', '', 13101, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
63 | -INSERT INTO `b_res_list_tree_v32` VALUES (13102, 13000, 'HUAWEI_CLOUD_SWITCHBOARD', '交换机', '计算存储', '', 13102, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
64 | -INSERT INTO `b_res_list_tree_v32` VALUES (13103, 13000, 'HUAWEI_CLOUD_FIREWALL', '防火墙', '计算存储', '', 13103, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
65 | -INSERT INTO `b_res_list_tree_v32` VALUES (13110, 13000, 'HUAWEI_CLOUD_CLUSTER', '集群', '计算存储', '', 13110, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
66 | -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'); | ||
67 | -INSERT INTO `b_res_list_tree_v32` VALUES (13112, 13000, 'HUAWEI_CLOUD_VIRTUALHOST', '虚拟机', '计算存储', '', 13112, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
68 | -INSERT INTO `b_res_list_tree_v32` VALUES (14000, 0, 'ALI_CLOUD_PLAT', '阿里云', '计算存储', '', 14000, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_ali', '2021-10-14 11:28:32'); | ||
69 | -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'); | ||
70 | -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'); | ||
71 | -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'); | ||
72 | -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'); | ||
73 | -INSERT INTO `b_res_list_tree_v32` VALUES (15000, 0, 'STORAGE', '存储设备', '计算存储', '', 15000, '', '', '', '', '', '', '', '', '', '', 'v_resource_storage', '2021-10-14 11:28:32'); | ||
74 | -INSERT INTO `b_res_list_tree_v32` VALUES (15100, 15000, 'STORAGE_SHARE', '共享存储', '计算存储', '', 15100, '', '', '', '', '', '', '', '', '', '', 'v_resource_storage', '2021-10-14 11:28:32'); | ||
75 | -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'); | ||
76 | -INSERT INTO `b_res_list_tree_v32` VALUES (15300, 15000, 'STORAGE_TAPELIBRARY', '物理带库', '计算存储', '', 15300, '', '', '', '', '', '', '', '', '', '', 'v_resource_storage', '2021-10-14 11:28:32'); | ||
77 | -INSERT INTO `b_res_list_tree_v32` VALUES (15400, 15000, 'STORAGE_VTAPELIBRARY', '虚拟带库', '计算存储', '', 15400, '', '', '', '', '', '', '', '', '', '', 'v_resource_storage', '2021-10-14 11:28:32'); | ||
78 | -INSERT INTO `b_res_list_tree_v32` VALUES (16000, 0, 'DATABASE', '数据库', '系统软件', '', 20001, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32'); | ||
79 | -INSERT INTO `b_res_list_tree_v32` VALUES (16100, 16000, 'DATABASE_ORACLE', 'oracle', '系统软件', '', 16100, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32'); | ||
80 | -INSERT INTO `b_res_list_tree_v32` VALUES (16101, 16000, 'DATABASE_RAC', 'oracle集群', '系统软件', '', 16101, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32'); | ||
81 | -INSERT INTO `b_res_list_tree_v32` VALUES (16200, 16000, 'DATABASE_OGG', 'ogg', '系统软件', '', 16200, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32'); | ||
82 | -INSERT INTO `b_res_list_tree_v32` VALUES (16300, 16000, 'DATABASE_MYSQL', 'mysql', '系统软件', '', 16300, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32'); | ||
83 | -INSERT INTO `b_res_list_tree_v32` VALUES (16400, 16000, 'DATABASE_REDIS', 'redis', '系统软件', '', 16400, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32'); | ||
84 | -INSERT INTO `b_res_list_tree_v32` VALUES (16500, 16000, 'DATABASE_ELASTICSEARCH', 'elasticsearch', '系统软件', '', 16500, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32'); | ||
85 | -INSERT INTO `b_res_list_tree_v32` VALUES (16600, 16000, 'DATABASE_MONGODB', 'mongodb', '系统软件', '', 16600, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32'); | ||
86 | -INSERT INTO `b_res_list_tree_v32` VALUES (17000, 0, 'MIDDLEWARE', '中间件', '系统软件', '', 20002, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
87 | -INSERT INTO `b_res_list_tree_v32` VALUES (17100, 17000, 'MIDDLEWARE_WEBLOGIC', 'weblogic', '系统软件', '', 17100, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
88 | -INSERT INTO `b_res_list_tree_v32` VALUES (17200, 17000, 'MIDDLEWARE_KAFKA', 'kafka', '系统软件', '', 17200, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
89 | -INSERT INTO `b_res_list_tree_v32` VALUES (17300, 17000, 'MIDDLEWARE_NGINX', 'nginx', '系统软件', '', 17300, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
90 | -INSERT INTO `b_res_list_tree_v32` VALUES (17400, 17000, 'MIDDLEWARE_ZOOKEEPER', 'zookeeper', '系统软件', '', 17400, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
91 | -INSERT INTO `b_res_list_tree_v32` VALUES (17500, 17000, 'MIDDLEWARE_TOMCAT', 'tomcat', '系统软件', '', 17500, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
92 | -INSERT INTO `b_res_list_tree_v32` VALUES (17600, 17000, 'MIDDLEWARE_MQ', 'MQ', '系统软件', '', 17600, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
93 | -INSERT INTO `b_res_list_tree_v32` VALUES (18000, 0, 'NETHARDWARE', '计算机网络设备', '网络系统', '', 18000, '', '', '', '', '', '', '', '', '', '', 'v_resource_nethardware', '2021-10-14 11:28:32'); | ||
94 | -INSERT INTO `b_res_list_tree_v32` VALUES (18100, 18000, 'NETHARDWARE_ROUTER', '路由器', '网络系统', '', 18100, '', '', '', '', '', '', '', '', '', '', 'v_resource_nethardware', '2021-10-14 11:28:32'); | ||
95 | -INSERT INTO `b_res_list_tree_v32` VALUES (18200, 18000, 'NETHARDWARE_SWITCHBOARD', '交换机', '网络系统', '', 18200, '', '', '', '', '', '', '', '', '', '', 'v_resource_nethardware', '2021-10-14 11:28:32'); | ||
96 | -INSERT INTO `b_res_list_tree_v32` VALUES (18300, 18000, 'NETHARDWARE_LOADBALANCING', '负载均衡', '网络系统', '', 18300, '', '', '', '', '', '', '', '', '', '', 'v_resource_nethardware', '2021-10-14 11:28:32'); | ||
97 | -INSERT INTO `b_res_list_tree_v32` VALUES (19000, 0, 'NETSAFE', '安全设备', '安全设备', '', 19000, '', '', '', '', '', '', '', '', '', '', 'v_resource_netsafe', '2021-10-14 11:28:32'); | ||
98 | -INSERT INTO `b_res_list_tree_v32` VALUES (19100, 19000, 'NETSAFE_FIREWALL', '防火墙', '安全设备', '', 19100, '', '', '', '', '', '', '', '', '', '', 'v_resource_netsafe', '2021-10-14 11:28:32'); | 53 | +INSERT INTO `b_res_list_tree_v32` |
54 | +VALUES (11100, 0, 'HOST_MINICOMPUTER', '整机', '计算存储', '', 11100, '', '', '', '', '', '', '', '', '', '', | ||
55 | + 'v_resource_minipc', '2021-10-14 11:28:32'); | ||
56 | +INSERT INTO `b_res_list_tree_v32` | ||
57 | +VALUES (11102, 0, 'HOST_MINICOMPUTER_PARTITION', '分区', '计算存储', '', 11102, '', '', '', '', '', '', '', '', '', '', | ||
58 | + 'v_resource_minipc_part', '2021-10-14 11:28:32'); | ||
59 | +INSERT INTO `b_res_list_tree_v32` | ||
60 | +VALUES (11200, 0, 'HOST_X86SERVER', 'PC服务器', '计算存储', '', 11200, '', '', '', '', '', '', '', '', '', '', 'v_resource_pc', | ||
61 | + '2021-10-14 11:28:32'); | ||
62 | +INSERT INTO `b_res_list_tree_v32` | ||
63 | +VALUES (11300, 0, 'HOST_ONECOMPUTER', '一体机', '计算存储', '', 11300, '', '', '', '', '', '', '', '', '', '', 'v_resource_pc', | ||
64 | + '2021-10-14 11:28:32'); | ||
65 | +INSERT INTO `b_res_list_tree_v32` | ||
66 | +VALUES (12100, 0, 'VIRTUALIZATION_VMWARE', 'VMWARE', '计算存储', '', 12100, '', NULL, '', '', '', '', '', '', '', '', | ||
67 | + 'v_resource_vmware', '2021-10-14 11:28:32'); | ||
68 | +INSERT INTO `b_res_list_tree_v32` | ||
69 | +VALUES (12110, 12100, 'VIRTUALIZATION_VMWARE_CLUSTER', 'vm资源池', '计算存储', '', 12110, '', '', '', '', '', '', '', '', '', | ||
70 | + '', 'v_resource_vmware', '2021-10-14 11:28:32'); | ||
71 | +INSERT INTO `b_res_list_tree_v32` | ||
72 | +VALUES (12120, 12100, 'VIRTUALIZATION_VMWARE_PHYSICSHOST', 'vm宿主机', '计算存储', '', 12120, '', '', '', '', '', '', '', '', | ||
73 | + '', '', 'v_resource_vmware', '2021-10-14 11:28:32'); | ||
74 | +INSERT INTO `b_res_list_tree_v32` | ||
75 | +VALUES (12130, 12100, 'VIRTUALIZATION_VMWARE_VHOST', 'vm虚拟机', '计算存储', '', 12130, '', '', '', '', '', '', '', '', '', '', | ||
76 | + 'v_resource_vmware', '2021-10-14 11:28:32'); | ||
77 | +INSERT INTO `b_res_list_tree_v32` | ||
78 | +VALUES (12900, 12100, 'VIRTUALIZATION_VHOST', '虚拟机', '计算存储', '', 12900, '', '', '', '', '', '', '', '', '', '', | ||
79 | + 'v_resource_vmware', '2021-10-14 11:28:32'); | ||
80 | +INSERT INTO `b_res_list_tree_v32` | ||
81 | +VALUES (13000, 0, 'HUAWEI_CLOUD_PLAT', '华为云', '计算存储', '', 13000, '', '', '', '', '', '', '', '', '', '', | ||
82 | + 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
83 | +INSERT INTO `b_res_list_tree_v32` | ||
84 | +VALUES (13100, 13000, 'HUAWEI_CLOUD_COLONY', '资源池', '计算存储', '', 13100, '', '', '', '', '', '', '', '', '', '', | ||
85 | + 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
86 | +INSERT INTO `b_res_list_tree_v32` | ||
87 | +VALUES (13101, 13000, 'HUAWEI_CLOUD_STORAGE', '存储', '计算存储', '', 13101, '', '', '', '', '', '', '', '', '', '', | ||
88 | + 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
89 | +INSERT INTO `b_res_list_tree_v32` | ||
90 | +VALUES (13102, 13000, 'HUAWEI_CLOUD_SWITCHBOARD', '交换机', '计算存储', '', 13102, '', '', '', '', '', '', '', '', '', '', | ||
91 | + 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
92 | +INSERT INTO `b_res_list_tree_v32` | ||
93 | +VALUES (13103, 13000, 'HUAWEI_CLOUD_FIREWALL', '防火墙', '计算存储', '', 13103, '', '', '', '', '', '', '', '', '', '', | ||
94 | + 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
95 | +INSERT INTO `b_res_list_tree_v32` | ||
96 | +VALUES (13110, 13000, 'HUAWEI_CLOUD_CLUSTER', '集群', '计算存储', '', 13110, '', '', '', '', '', '', '', '', '', '', | ||
97 | + 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
98 | +INSERT INTO `b_res_list_tree_v32` | ||
99 | +VALUES (13111, 13000, 'HUAWEI_CLOUD_CLUSTER_OST', '物理机', '计算存储', '', 13111, '', '', '', '', '', '', '', '', '', '', | ||
100 | + 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
101 | +INSERT INTO `b_res_list_tree_v32` | ||
102 | +VALUES (13112, 13000, 'HUAWEI_CLOUD_VIRTUALHOST', '虚拟机', '计算存储', '', 13112, '', '', '', '', '', '', '', '', '', '', | ||
103 | + 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
104 | +INSERT INTO `b_res_list_tree_v32` | ||
105 | +VALUES (14000, 0, 'ALI_CLOUD_PLAT', '阿里云', '计算存储', '', 14000, '', '', '', '', '', '', '', '', '', '', | ||
106 | + 'v_resource_cloud_ali', '2021-10-14 11:28:32'); | ||
107 | +INSERT INTO `b_res_list_tree_v32` | ||
108 | +VALUES (14100, 14000, 'ALI_CLOUD_ECS', 'ECS-云服务器', '计算存储', '', 14100, '', '', '', '', '', '', '', '', '', '', | ||
109 | + 'v_resource_cloud_ali', '2021-10-14 11:28:32'); | ||
110 | +INSERT INTO `b_res_list_tree_v32` | ||
111 | +VALUES (14200, 14000, 'ALI_CLOUD_RDS', 'RDS-云数据库', '计算存储', '', 14200, '', '', '', '', '', '', '', '', '', '', | ||
112 | + 'v_resource_cloud_ali', '2021-10-14 11:28:32'); | ||
113 | +INSERT INTO `b_res_list_tree_v32` | ||
114 | +VALUES (14300, 14000, 'ALI_CLOUD_SLB', 'SLB-负载均衡', '计算存储', '', 14300, '', '', '', '', '', '', '', '', '', '', | ||
115 | + 'v_resource_cloud_ali', '2021-10-14 11:28:32'); | ||
116 | +INSERT INTO `b_res_list_tree_v32` | ||
117 | +VALUES (14400, 14000, 'ALI_CLOUD_OSS', 'OSS-对象存储', '计算存储', '', 14400, '', '', '', '', '', '', '', '', '', '', | ||
118 | + 'v_resource_cloud_ali', '2021-10-14 11:28:32'); | ||
119 | +INSERT INTO `b_res_list_tree_v32` | ||
120 | +VALUES (15000, 0, 'STORAGE', '存储设备', '计算存储', '', 15000, '', '', '', '', '', '', '', '', '', '', 'v_resource_storage', | ||
121 | + '2021-10-14 11:28:32'); | ||
122 | +INSERT INTO `b_res_list_tree_v32` | ||
123 | +VALUES (15100, 15000, 'STORAGE_SHARE', '共享存储', '计算存储', '', 15100, '', '', '', '', '', '', '', '', '', '', | ||
124 | + 'v_resource_storage', '2021-10-14 11:28:32'); | ||
125 | +INSERT INTO `b_res_list_tree_v32` | ||
126 | +VALUES (15101, 15100, 'STORAGE_SHARE_LUN', 'LUN', '计算存储', '', 15100, '', '', '', '', '', '', '', '', '', '', | ||
127 | + 'v_resource_storage_lun', '2021-10-14 11:28:32'); | ||
128 | +INSERT INTO `b_res_list_tree_v32` | ||
129 | +VALUES (15300, 15000, 'STORAGE_TAPELIBRARY', '物理带库', '计算存储', '', 15300, '', '', '', '', '', '', '', '', '', '', | ||
130 | + 'v_resource_storage', '2021-10-14 11:28:32'); | ||
131 | +INSERT INTO `b_res_list_tree_v32` | ||
132 | +VALUES (15400, 15000, 'STORAGE_VTAPELIBRARY', '虚拟带库', '计算存储', '', 15400, '', '', '', '', '', '', '', '', '', '', | ||
133 | + 'v_resource_storage', '2021-10-14 11:28:32'); | ||
134 | +INSERT INTO `b_res_list_tree_v32` | ||
135 | +VALUES (16000, 0, 'DATABASE', '数据库', '系统软件', '', 20001, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', | ||
136 | + '2021-10-14 11:28:32'); | ||
137 | +INSERT INTO `b_res_list_tree_v32` | ||
138 | +VALUES (16100, 16000, 'DATABASE_ORACLE', 'oracle', '系统软件', '', 16100, '', '', '', '', '', '', '', '', '', '', | ||
139 | + 'v_resource_database', '2021-10-14 11:28:32'); | ||
140 | +INSERT INTO `b_res_list_tree_v32` | ||
141 | +VALUES (16101, 16000, 'DATABASE_RAC', 'oracle集群', '系统软件', '', 16101, '', '', '', '', '', '', '', '', '', '', | ||
142 | + 'v_resource_database', '2021-10-14 11:28:32'); | ||
143 | +INSERT INTO `b_res_list_tree_v32` | ||
144 | +VALUES (16200, 16000, 'DATABASE_OGG', 'ogg', '系统软件', '', 16200, '', '', '', '', '', '', '', '', '', '', | ||
145 | + 'v_resource_database', '2021-10-14 11:28:32'); | ||
146 | +INSERT INTO `b_res_list_tree_v32` | ||
147 | +VALUES (16300, 16000, 'DATABASE_MYSQL', 'mysql', '系统软件', '', 16300, '', '', '', '', '', '', '', '', '', '', | ||
148 | + 'v_resource_database', '2021-10-14 11:28:32'); | ||
149 | +INSERT INTO `b_res_list_tree_v32` | ||
150 | +VALUES (16400, 16000, 'DATABASE_REDIS', 'redis', '系统软件', '', 16400, '', '', '', '', '', '', '', '', '', '', | ||
151 | + 'v_resource_database', '2021-10-14 11:28:32'); | ||
152 | +INSERT INTO `b_res_list_tree_v32` | ||
153 | +VALUES (16500, 16000, 'DATABASE_ELASTICSEARCH', 'elasticsearch', '系统软件', '', 16500, '', '', '', '', '', '', '', '', '', | ||
154 | + '', 'v_resource_database', '2021-10-14 11:28:32'); | ||
155 | +INSERT INTO `b_res_list_tree_v32` | ||
156 | +VALUES (16600, 16000, 'DATABASE_MONGODB', 'mongodb', '系统软件', '', 16600, '', '', '', '', '', '', '', '', '', '', | ||
157 | + 'v_resource_database', '2021-10-14 11:28:32'); | ||
158 | +INSERT INTO `b_res_list_tree_v32` | ||
159 | +VALUES (17000, 0, 'MIDDLEWARE', '中间件', '系统软件', '', 20002, '', '', '', '', '', '', '', '', '', '', | ||
160 | + 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
161 | +INSERT INTO `b_res_list_tree_v32` | ||
162 | +VALUES (17100, 17000, 'MIDDLEWARE_WEBLOGIC', 'weblogic', '系统软件', '', 17100, '', '', '', '', '', '', '', '', '', '', | ||
163 | + 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
164 | +INSERT INTO `b_res_list_tree_v32` | ||
165 | +VALUES (17200, 17000, 'MIDDLEWARE_KAFKA', 'kafka', '系统软件', '', 17200, '', '', '', '', '', '', '', '', '', '', | ||
166 | + 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
167 | +INSERT INTO `b_res_list_tree_v32` | ||
168 | +VALUES (17300, 17000, 'MIDDLEWARE_NGINX', 'nginx', '系统软件', '', 17300, '', '', '', '', '', '', '', '', '', '', | ||
169 | + 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
170 | +INSERT INTO `b_res_list_tree_v32` | ||
171 | +VALUES (17400, 17000, 'MIDDLEWARE_ZOOKEEPER', 'zookeeper', '系统软件', '', 17400, '', '', '', '', '', '', '', '', '', '', | ||
172 | + 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
173 | +INSERT INTO `b_res_list_tree_v32` | ||
174 | +VALUES (17500, 17000, 'MIDDLEWARE_TOMCAT', 'tomcat', '系统软件', '', 17500, '', '', '', '', '', '', '', '', '', '', | ||
175 | + 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
176 | +INSERT INTO `b_res_list_tree_v32` | ||
177 | +VALUES (17600, 17000, 'MIDDLEWARE_MQ', 'MQ', '系统软件', '', 17600, '', '', '', '', '', '', '', '', '', '', | ||
178 | + 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
179 | +INSERT INTO `b_res_list_tree_v32` | ||
180 | +VALUES (18000, 0, 'NETHARDWARE', '计算机网络设备', '网络系统', '', 18000, '', '', '', '', '', '', '', '', '', '', | ||
181 | + 'v_resource_nethardware', '2021-10-14 11:28:32'); | ||
182 | +INSERT INTO `b_res_list_tree_v32` | ||
183 | +VALUES (18100, 18000, 'NETHARDWARE_ROUTER', '路由器', '网络系统', '', 18100, '', '', '', '', '', '', '', '', '', '', | ||
184 | + 'v_resource_nethardware', '2021-10-14 11:28:32'); | ||
185 | +INSERT INTO `b_res_list_tree_v32` | ||
186 | +VALUES (18200, 18000, 'NETHARDWARE_SWITCHBOARD', '交换机', '网络系统', '', 18200, '', '', '', '', '', '', '', '', '', '', | ||
187 | + 'v_resource_nethardware', '2021-10-14 11:28:32'); | ||
188 | +INSERT INTO `b_res_list_tree_v32` | ||
189 | +VALUES (18300, 18000, 'NETHARDWARE_LOADBALANCING', '负载均衡', '网络系统', '', 18300, '', '', '', '', '', '', '', '', '', '', | ||
190 | + 'v_resource_nethardware', '2021-10-14 11:28:32'); | ||
191 | +INSERT INTO `b_res_list_tree_v32` | ||
192 | +VALUES (19000, 0, 'NETSAFE', '安全设备', '安全设备', '', 19000, '', '', '', '', '', '', '', '', '', '', 'v_resource_netsafe', | ||
193 | + '2021-10-14 11:28:32'); | ||
194 | +INSERT INTO `b_res_list_tree_v32` | ||
195 | +VALUES (19100, 19000, 'NETSAFE_FIREWALL', '防火墙', '安全设备', '', 19100, '', '', '', '', '', '', '', '', '', '', | ||
196 | + 'v_resource_netsafe', '2021-10-14 11:28:32'); | ||
99 | 197 | ||
100 | -SET FOREIGN_KEY_CHECKS = 1; | 198 | +SET |
199 | +FOREIGN_KEY_CHECKS = 1; |
@@ -15,19 +15,22 @@ | @@ -15,19 +15,22 @@ | ||
15 | */ | 15 | */ |
16 | 16 | ||
17 | SET NAMES utf8mb4; | 17 | SET NAMES utf8mb4; |
18 | -SET FOREIGN_KEY_CHECKS = 0; | 18 | +SET |
19 | +FOREIGN_KEY_CHECKS = 0; | ||
19 | 20 | ||
20 | -- ---------------------------- | 21 | -- ---------------------------- |
21 | -- Table structure for b_res_list_config_v32 | 22 | -- Table structure for b_res_list_config_v32 |
22 | -- ---------------------------- | 23 | -- ---------------------------- |
23 | DROP TABLE IF EXISTS `b_res_list_config_v32`; | 24 | DROP TABLE IF EXISTS `b_res_list_config_v32`; |
24 | -CREATE TABLE `b_res_list_config_v32` ( | 25 | +CREATE TABLE `b_res_list_config_v32` |
26 | +( | ||
25 | `id` int(0) NOT NULL AUTO_INCREMENT COMMENT '主键', | 27 | `id` int(0) NOT NULL AUTO_INCREMENT COMMENT '主键', |
26 | `resListId` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '资源类型(b_restype_config_v32主键)', | 28 | `resListId` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '资源类型(b_restype_config_v32主键)', |
27 | `colKey` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '展示行key', | 29 | `colKey` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '展示行key', |
28 | `colAlias` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '别名,默认当前属性key名称', | 30 | `colAlias` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '别名,默认当前属性key名称', |
29 | `colType` int(0) NULL DEFAULT NULL COMMENT '类型 ', | 31 | `colType` int(0) NULL DEFAULT NULL COMMENT '类型 ', |
30 | - `colWidth` double(10, 0) NULL DEFAULT 120 COMMENT '宽度,默认120,单位px', | 32 | + `colWidth` double(10, 0 |
33 | +) NULL DEFAULT 120 COMMENT '宽度,默认120,单位px', | ||
31 | `colGroup` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '分组标识', | 34 | `colGroup` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '分组标识', |
32 | `colIsTd` int(0) NULL DEFAULT 1 COMMENT '是否是二维 0是1否,,默认1', | 35 | `colIsTd` int(0) NULL DEFAULT 1 COMMENT '是否是二维 0是1否,,默认1', |
33 | `colProps` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '字段扩展', | 36 | `colProps` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '字段扩展', |
@@ -50,36 +53,85 @@ CREATE TABLE `b_res_list_config_v32` ( | @@ -50,36 +53,85 @@ CREATE TABLE `b_res_list_config_v32` ( | ||
50 | -- ---------------------------- | 53 | -- ---------------------------- |
51 | -- Records of b_res_list_config_v32 | 54 | -- Records of b_res_list_config_v32 |
52 | -- ---------------------------- | 55 | -- ---------------------------- |
53 | -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); | ||
54 | -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); | ||
55 | -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); | ||
56 | -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); | ||
57 | -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); | ||
58 | -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); | ||
59 | -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); | ||
60 | -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); | ||
61 | -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); | ||
62 | -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); | ||
63 | -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); | ||
64 | -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); | ||
65 | -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); | ||
66 | -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); | ||
67 | -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); | ||
68 | -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); | ||
69 | -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); | ||
70 | -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); | ||
71 | -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); | ||
72 | -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); | ||
73 | -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); | ||
74 | -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); | ||
75 | -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); | ||
76 | -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); | 56 | +INSERT INTO `b_res_list_config_v32` |
57 | +VALUES (3, '1', 'resId', '资源编号', NULL, 220, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
58 | + '2021-10-14 23:27:00', NULL, NULL); | ||
59 | +INSERT INTO `b_res_list_config_v32` | ||
60 | +VALUES (4, '2', 'resName', '资源名称', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
61 | + '2021-10-14 23:27:01', NULL, NULL); | ||
62 | +INSERT INTO `b_res_list_config_v32` | ||
63 | +VALUES (5, '3', 'ip', 'IP', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
64 | + '2021-10-14 23:27:02', NULL, NULL); | ||
65 | +INSERT INTO `b_res_list_config_v32` | ||
66 | +VALUES (6, '5', 'resType', '资源类型', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
67 | + '2021-10-14 23:27:03', NULL, NULL); | ||
68 | +INSERT INTO `b_res_list_config_v32` | ||
69 | +VALUES (7, '6', 'os', '系统', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
70 | + '2021-10-14 23:27:03', NULL, NULL); | ||
71 | +INSERT INTO `b_res_list_config_v32` | ||
72 | +VALUES (8, '8', 'provider', '厂商', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
73 | + '2021-10-14 23:27:05', NULL, NULL); | ||
74 | +INSERT INTO `b_res_list_config_v32` | ||
75 | +VALUES (9, '9', 'resDomain', '所属域', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
76 | + '2021-10-14 23:27:05', NULL, NULL); | ||
77 | +INSERT INTO `b_res_list_config_v32` | ||
78 | +VALUES (10, '1', 'platform', '平台', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
79 | + '2021-10-14 23:27:07', NULL, NULL); | ||
80 | +INSERT INTO `b_res_list_config_v32` | ||
81 | +VALUES (11, '1', 'model', '型号', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
82 | + '2021-10-14 23:27:08', NULL, NULL); | ||
83 | +INSERT INTO `b_res_list_config_v32` | ||
84 | +VALUES (12, '1', 'resAdminMaster', '资源管理员', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
85 | + '2021-10-14 23:27:08', NULL, NULL); | ||
86 | +INSERT INTO `b_res_list_config_v32` | ||
87 | +VALUES (13, '1', 'busId', '业务id', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
88 | + '2021-10-14 23:27:09', NULL, NULL); | ||
89 | +INSERT INTO `b_res_list_config_v32` | ||
90 | +VALUES (14, '1', 'monitorState', '监控状态', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
91 | + '2021-10-14 23:27:09', NULL, NULL); | ||
92 | +INSERT INTO `b_res_list_config_v32` | ||
93 | +VALUES (15, '1', 'health', '健康度', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
94 | + '2021-10-14 23:27:10', NULL, NULL); | ||
95 | +INSERT INTO `b_res_list_config_v32` | ||
96 | +VALUES (16, '1', 'resPositon', '所属机房', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
97 | + '2021-10-14 23:27:10', NULL, NULL); | ||
98 | +INSERT INTO `b_res_list_config_v32` | ||
99 | +VALUES (17, '1', 'cabinetNo', '机柜编号', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
100 | + '2021-10-14 23:27:11', NULL, NULL); | ||
101 | +INSERT INTO `b_res_list_config_v32` | ||
102 | +VALUES (18, '1', 'uLocation', 'U位', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
103 | + '2021-10-14 23:27:11', NULL, NULL); | ||
104 | +INSERT INTO `b_res_list_config_v32` | ||
105 | +VALUES (19, '1', 'resourceSN', '序列号(SN)', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
106 | + '2021-10-14 23:27:12', NULL, NULL); | ||
107 | +INSERT INTO `b_res_list_config_v32` | ||
108 | +VALUES (20, '1', 'partitionNum', '分区数量', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
109 | + '2021-10-14 23:27:12', NULL, NULL); | ||
110 | +INSERT INTO `b_res_list_config_v32` | ||
111 | +VALUES (21, '1', 'cpuNucleus', 'CPU核数', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
112 | + '2021-10-14 23:27:13', NULL, NULL); | ||
113 | +INSERT INTO `b_res_list_config_v32` | ||
114 | +VALUES (22, '11', 'memoryTotal', '内存总大小', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
115 | + '2021-10-14 23:27:14', NULL, NULL); | ||
116 | +INSERT INTO `b_res_list_config_v32` | ||
117 | +VALUES (23, '1', 'maintenanceProvider', '维保厂商', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, | ||
118 | + NULL, '2021-10-14 23:27:14', NULL, NULL); | ||
119 | +INSERT INTO `b_res_list_config_v32` | ||
120 | +VALUES (24, '1', 'maintenanceEnd', '维保截止日期', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
121 | + '2021-10-14 23:27:15', NULL, NULL); | ||
122 | +INSERT INTO `b_res_list_config_v32` | ||
123 | +VALUES (25, '1', 'parentId', '所属资源编号', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
124 | + '2021-10-14 23:27:15', NULL, NULL); | ||
125 | +INSERT INTO `b_res_list_config_v32` | ||
126 | +VALUES (26, '1', 'manageIp', '管理IP', NULL, 120, NULL, 1, NULL, NULL, 0, NULL, NULL, 1, 1, 0, NULL, NULL, NULL, | ||
127 | + '2021-10-14 23:27:16', NULL, NULL); | ||
77 | 128 | ||
78 | -- ---------------------------- | 129 | -- ---------------------------- |
79 | -- Table structure for b_res_list_tree_v32 | 130 | -- Table structure for b_res_list_tree_v32 |
80 | -- ---------------------------- | 131 | -- ---------------------------- |
81 | DROP TABLE IF EXISTS `b_res_list_tree_v32`; | 132 | DROP TABLE IF EXISTS `b_res_list_tree_v32`; |
82 | -CREATE TABLE `b_res_list_tree_v32` ( | 133 | +CREATE TABLE `b_res_list_tree_v32` |
134 | +( | ||
83 | `id` int(0) NOT NULL AUTO_INCREMENT COMMENT '资源类型id', | 135 | `id` int(0) NOT NULL AUTO_INCREMENT COMMENT '资源类型id', |
84 | `parentId` int(0) NULL DEFAULT NULL COMMENT '父资源类型', | 136 | `parentId` int(0) NULL DEFAULT NULL COMMENT '父资源类型', |
85 | `resType` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '资源类型CODE', | 137 | `resType` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '资源类型CODE', |
@@ -106,53 +158,150 @@ CREATE TABLE `b_res_list_tree_v32` ( | @@ -106,53 +158,150 @@ CREATE TABLE `b_res_list_tree_v32` ( | ||
106 | -- ---------------------------- | 158 | -- ---------------------------- |
107 | -- Records of b_res_list_tree_v32 | 159 | -- Records of b_res_list_tree_v32 |
108 | -- ---------------------------- | 160 | -- ---------------------------- |
109 | -INSERT INTO `b_res_list_tree_v32` VALUES (11100, 0, 'HOST_MINICOMPUTER', '整机', '计算存储', '', 11100, '', '', '', '', '', '', '', '', '', '', 'v_resource_minipc', '2021-10-14 11:28:32'); | ||
110 | -INSERT INTO `b_res_list_tree_v32` VALUES (11102, 0, 'HOST_MINICOMPUTER_PARTITION', '分区', '计算存储', '', 11102, '', '', '', '', '', '', '', '', '', '', 'v_resource_minipc_part', '2021-10-14 11:28:32'); | ||
111 | -INSERT INTO `b_res_list_tree_v32` VALUES (11200, 0, 'HOST_X86SERVER', 'PC服务器', '计算存储', '', 11200, '', '', '', '', '', '', '', '', '', '', 'v_resource_pc', '2021-10-14 11:28:32'); | ||
112 | -INSERT INTO `b_res_list_tree_v32` VALUES (11300, 0, 'HOST_ONECOMPUTER', '一体机', '计算存储', '', 11300, '', '', '', '', '', '', '', '', '', '', 'v_resource_pc', '2021-10-14 11:28:32'); | ||
113 | -INSERT INTO `b_res_list_tree_v32` VALUES (12100, 0, 'VIRTUALIZATION_VMWARE', 'VMWARE', '计算存储', '', 12100, '', NULL, '', '', '', '', '', '', '', '', 'v_resource_vmware', '2021-10-14 11:28:32'); | ||
114 | -INSERT INTO `b_res_list_tree_v32` VALUES (12110, 12100, 'VIRTUALIZATION_VMWARE_CLUSTER', 'vm资源池', '计算存储', '', 12110, '', '', '', '', '', '', '', '', '', '', 'v_resource_vmware', '2021-10-14 11:28:32'); | ||
115 | -INSERT INTO `b_res_list_tree_v32` VALUES (12120, 12100, 'VIRTUALIZATION_VMWARE_PHYSICSHOST', 'vm宿主机', '计算存储', '', 12120, '', '', '', '', '', '', '', '', '', '', 'v_resource_vmware', '2021-10-14 11:28:32'); | ||
116 | -INSERT INTO `b_res_list_tree_v32` VALUES (12130, 12100, 'VIRTUALIZATION_VMWARE_VHOST', 'vm虚拟机', '计算存储', '', 12130, '', '', '', '', '', '', '', '', '', '', 'v_resource_vmware', '2021-10-14 11:28:32'); | ||
117 | -INSERT INTO `b_res_list_tree_v32` VALUES (12900, 12100, 'VIRTUALIZATION_VHOST', '虚拟机', '计算存储', '', 12900, '', '', '', '', '', '', '', '', '', '', 'v_resource_vmware', '2021-10-14 11:28:32'); | ||
118 | -INSERT INTO `b_res_list_tree_v32` VALUES (13000, 0, 'HUAWEI_CLOUD_PLAT', '华为云', '计算存储', '', 13000, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
119 | -INSERT INTO `b_res_list_tree_v32` VALUES (13100, 13000, 'HUAWEI_CLOUD_COLONY', '资源池', '计算存储', '', 13100, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
120 | -INSERT INTO `b_res_list_tree_v32` VALUES (13101, 13000, 'HUAWEI_CLOUD_STORAGE', '存储', '计算存储', '', 13101, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
121 | -INSERT INTO `b_res_list_tree_v32` VALUES (13102, 13000, 'HUAWEI_CLOUD_SWITCHBOARD', '交换机', '计算存储', '', 13102, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
122 | -INSERT INTO `b_res_list_tree_v32` VALUES (13103, 13000, 'HUAWEI_CLOUD_FIREWALL', '防火墙', '计算存储', '', 13103, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
123 | -INSERT INTO `b_res_list_tree_v32` VALUES (13110, 13000, 'HUAWEI_CLOUD_CLUSTER', '集群', '计算存储', '', 13110, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
124 | -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'); | ||
125 | -INSERT INTO `b_res_list_tree_v32` VALUES (13112, 13000, 'HUAWEI_CLOUD_VIRTUALHOST', '虚拟机', '计算存储', '', 13112, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
126 | -INSERT INTO `b_res_list_tree_v32` VALUES (14000, 0, 'ALI_CLOUD_PLAT', '阿里云', '计算存储', '', 14000, '', '', '', '', '', '', '', '', '', '', 'v_resource_cloud_ali', '2021-10-14 11:28:32'); | ||
127 | -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'); | ||
128 | -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'); | ||
129 | -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'); | ||
130 | -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'); | ||
131 | -INSERT INTO `b_res_list_tree_v32` VALUES (15000, 0, 'STORAGE', '存储设备', '计算存储', '', 15000, '', '', '', '', '', '', '', '', '', '', 'v_resource_storage', '2021-10-14 11:28:32'); | ||
132 | -INSERT INTO `b_res_list_tree_v32` VALUES (15100, 15000, 'STORAGE_SHARE', '共享存储', '计算存储', '', 15100, '', '', '', '', '', '', '', '', '', '', 'v_resource_storage', '2021-10-14 11:28:32'); | ||
133 | -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'); | ||
134 | -INSERT INTO `b_res_list_tree_v32` VALUES (15300, 15000, 'STORAGE_TAPELIBRARY', '物理带库', '计算存储', '', 15300, '', '', '', '', '', '', '', '', '', '', 'v_resource_storage', '2021-10-14 11:28:32'); | ||
135 | -INSERT INTO `b_res_list_tree_v32` VALUES (15400, 15000, 'STORAGE_VTAPELIBRARY', '虚拟带库', '计算存储', '', 15400, '', '', '', '', '', '', '', '', '', '', 'v_resource_storage', '2021-10-14 11:28:32'); | ||
136 | -INSERT INTO `b_res_list_tree_v32` VALUES (16000, 0, 'DATABASE', '数据库', '系统软件', '', 20001, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32'); | ||
137 | -INSERT INTO `b_res_list_tree_v32` VALUES (16100, 16000, 'DATABASE_ORACLE', 'oracle', '系统软件', '', 16100, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32'); | ||
138 | -INSERT INTO `b_res_list_tree_v32` VALUES (16101, 16000, 'DATABASE_RAC', 'oracle集群', '系统软件', '', 16101, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32'); | ||
139 | -INSERT INTO `b_res_list_tree_v32` VALUES (16200, 16000, 'DATABASE_OGG', 'ogg', '系统软件', '', 16200, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32'); | ||
140 | -INSERT INTO `b_res_list_tree_v32` VALUES (16300, 16000, 'DATABASE_MYSQL', 'mysql', '系统软件', '', 16300, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32'); | ||
141 | -INSERT INTO `b_res_list_tree_v32` VALUES (16400, 16000, 'DATABASE_REDIS', 'redis', '系统软件', '', 16400, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32'); | ||
142 | -INSERT INTO `b_res_list_tree_v32` VALUES (16500, 16000, 'DATABASE_ELASTICSEARCH', 'elasticsearch', '系统软件', '', 16500, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32'); | ||
143 | -INSERT INTO `b_res_list_tree_v32` VALUES (16600, 16000, 'DATABASE_MONGODB', 'mongodb', '系统软件', '', 16600, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', '2021-10-14 11:28:32'); | ||
144 | -INSERT INTO `b_res_list_tree_v32` VALUES (17000, 0, 'MIDDLEWARE', '中间件', '系统软件', '', 20002, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
145 | -INSERT INTO `b_res_list_tree_v32` VALUES (17100, 17000, 'MIDDLEWARE_WEBLOGIC', 'weblogic', '系统软件', '', 17100, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
146 | -INSERT INTO `b_res_list_tree_v32` VALUES (17200, 17000, 'MIDDLEWARE_KAFKA', 'kafka', '系统软件', '', 17200, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
147 | -INSERT INTO `b_res_list_tree_v32` VALUES (17300, 17000, 'MIDDLEWARE_NGINX', 'nginx', '系统软件', '', 17300, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
148 | -INSERT INTO `b_res_list_tree_v32` VALUES (17400, 17000, 'MIDDLEWARE_ZOOKEEPER', 'zookeeper', '系统软件', '', 17400, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
149 | -INSERT INTO `b_res_list_tree_v32` VALUES (17500, 17000, 'MIDDLEWARE_TOMCAT', 'tomcat', '系统软件', '', 17500, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
150 | -INSERT INTO `b_res_list_tree_v32` VALUES (17600, 17000, 'MIDDLEWARE_MQ', 'MQ', '系统软件', '', 17600, '', '', '', '', '', '', '', '', '', '', 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
151 | -INSERT INTO `b_res_list_tree_v32` VALUES (18000, 0, 'NETHARDWARE', '计算机网络设备', '网络系统', '', 18000, '', '', '', '', '', '', '', '', '', '', 'v_resource_nethardware', '2021-10-14 11:28:32'); | ||
152 | -INSERT INTO `b_res_list_tree_v32` VALUES (18100, 18000, 'NETHARDWARE_ROUTER', '路由器', '网络系统', '', 18100, '', '', '', '', '', '', '', '', '', '', 'v_resource_nethardware', '2021-10-14 11:28:32'); | ||
153 | -INSERT INTO `b_res_list_tree_v32` VALUES (18200, 18000, 'NETHARDWARE_SWITCHBOARD', '交换机', '网络系统', '', 18200, '', '', '', '', '', '', '', '', '', '', 'v_resource_nethardware', '2021-10-14 11:28:32'); | ||
154 | -INSERT INTO `b_res_list_tree_v32` VALUES (18300, 18000, 'NETHARDWARE_LOADBALANCING', '负载均衡', '网络系统', '', 18300, '', '', '', '', '', '', '', '', '', '', 'v_resource_nethardware', '2021-10-14 11:28:32'); | ||
155 | -INSERT INTO `b_res_list_tree_v32` VALUES (19000, 0, 'NETSAFE', '安全设备', '安全设备', '', 19000, '', '', '', '', '', '', '', '', '', '', 'v_resource_netsafe', '2021-10-14 11:28:32'); | ||
156 | -INSERT INTO `b_res_list_tree_v32` VALUES (19100, 19000, 'NETSAFE_FIREWALL', '防火墙', '安全设备', '', 19100, '', '', '', '', '', '', '', '', '', '', 'v_resource_netsafe', '2021-10-14 11:28:32'); | 161 | +INSERT INTO `b_res_list_tree_v32` |
162 | +VALUES (11100, 0, 'HOST_MINICOMPUTER', '整机', '计算存储', '', 11100, '', '', '', '', '', '', '', '', '', '', | ||
163 | + 'v_resource_minipc', '2021-10-14 11:28:32'); | ||
164 | +INSERT INTO `b_res_list_tree_v32` | ||
165 | +VALUES (11102, 0, 'HOST_MINICOMPUTER_PARTITION', '分区', '计算存储', '', 11102, '', '', '', '', '', '', '', '', '', '', | ||
166 | + 'v_resource_minipc_part', '2021-10-14 11:28:32'); | ||
167 | +INSERT INTO `b_res_list_tree_v32` | ||
168 | +VALUES (11200, 0, 'HOST_X86SERVER', 'PC服务器', '计算存储', '', 11200, '', '', '', '', '', '', '', '', '', '', 'v_resource_pc', | ||
169 | + '2021-10-14 11:28:32'); | ||
170 | +INSERT INTO `b_res_list_tree_v32` | ||
171 | +VALUES (11300, 0, 'HOST_ONECOMPUTER', '一体机', '计算存储', '', 11300, '', '', '', '', '', '', '', '', '', '', 'v_resource_pc', | ||
172 | + '2021-10-14 11:28:32'); | ||
173 | +INSERT INTO `b_res_list_tree_v32` | ||
174 | +VALUES (12100, 0, 'VIRTUALIZATION_VMWARE', 'VMWARE', '计算存储', '', 12100, '', NULL, '', '', '', '', '', '', '', '', | ||
175 | + 'v_resource_vmware', '2021-10-14 11:28:32'); | ||
176 | +INSERT INTO `b_res_list_tree_v32` | ||
177 | +VALUES (12110, 12100, 'VIRTUALIZATION_VMWARE_CLUSTER', 'vm资源池', '计算存储', '', 12110, '', '', '', '', '', '', '', '', '', | ||
178 | + '', 'v_resource_vmware', '2021-10-14 11:28:32'); | ||
179 | +INSERT INTO `b_res_list_tree_v32` | ||
180 | +VALUES (12120, 12100, 'VIRTUALIZATION_VMWARE_PHYSICSHOST', 'vm宿主机', '计算存储', '', 12120, '', '', '', '', '', '', '', '', | ||
181 | + '', '', 'v_resource_vmware', '2021-10-14 11:28:32'); | ||
182 | +INSERT INTO `b_res_list_tree_v32` | ||
183 | +VALUES (12130, 12100, 'VIRTUALIZATION_VMWARE_VHOST', 'vm虚拟机', '计算存储', '', 12130, '', '', '', '', '', '', '', '', '', '', | ||
184 | + 'v_resource_vmware', '2021-10-14 11:28:32'); | ||
185 | +INSERT INTO `b_res_list_tree_v32` | ||
186 | +VALUES (12900, 12100, 'VIRTUALIZATION_VHOST', '虚拟机', '计算存储', '', 12900, '', '', '', '', '', '', '', '', '', '', | ||
187 | + 'v_resource_vmware', '2021-10-14 11:28:32'); | ||
188 | +INSERT INTO `b_res_list_tree_v32` | ||
189 | +VALUES (13000, 0, 'HUAWEI_CLOUD_PLAT', '华为云', '计算存储', '', 13000, '', '', '', '', '', '', '', '', '', '', | ||
190 | + 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
191 | +INSERT INTO `b_res_list_tree_v32` | ||
192 | +VALUES (13100, 13000, 'HUAWEI_CLOUD_COLONY', '资源池', '计算存储', '', 13100, '', '', '', '', '', '', '', '', '', '', | ||
193 | + 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
194 | +INSERT INTO `b_res_list_tree_v32` | ||
195 | +VALUES (13101, 13000, 'HUAWEI_CLOUD_STORAGE', '存储', '计算存储', '', 13101, '', '', '', '', '', '', '', '', '', '', | ||
196 | + 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
197 | +INSERT INTO `b_res_list_tree_v32` | ||
198 | +VALUES (13102, 13000, 'HUAWEI_CLOUD_SWITCHBOARD', '交换机', '计算存储', '', 13102, '', '', '', '', '', '', '', '', '', '', | ||
199 | + 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
200 | +INSERT INTO `b_res_list_tree_v32` | ||
201 | +VALUES (13103, 13000, 'HUAWEI_CLOUD_FIREWALL', '防火墙', '计算存储', '', 13103, '', '', '', '', '', '', '', '', '', '', | ||
202 | + 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
203 | +INSERT INTO `b_res_list_tree_v32` | ||
204 | +VALUES (13110, 13000, 'HUAWEI_CLOUD_CLUSTER', '集群', '计算存储', '', 13110, '', '', '', '', '', '', '', '', '', '', | ||
205 | + 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
206 | +INSERT INTO `b_res_list_tree_v32` | ||
207 | +VALUES (13111, 13000, 'HUAWEI_CLOUD_CLUSTER_OST', '物理机', '计算存储', '', 13111, '', '', '', '', '', '', '', '', '', '', | ||
208 | + 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
209 | +INSERT INTO `b_res_list_tree_v32` | ||
210 | +VALUES (13112, 13000, 'HUAWEI_CLOUD_VIRTUALHOST', '虚拟机', '计算存储', '', 13112, '', '', '', '', '', '', '', '', '', '', | ||
211 | + 'v_resource_cloud_hw', '2021-10-14 11:28:32'); | ||
212 | +INSERT INTO `b_res_list_tree_v32` | ||
213 | +VALUES (14000, 0, 'ALI_CLOUD_PLAT', '阿里云', '计算存储', '', 14000, '', '', '', '', '', '', '', '', '', '', | ||
214 | + 'v_resource_cloud_ali', '2021-10-14 11:28:32'); | ||
215 | +INSERT INTO `b_res_list_tree_v32` | ||
216 | +VALUES (14100, 14000, 'ALI_CLOUD_ECS', 'ECS-云服务器', '计算存储', '', 14100, '', '', '', '', '', '', '', '', '', '', | ||
217 | + 'v_resource_cloud_ali', '2021-10-14 11:28:32'); | ||
218 | +INSERT INTO `b_res_list_tree_v32` | ||
219 | +VALUES (14200, 14000, 'ALI_CLOUD_RDS', 'RDS-云数据库', '计算存储', '', 14200, '', '', '', '', '', '', '', '', '', '', | ||
220 | + 'v_resource_cloud_ali', '2021-10-14 11:28:32'); | ||
221 | +INSERT INTO `b_res_list_tree_v32` | ||
222 | +VALUES (14300, 14000, 'ALI_CLOUD_SLB', 'SLB-负载均衡', '计算存储', '', 14300, '', '', '', '', '', '', '', '', '', '', | ||
223 | + 'v_resource_cloud_ali', '2021-10-14 11:28:32'); | ||
224 | +INSERT INTO `b_res_list_tree_v32` | ||
225 | +VALUES (14400, 14000, 'ALI_CLOUD_OSS', 'OSS-对象存储', '计算存储', '', 14400, '', '', '', '', '', '', '', '', '', '', | ||
226 | + 'v_resource_cloud_ali', '2021-10-14 11:28:32'); | ||
227 | +INSERT INTO `b_res_list_tree_v32` | ||
228 | +VALUES (15000, 0, 'STORAGE', '存储设备', '计算存储', '', 15000, '', '', '', '', '', '', '', '', '', '', 'v_resource_storage', | ||
229 | + '2021-10-14 11:28:32'); | ||
230 | +INSERT INTO `b_res_list_tree_v32` | ||
231 | +VALUES (15100, 15000, 'STORAGE_SHARE', '共享存储', '计算存储', '', 15100, '', '', '', '', '', '', '', '', '', '', | ||
232 | + 'v_resource_storage', '2021-10-14 11:28:32'); | ||
233 | +INSERT INTO `b_res_list_tree_v32` | ||
234 | +VALUES (15101, 15100, 'STORAGE_SHARE_LUN', 'LUN', '计算存储', '', 15100, '', '', '', '', '', '', '', '', '', '', | ||
235 | + 'v_resource_storage_lun', '2021-10-14 11:28:32'); | ||
236 | +INSERT INTO `b_res_list_tree_v32` | ||
237 | +VALUES (15300, 15000, 'STORAGE_TAPELIBRARY', '物理带库', '计算存储', '', 15300, '', '', '', '', '', '', '', '', '', '', | ||
238 | + 'v_resource_storage', '2021-10-14 11:28:32'); | ||
239 | +INSERT INTO `b_res_list_tree_v32` | ||
240 | +VALUES (15400, 15000, 'STORAGE_VTAPELIBRARY', '虚拟带库', '计算存储', '', 15400, '', '', '', '', '', '', '', '', '', '', | ||
241 | + 'v_resource_storage', '2021-10-14 11:28:32'); | ||
242 | +INSERT INTO `b_res_list_tree_v32` | ||
243 | +VALUES (16000, 0, 'DATABASE', '数据库', '系统软件', '', 20001, '', '', '', '', '', '', '', '', '', '', 'v_resource_database', | ||
244 | + '2021-10-14 11:28:32'); | ||
245 | +INSERT INTO `b_res_list_tree_v32` | ||
246 | +VALUES (16100, 16000, 'DATABASE_ORACLE', 'oracle', '系统软件', '', 16100, '', '', '', '', '', '', '', '', '', '', | ||
247 | + 'v_resource_database', '2021-10-14 11:28:32'); | ||
248 | +INSERT INTO `b_res_list_tree_v32` | ||
249 | +VALUES (16101, 16000, 'DATABASE_RAC', 'oracle集群', '系统软件', '', 16101, '', '', '', '', '', '', '', '', '', '', | ||
250 | + 'v_resource_database', '2021-10-14 11:28:32'); | ||
251 | +INSERT INTO `b_res_list_tree_v32` | ||
252 | +VALUES (16200, 16000, 'DATABASE_OGG', 'ogg', '系统软件', '', 16200, '', '', '', '', '', '', '', '', '', '', | ||
253 | + 'v_resource_database', '2021-10-14 11:28:32'); | ||
254 | +INSERT INTO `b_res_list_tree_v32` | ||
255 | +VALUES (16300, 16000, 'DATABASE_MYSQL', 'mysql', '系统软件', '', 16300, '', '', '', '', '', '', '', '', '', '', | ||
256 | + 'v_resource_database', '2021-10-14 11:28:32'); | ||
257 | +INSERT INTO `b_res_list_tree_v32` | ||
258 | +VALUES (16400, 16000, 'DATABASE_REDIS', 'redis', '系统软件', '', 16400, '', '', '', '', '', '', '', '', '', '', | ||
259 | + 'v_resource_database', '2021-10-14 11:28:32'); | ||
260 | +INSERT INTO `b_res_list_tree_v32` | ||
261 | +VALUES (16500, 16000, 'DATABASE_ELASTICSEARCH', 'elasticsearch', '系统软件', '', 16500, '', '', '', '', '', '', '', '', '', | ||
262 | + '', 'v_resource_database', '2021-10-14 11:28:32'); | ||
263 | +INSERT INTO `b_res_list_tree_v32` | ||
264 | +VALUES (16600, 16000, 'DATABASE_MONGODB', 'mongodb', '系统软件', '', 16600, '', '', '', '', '', '', '', '', '', '', | ||
265 | + 'v_resource_database', '2021-10-14 11:28:32'); | ||
266 | +INSERT INTO `b_res_list_tree_v32` | ||
267 | +VALUES (17000, 0, 'MIDDLEWARE', '中间件', '系统软件', '', 20002, '', '', '', '', '', '', '', '', '', '', | ||
268 | + 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
269 | +INSERT INTO `b_res_list_tree_v32` | ||
270 | +VALUES (17100, 17000, 'MIDDLEWARE_WEBLOGIC', 'weblogic', '系统软件', '', 17100, '', '', '', '', '', '', '', '', '', '', | ||
271 | + 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
272 | +INSERT INTO `b_res_list_tree_v32` | ||
273 | +VALUES (17200, 17000, 'MIDDLEWARE_KAFKA', 'kafka', '系统软件', '', 17200, '', '', '', '', '', '', '', '', '', '', | ||
274 | + 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
275 | +INSERT INTO `b_res_list_tree_v32` | ||
276 | +VALUES (17300, 17000, 'MIDDLEWARE_NGINX', 'nginx', '系统软件', '', 17300, '', '', '', '', '', '', '', '', '', '', | ||
277 | + 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
278 | +INSERT INTO `b_res_list_tree_v32` | ||
279 | +VALUES (17400, 17000, 'MIDDLEWARE_ZOOKEEPER', 'zookeeper', '系统软件', '', 17400, '', '', '', '', '', '', '', '', '', '', | ||
280 | + 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
281 | +INSERT INTO `b_res_list_tree_v32` | ||
282 | +VALUES (17500, 17000, 'MIDDLEWARE_TOMCAT', 'tomcat', '系统软件', '', 17500, '', '', '', '', '', '', '', '', '', '', | ||
283 | + 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
284 | +INSERT INTO `b_res_list_tree_v32` | ||
285 | +VALUES (17600, 17000, 'MIDDLEWARE_MQ', 'MQ', '系统软件', '', 17600, '', '', '', '', '', '', '', '', '', '', | ||
286 | + 'v_resource_middleware', '2021-10-14 11:28:32'); | ||
287 | +INSERT INTO `b_res_list_tree_v32` | ||
288 | +VALUES (18000, 0, 'NETHARDWARE', '计算机网络设备', '网络系统', '', 18000, '', '', '', '', '', '', '', '', '', '', | ||
289 | + 'v_resource_nethardware', '2021-10-14 11:28:32'); | ||
290 | +INSERT INTO `b_res_list_tree_v32` | ||
291 | +VALUES (18100, 18000, 'NETHARDWARE_ROUTER', '路由器', '网络系统', '', 18100, '', '', '', '', '', '', '', '', '', '', | ||
292 | + 'v_resource_nethardware', '2021-10-14 11:28:32'); | ||
293 | +INSERT INTO `b_res_list_tree_v32` | ||
294 | +VALUES (18200, 18000, 'NETHARDWARE_SWITCHBOARD', '交换机', '网络系统', '', 18200, '', '', '', '', '', '', '', '', '', '', | ||
295 | + 'v_resource_nethardware', '2021-10-14 11:28:32'); | ||
296 | +INSERT INTO `b_res_list_tree_v32` | ||
297 | +VALUES (18300, 18000, 'NETHARDWARE_LOADBALANCING', '负载均衡', '网络系统', '', 18300, '', '', '', '', '', '', '', '', '', '', | ||
298 | + 'v_resource_nethardware', '2021-10-14 11:28:32'); | ||
299 | +INSERT INTO `b_res_list_tree_v32` | ||
300 | +VALUES (19000, 0, 'NETSAFE', '安全设备', '安全设备', '', 19000, '', '', '', '', '', '', '', '', '', '', 'v_resource_netsafe', | ||
301 | + '2021-10-14 11:28:32'); | ||
302 | +INSERT INTO `b_res_list_tree_v32` | ||
303 | +VALUES (19100, 19000, 'NETSAFE_FIREWALL', '防火墙', '安全设备', '', 19100, '', '', '', '', '', '', '', '', '', '', | ||
304 | + 'v_resource_netsafe', '2021-10-14 11:28:32'); | ||
157 | 305 | ||
158 | -SET FOREIGN_KEY_CHECKS = 1; | 306 | +SET |
307 | +FOREIGN_KEY_CHECKS = 1; |
1 | # 任务地址 | 1 | # 任务地址 |
2 | -[https://hgkj.5upm.com/task-view-72.html](任务地址) | ||
3 | - | ||
4 | - | ||
5 | 2 | ||
3 | +[https://hgkj.5upm.com/task-view-72.html](任务地址) | ||
6 | 4 | ||
7 | ## 涉及SQL | 5 | ## 涉及SQL |
8 | -`V1015_1_乙方运维数据库设计SQL.txt` | ||
9 | 6 | ||
7 | +`V1015_1_乙方运维数据库设计SQL.txt` | ||
10 | 8 | ||
11 | ## 涉及工程 | 9 | ## 涉及工程 |
10 | + | ||
12 | > 1、hg-monitor-web-zj<br> | 11 | > 1、hg-monitor-web-zj<br> |
1 | # 代码包路径 | 1 | # 代码包路径 |
2 | + | ||
2 | ```` | 3 | ```` |
3 | 【后端】 hg-platform\business-center\view-center-project\view-center-zj\src\main\java\com\honggroup\manageapi\bdialtestconfig | 4 | 【后端】 hg-platform\business-center\view-center-project\view-center-zj\src\main\java\com\honggroup\manageapi\bdialtestconfig |
4 | ```` | 5 | ```` |
5 | 6 | ||
6 | ### 说明 | 7 | ### 说明 |
8 | + | ||
7 | ```` | 9 | ```` |
8 | 文档管理是一个组件,文档管理和回收站使用传参的方式,来控制读取数据的接口; | 10 | 文档管理是一个组件,文档管理和回收站使用传参的方式,来控制读取数据的接口; |
9 | ```` | 11 | ```` |
10 | 12 | ||
11 | ## 配置文件修改 | 13 | ## 配置文件修改 |
14 | + | ||
12 | **api-gateway**</br> | 15 | **api-gateway**</br> |
13 | 配置节点security:oauth2:ignored追加配置文件:**,/api-web/manage/bustype/getAllBusId,/api-web/manage/bdialtest/getTaskIdAndBusId** | 16 | 配置节点security:oauth2:ignored追加配置文件:**,/api-web/manage/bustype/getAllBusId,/api-web/manage/bdialtest/getTaskIdAndBusId** |
17 | + | ||
14 | ```` | 18 | ```` |
15 | # 增加配置文件 | 19 | # 增加配置文件 |
16 | security: | 20 | security: |
@@ -20,4 +24,5 @@ security: | @@ -20,4 +24,5 @@ security: | ||
20 | ```` | 24 | ```` |
21 | 25 | ||
22 | ## 涉及工程 | 26 | ## 涉及工程 |
27 | + | ||
23 | > 1、view-center | 28 | > 1、view-center |
1 | # 任务地址 | 1 | # 任务地址 |
2 | + | ||
2 | [https://hgkj.5upm.com/task-view-73.html](任务地址) | 3 | [https://hgkj.5upm.com/task-view-73.html](任务地址) |
3 | 4 | ||
4 | # 代码包路径 | 5 | # 代码包路径 |
6 | + | ||
5 | ```` | 7 | ```` |
6 | 【前端】【组件】hg-monitor-web\hg-monitor-web-base\src\main\resources\static\vue3\src\components\common\document | 8 | 【前端】【组件】hg-monitor-web\hg-monitor-web-base\src\main\resources\static\vue3\src\components\common\document |
7 | 【前端】【文档管理】hg-monitor-web\hg-monitor-web-zj\src\main\resources\static\vue3\src\views\documentationManagement\index.* | 9 | 【前端】【文档管理】hg-monitor-web\hg-monitor-web-zj\src\main\resources\static\vue3\src\views\documentationManagement\index.* |
@@ -10,12 +12,13 @@ | @@ -10,12 +12,13 @@ | ||
10 | ```` | 12 | ```` |
11 | 13 | ||
12 | ### 说明 | 14 | ### 说明 |
15 | + | ||
13 | ```` | 16 | ```` |
14 | 文档管理是一个组件,文档管理和回收站使用传参的方式,来控制读取数据的接口; | 17 | 文档管理是一个组件,文档管理和回收站使用传参的方式,来控制读取数据的接口; |
15 | ```` | 18 | ```` |
16 | 19 | ||
17 | - | ||
18 | ## 可选配置文件 | 20 | ## 可选配置文件 |
21 | + | ||
19 | ```` | 22 | ```` |
20 | report: | 23 | report: |
21 | config: | 24 | config: |
@@ -26,9 +29,11 @@ report: | @@ -26,9 +29,11 @@ report: | ||
26 | ```` | 29 | ```` |
27 | 30 | ||
28 | ## 涉及SQL | 31 | ## 涉及SQL |
32 | + | ||
29 | `SQL/zj/V1015_2_增加文档管理表字段.sql` | 33 | `SQL/zj/V1015_2_增加文档管理表字段.sql` |
30 | 34 | ||
31 | ## 涉及工程 | 35 | ## 涉及工程 |
32 | ->> hg-monitor-web-zj | 36 | + |
37 | +> > hg-monitor-web-zj | ||
33 | > | 38 | > |
34 | >> inspection-report | 39 | >> inspection-report |
1 | # 代码包路径 | 1 | # 代码包路径 |
2 | + | ||
2 | ```` | 3 | ```` |
3 | 【前端】hg-monitor-web-base\src\main\resources\static\src\views\reportView | 4 | 【前端】hg-monitor-web-base\src\main\resources\static\src\views\reportView |
4 | ```` | 5 | ```` |
5 | 6 | ||
6 | ### 说明 | 7 | ### 说明 |
8 | + | ||
7 | ```` | 9 | ```` |
8 | 集成积木报表 | 10 | 集成积木报表 |
9 | ```` | 11 | ```` |
10 | 12 | ||
11 | ### 菜单配置说明 | 13 | ### 菜单配置说明 |
14 | + | ||
12 | ```` | 15 | ```` |
13 | 菜单URL:reportView/index/reportCode=dddd | 16 | 菜单URL:reportView/index/reportCode=dddd |
14 | dddd = 展示的报表编号 | 17 | dddd = 展示的报表编号 |
1 | # 任务地址 | 1 | # 任务地址 |
2 | -[https://hgkj.5upm.com/my/](任务地址) | ||
3 | 2 | ||
3 | +[https://hgkj.5upm.com/my/](任务地址) | ||
4 | 4 | ||
5 | ## 配置文件修改 | 5 | ## 配置文件修改 |
6 | + | ||
6 | ```` | 7 | ```` |
7 | # 增加配置文件 | 8 | # 增加配置文件 |
8 | spring: | 9 | spring: |
@@ -11,9 +12,10 @@ spring: | @@ -11,9 +12,10 @@ spring: | ||
11 | ```` | 12 | ```` |
12 | 13 | ||
13 | ## 涉及SQL | 14 | ## 涉及SQL |
14 | -`例:SQL/zj/V1015_2_增加文档管理表字段.sql` | ||
15 | 15 | ||
16 | +`例:SQL/zj/V1015_2_增加文档管理表字段.sql` | ||
16 | 17 | ||
17 | ## 涉及工程 | 18 | ## 涉及工程 |
19 | + | ||
18 | > 1、hg-monitor-web-zj<br> | 20 | > 1、hg-monitor-web-zj<br> |
19 | > 2、inspection-report | 21 | > 2、inspection-report |
1 | # 任务地址 | 1 | # 任务地址 |
2 | + | ||
2 | [https://hgkj.5upm.com/bug-view-71.html](任务地址) | 3 | [https://hgkj.5upm.com/bug-view-71.html](任务地址) |
3 | 4 | ||
4 | ## 配置文件修改 | 5 | ## 配置文件修改 |
6 | + | ||
5 | ```` | 7 | ```` |
6 | #增加业务健康度IP地址 | 8 | #增加业务健康度IP地址 |
7 | url: | 9 | url: |
@@ -9,4 +11,5 @@ url: | @@ -9,4 +11,5 @@ url: | ||
9 | ```` | 11 | ```` |
10 | 12 | ||
11 | ## 涉及工程 | 13 | ## 涉及工程 |
14 | + | ||
12 | > hg-monitor-web-zj | 15 | > hg-monitor-web-zj |
@@ -9,15 +9,19 @@ pre.vue-container | @@ -9,15 +9,19 @@ pre.vue-container | ||
9 | border-left-style: solid; | 9 | border-left-style: solid; |
10 | border-color: #42b983; | 10 | border-color: #42b983; |
11 | border-radius: 0px; | 11 | border-radius: 0px; |
12 | + | ||
12 | & > code | 13 | & > code |
13 | font-size: 14px !important; | 14 | font-size: 14px !important; |
15 | + | ||
14 | & > p | 16 | & > p |
15 | margin: -5px 0 -20px 0; | 17 | margin: -5px 0 -20px 0; |
18 | + | ||
16 | code | 19 | code |
17 | background-color: #42b983 !important; | 20 | background-color: #42b983 !important; |
18 | padding: 3px 5px; | 21 | padding: 3px 5px; |
19 | border-radius: 3px; | 22 | border-radius: 3px; |
20 | color #000 | 23 | color #000 |
24 | + | ||
21 | em | 25 | em |
22 | color #808080 | 26 | color #808080 |
23 | font-weight light | 27 | font-weight light |
@@ -11,20 +11,16 @@ | @@ -11,20 +11,16 @@ | ||
11 | ├─ three.md | 11 | ├─ three.md |
12 | └─ four.md | 12 | └─ four.md |
13 | 13 | ||
14 | - | ||
15 | | Tables | Are | Cool | | 14 | | Tables | Are | Cool | |
16 | | ------------- |:-------------:| -----:| | 15 | | ------------- |:-------------:| -----:| |
17 | | col 3 is | right-aligned | $1600 | | 16 | | col 3 is | right-aligned | $1600 | |
18 | | col 2 is | centered | $12 | | 17 | | col 2 is | centered | $12 | |
19 | | zebra stripes | are neat | $1 | | 18 | | zebra stripes | are neat | $1 | |
20 | 19 | ||
21 | - | ||
22 | :tada: :100: | 20 | :tada: :100: |
23 | 21 | ||
24 | - | ||
25 | [[toc]] | 22 | [[toc]] |
26 | 23 | ||
27 | - | ||
28 | ::: tip | 24 | ::: tip |
29 | 这是一个提示 | 25 | 这是一个提示 |
30 | ::: | 26 | ::: |
@@ -41,19 +37,17 @@ | @@ -41,19 +37,17 @@ | ||
41 | 这是一个详情块,在 IE / Edge 中不生效 | 37 | 这是一个详情块,在 IE / Edge 中不生效 |
42 | ::: | 38 | ::: |
43 | 39 | ||
44 | - | ||
45 | - | ||
46 | ::: danger STOP | 40 | ::: danger STOP |
47 | 危险区域,禁止通行 | 41 | 危险区域,禁止通行 |
48 | ::: | 42 | ::: |
49 | 43 | ||
50 | ::: details 点击查看代码 | 44 | ::: details 点击查看代码 |
45 | + | ||
51 | ```js | 46 | ```js |
52 | console.log('你好,VuePress!') | 47 | console.log('你好,VuePress!') |
53 | ``` | 48 | ``` |
54 | -::: | ||
55 | - | ||
56 | 49 | ||
50 | +::: | ||
57 | 51 | ||
58 | ``` js | 52 | ``` js |
59 | export default { | 53 | export default { |
@@ -62,8 +56,6 @@ export default { | @@ -62,8 +56,6 @@ export default { | ||
62 | } | 56 | } |
63 | ``` | 57 | ``` |
64 | 58 | ||
65 | - | ||
66 | - | ||
67 | ``` html | 59 | ``` html |
68 | <ul> | 60 | <ul> |
69 | <li | 61 | <li |
@@ -75,7 +67,6 @@ export default { | @@ -75,7 +67,6 @@ export default { | ||
75 | </ul> | 67 | </ul> |
76 | ``` | 68 | ``` |
77 | 69 | ||
78 | - | ||
79 | ``` js{1,4,6-7} | 70 | ``` js{1,4,6-7} |
80 | export default { // Highlighted | 71 | export default { // Highlighted |
81 | data () { | 72 | data () { |
@@ -9,8 +9,6 @@ | @@ -9,8 +9,6 @@ | ||
9 | | 2 | 各个现场支撑 | 29次 | | 9 | | 2 | 各个现场支撑 | 29次 | |
10 | | 3 | 功能点开发 | 10个 | | 10 | | 3 | 功能点开发 | 10个 | |
11 | 11 | ||
12 | - | ||
13 | - | ||
14 | ::: tip 首页明确统计规则展示 | 12 | ::: tip 首页明确统计规则展示 |
15 | 在右上角展示统计规则 | 13 | 在右上角展示统计规则 |
16 | ::: | 14 | ::: |
@@ -28,19 +26,17 @@ | @@ -28,19 +26,17 @@ | ||
28 | 这是一个详情块,在 IE / Edge 中不生效 | 26 | 这是一个详情块,在 IE / Edge 中不生效 |
29 | ::: | 27 | ::: |
30 | 28 | ||
31 | - | ||
32 | - | ||
33 | ::: danger STOP | 29 | ::: danger STOP |
34 | 危险区域,禁止通行 | 30 | 危险区域,禁止通行 |
35 | ::: | 31 | ::: |
36 | 32 | ||
37 | ::: details 点击查看代码 | 33 | ::: details 点击查看代码 |
34 | + | ||
38 | ```js | 35 | ```js |
39 | console.log('你好,VuePress!') | 36 | console.log('你好,VuePress!') |
40 | ``` | 37 | ``` |
41 | -::: | ||
42 | - | ||
43 | 38 | ||
39 | +::: | ||
44 | 40 | ||
45 | ``` js | 41 | ``` js |
46 | export default { | 42 | export default { |
@@ -49,8 +45,6 @@ export default { | @@ -49,8 +45,6 @@ export default { | ||
49 | } | 45 | } |
50 | ``` | 46 | ``` |
51 | 47 | ||
52 | - | ||
53 | - | ||
54 | ``` html | 48 | ``` html |
55 | <ul> | 49 | <ul> |
56 | <li | 50 | <li |
@@ -62,7 +56,6 @@ export default { | @@ -62,7 +56,6 @@ export default { | ||
62 | </ul> | 56 | </ul> |
63 | ``` | 57 | ``` |
64 | 58 | ||
65 | - | ||
66 | ``` js{1,4,6-7} | 59 | ``` js{1,4,6-7} |
67 | export default { // Highlighted | 60 | export default { // Highlighted |
68 | data () { | 61 | data () { |
@@ -9,8 +9,6 @@ | @@ -9,8 +9,6 @@ | ||
9 | | 2 | 各个现场支撑 | 29次 | | 9 | | 2 | 各个现场支撑 | 29次 | |
10 | | 3 | 功能点开发 | 10个 | | 10 | | 3 | 功能点开发 | 10个 | |
11 | 11 | ||
12 | - | ||
13 | - | ||
14 | ::: tip 首页明确统计规则展示 | 12 | ::: tip 首页明确统计规则展示 |
15 | 在右上角展示统计规则 | 13 | 在右上角展示统计规则 |
16 | ::: | 14 | ::: |
@@ -28,19 +26,17 @@ | @@ -28,19 +26,17 @@ | ||
28 | 这是一个详情块,在 IE / Edge 中不生效 | 26 | 这是一个详情块,在 IE / Edge 中不生效 |
29 | ::: | 27 | ::: |
30 | 28 | ||
31 | - | ||
32 | - | ||
33 | ::: danger STOP | 29 | ::: danger STOP |
34 | 危险区域,禁止通行 | 30 | 危险区域,禁止通行 |
35 | ::: | 31 | ::: |
36 | 32 | ||
37 | ::: details 点击查看代码 | 33 | ::: details 点击查看代码 |
34 | + | ||
38 | ```js | 35 | ```js |
39 | console.log('你好,VuePress!') | 36 | console.log('你好,VuePress!') |
40 | ``` | 37 | ``` |
41 | -::: | ||
42 | - | ||
43 | 38 | ||
39 | +::: | ||
44 | 40 | ||
45 | ``` js | 41 | ``` js |
46 | export default { | 42 | export default { |
@@ -49,8 +45,6 @@ export default { | @@ -49,8 +45,6 @@ export default { | ||
49 | } | 45 | } |
50 | ``` | 46 | ``` |
51 | 47 | ||
52 | - | ||
53 | - | ||
54 | ``` html | 48 | ``` html |
55 | <ul> | 49 | <ul> |
56 | <li | 50 | <li |
@@ -62,7 +56,6 @@ export default { | @@ -62,7 +56,6 @@ export default { | ||
62 | </ul> | 56 | </ul> |
63 | ``` | 57 | ``` |
64 | 58 | ||
65 | - | ||
66 | ``` js{1,4,6-7} | 59 | ``` js{1,4,6-7} |
67 | export default { // Highlighted | 60 | export default { // Highlighted |
68 | data () { | 61 | data () { |
1 |     监控版本升级记录<br> | 1 |     监控版本升级记录<br> |
2 | 2 | ||
3 | - | ||
4 | | Tables | Are | Cool | | 3 | | Tables | Are | Cool | |
5 | | ------------- |:-------------:| -----:| | 4 | | ------------- |:-------------:| -----:| |
6 | | col 3 is | right-aligned | $1600 | | 5 | | col 3 is | right-aligned | $1600 | |
7 | | col 2 is | centered | $12 | | 6 | | col 2 is | centered | $12 | |
8 | | zebra stripes | are neat | $1 | | 7 | | zebra stripes | are neat | $1 | |
9 | 8 | ||
10 | - | ||
11 | :tada: :100: | 9 | :tada: :100: |
12 | 10 | ||
13 | - | ||
14 | [[toc]] | 11 | [[toc]] |
15 | 12 | ||
16 | - | ||
17 | ::: tip | 13 | ::: tip |
18 | 这是一个提示 | 14 | 这是一个提示 |
19 | ::: | 15 | ::: |
@@ -30,19 +26,17 @@ | @@ -30,19 +26,17 @@ | ||
30 | 这是一个详情块,在 IE / Edge 中不生效 | 26 | 这是一个详情块,在 IE / Edge 中不生效 |
31 | ::: | 27 | ::: |
32 | 28 | ||
33 | - | ||
34 | - | ||
35 | ::: danger STOP | 29 | ::: danger STOP |
36 | 危险区域,禁止通行 | 30 | 危险区域,禁止通行 |
37 | ::: | 31 | ::: |
38 | 32 | ||
39 | ::: details 点击查看代码 | 33 | ::: details 点击查看代码 |
34 | + | ||
40 | ```js | 35 | ```js |
41 | console.log('你好,VuePress!') | 36 | console.log('你好,VuePress!') |
42 | ``` | 37 | ``` |
43 | -::: | ||
44 | - | ||
45 | 38 | ||
39 | +::: | ||
46 | 40 | ||
47 | ``` js | 41 | ``` js |
48 | export default { | 42 | export default { |
@@ -51,8 +45,6 @@ export default { | @@ -51,8 +45,6 @@ export default { | ||
51 | } | 45 | } |
52 | ``` | 46 | ``` |
53 | 47 | ||
54 | - | ||
55 | - | ||
56 | ``` html | 48 | ``` html |
57 | <ul> | 49 | <ul> |
58 | <li | 50 | <li |
@@ -64,7 +56,6 @@ export default { | @@ -64,7 +56,6 @@ export default { | ||
64 | </ul> | 56 | </ul> |
65 | ``` | 57 | ``` |
66 | 58 | ||
67 | - | ||
68 | ``` js{1,4,6-7} | 59 | ``` js{1,4,6-7} |
69 | export default { // Highlighted | 60 | export default { // Highlighted |
70 | data () { | 61 | data () { |
@@ -10,8 +10,8 @@ layout-nx: | @@ -10,8 +10,8 @@ layout-nx: | ||
10 | ::: tip 功能数据来源 | 10 | ::: tip 功能数据来源 |
11 | 菜单功能:`user-center`.`sys_menu`<br/> | 11 | 菜单功能:`user-center`.`sys_menu`<br/> |
12 | 主体卡片:<br/> | 12 | 主体卡片:<br/> |
13 | - 获取告警统计信息:/api-web/home/alarm/countByAlarmLevel <br/> | ||
14 | - 资源列表: | 13 | +获取告警统计信息:/api-web/home/alarm/countByAlarmLevel <br/> |
14 | +资源列表: | ||
15 | ::: | 15 | ::: |
16 | ::: tip 搜索条件来源 | 16 | ::: tip 搜索条件来源 |
17 | 字典:<br/> | 17 | 字典:<br/> |
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | 2 | +<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" |
3 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> | 3 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> |
4 | <modelVersion>4.0.0</modelVersion> | 4 | <modelVersion>4.0.0</modelVersion> |
5 | <parent> | 5 | <parent> |
@@ -43,9 +43,11 @@ | @@ -43,9 +43,11 @@ | ||
43 | ``` bash | 43 | ``` bash |
44 | ~ git commit -m "feat: add a new feature" | 44 | ~ git commit -m "feat: add a new feature" |
45 | ``` | 45 | ``` |
46 | + | ||
46 | ``` bash | 47 | ``` bash |
47 | ~ git commit -m "fix(nav): 更正参数拼写错误" | 48 | ~ git commit -m "fix(nav): 更正参数拼写错误" |
48 | ``` | 49 | ``` |
50 | + | ||
49 | ``` bash | 51 | ``` bash |
50 | ~ git commit -m "docs: update README.md" | 52 | ~ git commit -m "docs: update README.md" |
51 | ``` | 53 | ``` |
1 | /** | 1 | /** |
2 | layuiAdmin pro 构建 | 2 | layuiAdmin pro 构建 |
3 | -*/ | 3 | + */ |
4 | 4 | ||
5 | var pkg = require('./package.json'); | 5 | var pkg = require('./package.json'); |
6 | var inds = pkg.independents; | 6 | var inds = pkg.independents; |
@@ -25,12 +25,12 @@ var argv = require('minimist')(process.argv.slice(2), { | @@ -25,12 +25,12 @@ var argv = require('minimist')(process.argv.slice(2), { | ||
25 | default: { | 25 | default: { |
26 | ver: 'all' | 26 | ver: 'all' |
27 | } | 27 | } |
28 | -}) | 28 | + }) |
29 | 29 | ||
30 | //注释 | 30 | //注释 |
31 | , note = [ | 31 | , note = [ |
32 | '/** <%= pkg.name %>-v<%= pkg.version %> <%= pkg.license %> License By <%= pkg.homepage %> */\n <%= js %>' | 32 | '/** <%= pkg.name %>-v<%= pkg.version %> <%= pkg.license %> License By <%= pkg.homepage %> */\n <%= js %>' |
33 | - , { pkg: pkg, js: ';' } | 33 | + , {pkg: pkg, js: ';'} |
34 | ] | 34 | ] |
35 | 35 | ||
36 | , destDir = './dist' //构建的目标目录 | 36 | , destDir = './dist' //构建的目标目录 |
@@ -31,7 +31,7 @@ Dual licensed under the MIT and GPL licenses. | @@ -31,7 +31,7 @@ Dual licensed under the MIT and GPL licenses. | ||
31 | * >>> Math.uuid(8, 16) // 8 character ID (base=16) | 31 | * >>> Math.uuid(8, 16) // 8 character ID (base=16) |
32 | * "098F4D35" | 32 | * "098F4D35" |
33 | */ | 33 | */ |
34 | -(function() { | 34 | +(function () { |
35 | // Private array of chars to use | 35 | // Private array of chars to use |
36 | var CHARS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split(''); | 36 | var CHARS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split(''); |
37 | 37 | ||
@@ -40,7 +40,7 @@ Dual licensed under the MIT and GPL licenses. | @@ -40,7 +40,7 @@ Dual licensed under the MIT and GPL licenses. | ||
40 | radix = radix || chars.length; | 40 | radix = radix || chars.length; |
41 | if (len) { | 41 | if (len) { |
42 | // Compact form | 42 | // Compact form |
43 | - for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random()*radix]; | 43 | + for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix]; |
44 | } else { | 44 | } else { |
45 | // rfc4122, version 4 form | 45 | // rfc4122, version 4 form |
46 | var r; | 46 | var r; |
@@ -53,7 +53,7 @@ Dual licensed under the MIT and GPL licenses. | @@ -53,7 +53,7 @@ Dual licensed under the MIT and GPL licenses. | ||
53 | // per rfc4122, sec. 4.1.5 | 53 | // per rfc4122, sec. 4.1.5 |
54 | for (i = 0; i < 36; i++) { | 54 | for (i = 0; i < 36; i++) { |
55 | if (!uuid[i]) { | 55 | if (!uuid[i]) { |
56 | - r = 0 | Math.random()*16; | 56 | + r = 0 | Math.random() * 16; |
57 | uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r]; | 57 | uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r]; |
58 | } | 58 | } |
59 | } | 59 | } |
@@ -7,47 +7,47 @@ | @@ -7,47 +7,47 @@ | ||
7 | 7 | ||
8 | */ | 8 | */ |
9 | 9 | ||
10 | -layui.define(['laytpl', 'layer', 'element', 'util'], function(exports){ | 10 | +layui.define(['laytpl', 'layer', 'element', 'util'], function (exports) { |
11 | exports('setter', { | 11 | exports('setter', { |
12 | container: 'LAY_app' //容器ID | 12 | container: 'LAY_app' //容器ID |
13 | - ,base: layui.cache.base //记录layuiAdmin文件夹所在路径 | ||
14 | - ,views: layui.cache.base + 'views/' //视图所在目录 | ||
15 | - ,entry: 'index' //默认视图文件名 | ||
16 | - ,engine: '.html' //视图文件后缀名 | ||
17 | - ,pageTabs: true //是否开启页面选项卡功能。单页版不推荐开启 | 13 | + , base: layui.cache.base //记录layuiAdmin文件夹所在路径 |
14 | + , views: layui.cache.base + 'views/' //视图所在目录 | ||
15 | + , entry: 'index' //默认视图文件名 | ||
16 | + , engine: '.html' //视图文件后缀名 | ||
17 | + , pageTabs: true //是否开启页面选项卡功能。单页版不推荐开启 | ||
18 | 18 | ||
19 | - ,name: ' ' | ||
20 | - ,tableName: 'layuiAdmin' //本地存储表名 | ||
21 | - ,MOD_NAME: 'admin' //模块事件名 | 19 | + , name: ' ' |
20 | + , tableName: 'layuiAdmin' //本地存储表名 | ||
21 | + , MOD_NAME: 'admin' //模块事件名 | ||
22 | 22 | ||
23 | - ,debug: true //是否开启调试模式。如开启,接口异常时会抛出异常 URL 等信息 | 23 | + , debug: true //是否开启调试模式。如开启,接口异常时会抛出异常 URL 等信息 |
24 | 24 | ||
25 | - ,interceptor: true //是否开启未登入拦截 | 25 | + , interceptor: true //是否开启未登入拦截 |
26 | 26 | ||
27 | //自定义请求字段 | 27 | //自定义请求字段 |
28 | - ,request: { | 28 | + , request: { |
29 | tokenName: 'access_token' //自动携带 token 的字段名。可设置 false 不携带。 | 29 | tokenName: 'access_token' //自动携带 token 的字段名。可设置 false 不携带。 |
30 | } | 30 | } |
31 | 31 | ||
32 | //自定义响应字段 | 32 | //自定义响应字段 |
33 | - ,response: { | 33 | + , response: { |
34 | statusName: 'code' //数据状态的字段名称 | 34 | statusName: 'code' //数据状态的字段名称 |
35 | - ,statusCode: { | 35 | + , statusCode: { |
36 | ok: 0 //数据状态一切正常的状态码 | 36 | ok: 0 //数据状态一切正常的状态码 |
37 | - ,logout: 1001 //登录状态失效的状态码 | 37 | + , logout: 1001 //登录状态失效的状态码 |
38 | } | 38 | } |
39 | - ,msgName: 'msg' //状态信息的字段名称 | ||
40 | - ,dataName: 'data' //数据详情的字段名称 | 39 | + , msgName: 'msg' //状态信息的字段名称 |
40 | + , dataName: 'data' //数据详情的字段名称 | ||
41 | } | 41 | } |
42 | 42 | ||
43 | //独立页面路由,可随意添加(无需写参数) | 43 | //独立页面路由,可随意添加(无需写参数) |
44 | - ,indPage: [ | 44 | + , indPage: [ |
45 | '/user/login', //登入页 | 45 | '/user/login', //登入页 |
46 | '/page/forward' // 听云访问系统页面 | 46 | '/page/forward' // 听云访问系统页面 |
47 | ] | 47 | ] |
48 | 48 | ||
49 | //扩展的第三方模块 | 49 | //扩展的第三方模块 |
50 | - ,extend: [ | 50 | + , extend: [ |
51 | 'lay', | 51 | 'lay', |
52 | 'swiper', | 52 | 'swiper', |
53 | 'jtopo', | 53 | 'jtopo', |
@@ -78,85 +78,85 @@ layui.define(['laytpl', 'layer', 'element', 'util'], function(exports){ | @@ -78,85 +78,85 @@ layui.define(['laytpl', 'layer', 'element', 'util'], function(exports){ | ||
78 | ] | 78 | ] |
79 | 79 | ||
80 | //主题配置 | 80 | //主题配置 |
81 | - ,theme: { | 81 | + , theme: { |
82 | //内置主题配色方案 | 82 | //内置主题配色方案 |
83 | color: [{ | 83 | color: [{ |
84 | main: '#20222A' //主题色 | 84 | main: '#20222A' //主题色 |
85 | - ,selected: '#009688' //选中色 | ||
86 | - ,alias: 'default' //默认别名 | ||
87 | - },{ | 85 | + , selected: '#009688' //选中色 |
86 | + , alias: 'default' //默认别名 | ||
87 | + }, { | ||
88 | main: '#03152A' | 88 | main: '#03152A' |
89 | - ,selected: '#3B91FF' | ||
90 | - ,alias: 'dark-blue' //藏蓝 | ||
91 | - },{ | 89 | + , selected: '#3B91FF' |
90 | + , alias: 'dark-blue' //藏蓝 | ||
91 | + }, { | ||
92 | main: '#2E241B' | 92 | main: '#2E241B' |
93 | - ,selected: '#A48566' | ||
94 | - ,alias: 'coffee' //咖啡 | ||
95 | - },{ | 93 | + , selected: '#A48566' |
94 | + , alias: 'coffee' //咖啡 | ||
95 | + }, { | ||
96 | main: '#50314F' | 96 | main: '#50314F' |
97 | - ,selected: '#7A4D7B' | ||
98 | - ,alias: 'purple-red' //紫红 | ||
99 | - },{ | 97 | + , selected: '#7A4D7B' |
98 | + , alias: 'purple-red' //紫红 | ||
99 | + }, { | ||
100 | main: '#344058' | 100 | main: '#344058' |
101 | - ,logo: '#1E9FFF' | ||
102 | - ,selected: '#1E9FFF' | ||
103 | - ,alias: 'ocean' //海洋 | ||
104 | - },{ | 101 | + , logo: '#1E9FFF' |
102 | + , selected: '#1E9FFF' | ||
103 | + , alias: 'ocean' //海洋 | ||
104 | + }, { | ||
105 | main: '#3A3D49' | 105 | main: '#3A3D49' |
106 | - ,logo: '#2F9688' | ||
107 | - ,selected: '#5FB878' | ||
108 | - ,alias: 'green' //墨绿 | ||
109 | - },{ | 106 | + , logo: '#2F9688' |
107 | + , selected: '#5FB878' | ||
108 | + , alias: 'green' //墨绿 | ||
109 | + }, { | ||
110 | main: '#20222A' | 110 | main: '#20222A' |
111 | - ,logo: '#F78400' | ||
112 | - ,selected: '#F78400' | ||
113 | - ,alias: 'red' //橙色 | ||
114 | - },{ | 111 | + , logo: '#F78400' |
112 | + , selected: '#F78400' | ||
113 | + , alias: 'red' //橙色 | ||
114 | + }, { | ||
115 | main: '#28333E' | 115 | main: '#28333E' |
116 | - ,logo: '#AA3130' | ||
117 | - ,selected: '#AA3130' | ||
118 | - ,alias: 'fashion-red' //时尚红 | ||
119 | - },{ | 116 | + , logo: '#AA3130' |
117 | + , selected: '#AA3130' | ||
118 | + , alias: 'fashion-red' //时尚红 | ||
119 | + }, { | ||
120 | main: '#24262F' | 120 | main: '#24262F' |
121 | - ,logo: '#3A3D49' | ||
122 | - ,selected: '#009688' | ||
123 | - ,alias: 'classic-black' //经典黑 | ||
124 | - },{ | 121 | + , logo: '#3A3D49' |
122 | + , selected: '#009688' | ||
123 | + , alias: 'classic-black' //经典黑 | ||
124 | + }, { | ||
125 | logo: '#226A62' | 125 | logo: '#226A62' |
126 | - ,header: '#2F9688' | ||
127 | - ,alias: 'green-header' //墨绿头 | ||
128 | - },{ | 126 | + , header: '#2F9688' |
127 | + , alias: 'green-header' //墨绿头 | ||
128 | + }, { | ||
129 | main: '#344058' | 129 | main: '#344058' |
130 | - ,logo: '#0085E8' | ||
131 | - ,selected: '#1E9FFF' | ||
132 | - ,header: '#1E9FFF' | ||
133 | - ,alias: 'ocean-header' //海洋头 | ||
134 | - },{ | 130 | + , logo: '#0085E8' |
131 | + , selected: '#1E9FFF' | ||
132 | + , header: '#1E9FFF' | ||
133 | + , alias: 'ocean-header' //海洋头 | ||
134 | + }, { | ||
135 | header: '#393D49' | 135 | header: '#393D49' |
136 | - ,alias: 'classic-black-header' //经典黑 | ||
137 | - },{ | 136 | + , alias: 'classic-black-header' //经典黑 |
137 | + }, { | ||
138 | main: '#50314F' | 138 | main: '#50314F' |
139 | - ,logo: '#50314F' | ||
140 | - ,selected: '#7A4D7B' | ||
141 | - ,header: '#50314F' | ||
142 | - ,alias: 'purple-red-header' //紫红头 | ||
143 | - },{ | 139 | + , logo: '#50314F' |
140 | + , selected: '#7A4D7B' | ||
141 | + , header: '#50314F' | ||
142 | + , alias: 'purple-red-header' //紫红头 | ||
143 | + }, { | ||
144 | main: '#28333E' | 144 | main: '#28333E' |
145 | - ,logo: '#28333E' | ||
146 | - ,selected: '#AA3130' | ||
147 | - ,header: '#AA3130' | ||
148 | - ,alias: 'fashion-red-header' //时尚红头 | ||
149 | - },{ | 145 | + , logo: '#28333E' |
146 | + , selected: '#AA3130' | ||
147 | + , header: '#AA3130' | ||
148 | + , alias: 'fashion-red-header' //时尚红头 | ||
149 | + }, { | ||
150 | main: '#28333E' | 150 | main: '#28333E' |
151 | - ,logo: '#009688' | ||
152 | - ,selected: '#009688' | ||
153 | - ,header: '#009688' | ||
154 | - ,alias: 'green-header' //墨绿头 | 151 | + , logo: '#009688' |
152 | + , selected: '#009688' | ||
153 | + , header: '#009688' | ||
154 | + , alias: 'green-header' //墨绿头 | ||
155 | }] | 155 | }] |
156 | 156 | ||
157 | //初始的颜色索引,对应上面的配色方案数组索引 | 157 | //初始的颜色索引,对应上面的配色方案数组索引 |
158 | //如果本地已经有主题色记录,则以本地记录为优先,除非请求本地数据(localStorage) | 158 | //如果本地已经有主题色记录,则以本地记录为优先,除非请求本地数据(localStorage) |
159 | - ,initColorIndex: 1 | 159 | + , initColorIndex: 1 |
160 | } | 160 | } |
161 | }); | 161 | }); |
162 | }); | 162 | }); |
@@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
3 | * @author yh | 3 | * @author yh |
4 | * @date 2021/4/23 14:03 | 4 | * @date 2021/4/23 14:03 |
5 | **/ | 5 | **/ |
6 | -layui.define(['commonDetail','common'], function (exports) { | 6 | +layui.define(['commonDetail', 'common'], function (exports) { |
7 | var commonDetail = layui.commonDetail; | 7 | var commonDetail = layui.commonDetail; |
8 | var common = layui.common; | 8 | var common = layui.common; |
9 | //对外暴露的接口 | 9 | //对外暴露的接口 |
@@ -11,10 +11,10 @@ layui.define(['commonDetail','common'], function (exports) { | @@ -11,10 +11,10 @@ layui.define(['commonDetail','common'], function (exports) { | ||
11 | var resId = ''; | 11 | var resId = ''; |
12 | var resType = ''; | 12 | var resType = ''; |
13 | var showFlag = common.getUrlParam("show"); | 13 | var showFlag = common.getUrlParam("show"); |
14 | - if(showFlag && showFlag == '0'){ | 14 | + if (showFlag && showFlag == '0') { |
15 | resId = common.getUrlParam("resId"); | 15 | resId = common.getUrlParam("resId"); |
16 | resType = common.getUrlParam("resType"); | 16 | resType = common.getUrlParam("resType"); |
17 | - }else{ | 17 | + } else { |
18 | resId = data.resId; | 18 | resId = data.resId; |
19 | resType = data.resType; | 19 | resType = data.resType; |
20 | } | 20 | } |
@@ -33,27 +33,27 @@ layui.define(['commonDetail','common'], function (exports) { | @@ -33,27 +33,27 @@ layui.define(['commonDetail','common'], function (exports) { | ||
33 | 33 | ||
34 | //渲染页面 | 34 | //渲染页面 |
35 | function reload() { | 35 | function reload() { |
36 | - commonDetail.renderText("a_cloud_physicshost_baseinfo",resId,jbxxKpi); | 36 | + commonDetail.renderText("a_cloud_physicshost_baseinfo", resId, jbxxKpi); |
37 | //cpu使用率 | 37 | //cpu使用率 |
38 | // commonDetail.renderGauge("a_cloud_physicshost_cpurate",resId,"KPI7054BC34",true); | 38 | // commonDetail.renderGauge("a_cloud_physicshost_cpurate",resId,"KPI7054BC34",true); |
39 | - commonDetail.renderLineCharat("a_cloud_physicshost_cpurate",resId,"KPI7054BC34","CPU使用率","cpu"); | 39 | + commonDetail.renderLineCharat("a_cloud_physicshost_cpurate", resId, "KPI7054BC34", "CPU使用率", "cpu"); |
40 | //内存使用率 | 40 | //内存使用率 |
41 | // commonDetail.renderGauge("a_cloud_physicshost_memeryrate",resId,"KPI31CB8D97",true); | 41 | // commonDetail.renderGauge("a_cloud_physicshost_memeryrate",resId,"KPI31CB8D97",true); |
42 | - commonDetail.renderLineCharat("a_cloud_physicshost_memeryrate",resId,"KPI31CB8D97","内存使用率","mem"); | 42 | + commonDetail.renderLineCharat("a_cloud_physicshost_memeryrate", resId, "KPI31CB8D97", "内存使用率", "mem"); |
43 | //文件系统信息 | 43 | //文件系统信息 |
44 | - commonDetail.renderTable("a_cloud_physicshost_filesystem",false,resId,filesystemkpi,'文件系统信息','filesystem-'); | 44 | + commonDetail.renderTable("a_cloud_physicshost_filesystem", false, resId, filesystemkpi, '文件系统信息', 'filesystem-'); |
45 | //网络接口信息 | 45 | //网络接口信息 |
46 | - commonDetail.renderTable("a_cloud_physicshost_interface",false,resId,interfacekpi,'网络接口信息','interface-'); | 46 | + commonDetail.renderTable("a_cloud_physicshost_interface", false, resId, interfacekpi, '网络接口信息', 'interface-'); |
47 | //存储信息 | 47 | //存储信息 |
48 | - commonDetail.renderTable("a_cloud_physicshost_storage",false,resId,storagekpi,'设备主机信息','storage-'); | 48 | + commonDetail.renderTable("a_cloud_physicshost_storage", false, resId, storagekpi, '设备主机信息', 'storage-'); |
49 | //活动告警 | 49 | //活动告警 |
50 | - commonDetail.renderActiveAlarms("a_cloud_physicshost_alarms",resId); | 50 | + commonDetail.renderActiveAlarms("a_cloud_physicshost_alarms", resId); |
51 | } | 51 | } |
52 | 52 | ||
53 | //定时任务 | 53 | //定时任务 |
54 | var timer = setInterval(function () { | 54 | var timer = setInterval(function () { |
55 | reload() | 55 | reload() |
56 | - },commonDetail.timerTime); | 56 | + }, commonDetail.timerTime); |
57 | commonDetail.detailTimer.push(timer); | 57 | commonDetail.detailTimer.push(timer); |
58 | 58 | ||
59 | }); | 59 | }); |
1 | /** 关于系统*/ | 1 | /** 关于系统*/ |
2 | -layui.define([ 'table', 'form', 'admin', 'common','sessions','upload'], function (exports) { | 2 | +layui.define(['table', 'form', 'admin', 'common', 'sessions', 'upload'], function (exports) { |
3 | var $ = layui.$; | 3 | var $ = layui.$; |
4 | var form = layui.form; | 4 | var form = layui.form; |
5 | var tree = layui.tree; | 5 | var tree = layui.tree; |
@@ -20,107 +20,107 @@ layui.define([ 'table', 'form', 'admin', 'common','sessions','upload'], function | @@ -20,107 +20,107 @@ layui.define([ 'table', 'form', 'admin', 'common','sessions','upload'], function | ||
20 | //检索事件 | 20 | //检索事件 |
21 | serachEvent(); | 21 | serachEvent(); |
22 | //上传操作 | 22 | //上传操作 |
23 | - $("#doc_upload").on("click",function () { | 23 | + $("#doc_upload").on("click", function () { |
24 | var $content = $("#doc-upload-form"); | 24 | var $content = $("#doc-upload-form"); |
25 | //打开选择文件弹框 | 25 | //打开选择文件弹框 |
26 | layer.open({ | 26 | layer.open({ |
27 | type: 1 | 27 | type: 1 |
28 | - ,title: "选择文件" //不显示标题栏 | ||
29 | - ,closeBtn: false | ||
30 | - ,area: ['500px', '300px'] | ||
31 | - ,shade: 0.8 | ||
32 | - ,id: 'doc-upload-form-id' //设定一个id,防止重复弹出 | ||
33 | - ,btn: ['上传', '取消'] | ||
34 | - ,content: $content.html() | ||
35 | - ,yes: function(index, layero){ | ||
36 | - if($("#doc-display-file-name").val()){ | 28 | + , title: "选择文件" //不显示标题栏 |
29 | + , closeBtn: false | ||
30 | + , area: ['500px', '300px'] | ||
31 | + , shade: 0.8 | ||
32 | + , id: 'doc-upload-form-id' //设定一个id,防止重复弹出 | ||
33 | + , btn: ['上传', '取消'] | ||
34 | + , content: $content.html() | ||
35 | + , yes: function (index, layero) { | ||
36 | + if ($("#doc-display-file-name").val()) { | ||
37 | //点击上传按钮 | 37 | //点击上传按钮 |
38 | $("#doc-upload-actionbtn").trigger("click"); | 38 | $("#doc-upload-actionbtn").trigger("click"); |
39 | - }else{ | 39 | + } else { |
40 | layer.msg('请选择要上传的文件!', { | 40 | layer.msg('请选择要上传的文件!', { |
41 | - icon: 7,time:3000 | 41 | + icon: 7, time: 3000 |
42 | }); | 42 | }); |
43 | } | 43 | } |
44 | return false; | 44 | return false; |
45 | } | 45 | } |
46 | }); | 46 | }); |
47 | 47 | ||
48 | - var param = {"category":nodeId,"access_token":localStorage.getItem("access_token")}; | 48 | + var param = {"category": nodeId, "access_token": localStorage.getItem("access_token")}; |
49 | //上传 | 49 | //上传 |
50 | var uploadFile = upload.render({ | 50 | var uploadFile = upload.render({ |
51 | elem: '#doc-display-file-name' | 51 | elem: '#doc-display-file-name' |
52 | - , url: common.domainName+'/api-web/inspection/document/upload' | 52 | + , url: common.domainName + '/api-web/inspection/document/upload' |
53 | , auto: false | 53 | , auto: false |
54 | , accept: 'file' | 54 | , accept: 'file' |
55 | - , data:param | 55 | + , data: param |
56 | , exts: 'xls|doc|pdf|rar|zip|docx|xlsx|txt|jpg|log' | 56 | , exts: 'xls|doc|pdf|rar|zip|docx|xlsx|txt|jpg|log' |
57 | - ,choose: function(obj){ | 57 | + , choose: function (obj) { |
58 | var files = this.files = obj.pushFile(); //将每次选择的文件追加到文件队列 | 58 | var files = this.files = obj.pushFile(); //将每次选择的文件追加到文件队列 |
59 | //读取本地文件 | 59 | //读取本地文件 |
60 | - obj.preview(function(index, file, result){ | 60 | + obj.preview(function (index, file, result) { |
61 | // 验证文件是否合规 | 61 | // 验证文件是否合规 |
62 | admin.req({ | 62 | admin.req({ |
63 | - url: common.domainName+'/api-web/inspection/document/check?fileName='+file.name, | 63 | + url: common.domainName + '/api-web/inspection/document/check?fileName=' + file.name, |
64 | async: false | 64 | async: false |
65 | }).done(function (res) { | 65 | }).done(function (res) { |
66 | // 10 文件不符合规则 20 文件不存在 21 文件已存在 | 66 | // 10 文件不符合规则 20 文件不存在 21 文件已存在 |
67 | - if(res.data == 20){ | 67 | + if (res.data == 20) { |
68 | $("#doc-display-file-name").val(file.name); | 68 | $("#doc-display-file-name").val(file.name); |
69 | - }else{ | ||
70 | - if(res.data == 10){ | 69 | + } else { |
70 | + if (res.data == 10) { | ||
71 | layer.msg('文件名不符合规则!', { | 71 | layer.msg('文件名不符合规则!', { |
72 | - icon: 7,time:3000 | 72 | + icon: 7, time: 3000 |
73 | }); | 73 | }); |
74 | delete files[index]; | 74 | delete files[index]; |
75 | - }else{ | 75 | + } else { |
76 | $("#doc-display-file-name").val(file.name); | 76 | $("#doc-display-file-name").val(file.name); |
77 | layer.msg('检测到该文件已存在,执行上传操作文件将被覆盖!', { | 77 | layer.msg('检测到该文件已存在,执行上传操作文件将被覆盖!', { |
78 | - icon: 7,time:3000 | 78 | + icon: 7, time: 3000 |
79 | }); | 79 | }); |
80 | } | 80 | } |
81 | } | 81 | } |
82 | }); | 82 | }); |
83 | }); | 83 | }); |
84 | } | 84 | } |
85 | - ,done: function(res){ | 85 | + , done: function (res) { |
86 | // 上传成功 | 86 | // 上传成功 |
87 | - if(res && res["status"] == 1){ | 87 | + if (res && res["status"] == 1) { |
88 | delete res["createTime"]; | 88 | delete res["createTime"]; |
89 | // 获取用户信息 | 89 | // 获取用户信息 |
90 | // res["authUser"] = param["authUser"]; | 90 | // res["authUser"] = param["authUser"]; |
91 | res["access_token"] = accessToken; | 91 | res["access_token"] = accessToken; |
92 | - res["docType"] ="doc"; | 92 | + res["docType"] = "doc"; |
93 | // 发起保存操作 | 93 | // 发起保存操作 |
94 | admin.req({ | 94 | admin.req({ |
95 | url: common.domainName + '/api-web/inspection/document/save', | 95 | url: common.domainName + '/api-web/inspection/document/save', |
96 | async: false, | 96 | async: false, |
97 | type: "post", | 97 | type: "post", |
98 | - data : res | 98 | + data: res |
99 | }).done(function (res) { | 99 | }).done(function (res) { |
100 | - if(res.data){ | 100 | + if (res.data) { |
101 | layer.msg('文档上传成功!', { | 101 | layer.msg('文档上传成功!', { |
102 | - icon: 1,time:2000 | ||
103 | - },function () { | 102 | + icon: 1, time: 2000 |
103 | + }, function () { | ||
104 | layer.closeAll(); | 104 | layer.closeAll(); |
105 | reloadDocTable(nodeId); | 105 | reloadDocTable(nodeId); |
106 | }); | 106 | }); |
107 | - }else{ | 107 | + } else { |
108 | layer.msg('文档上传失败!', { | 108 | layer.msg('文档上传失败!', { |
109 | - icon: 7,time:2000 | 109 | + icon: 7, time: 2000 |
110 | }); | 110 | }); |
111 | } | 111 | } |
112 | }); | 112 | }); |
113 | } | 113 | } |
114 | } | 114 | } |
115 | - ,error: function(index, upload){ | 115 | + , error: function (index, upload) { |
116 | // 上传失败 | 116 | // 上传失败 |
117 | layer.msg('文件上传时发生故障,请稍后再试!', { | 117 | layer.msg('文件上传时发生故障,请稍后再试!', { |
118 | - icon: 7,time:3000 | 118 | + icon: 7, time: 3000 |
119 | }); | 119 | }); |
120 | } | 120 | } |
121 | }); | 121 | }); |
122 | //上传请求操作 | 122 | //上传请求操作 |
123 | - $("#doc-upload-actionbtn").on("click",function(){ | 123 | + $("#doc-upload-actionbtn").on("click", function () { |
124 | uploadFile.upload(); | 124 | uploadFile.upload(); |
125 | }) | 125 | }) |
126 | }); | 126 | }); |
@@ -129,7 +129,7 @@ layui.define([ 'table', 'form', 'admin', 'common','sessions','upload'], function | @@ -129,7 +129,7 @@ layui.define([ 'table', 'form', 'admin', 'common','sessions','upload'], function | ||
129 | var ids = []; | 129 | var ids = []; |
130 | var data = table.checkStatus('aboutSystem_table').data; | 130 | var data = table.checkStatus('aboutSystem_table').data; |
131 | if (data.length == 0) { | 131 | if (data.length == 0) { |
132 | - layer.msg('请选择要下载的文件!', { icon: 7,time:3000 }); | 132 | + layer.msg('请选择要下载的文件!', {icon: 7, time: 3000}); |
133 | return false; | 133 | return false; |
134 | } | 134 | } |
135 | //将选中的报表ID放到集合中 | 135 | //将选中的报表ID放到集合中 |
@@ -137,7 +137,7 @@ layui.define([ 'table', 'form', 'admin', 'common','sessions','upload'], function | @@ -137,7 +137,7 @@ layui.define([ 'table', 'form', 'admin', 'common','sessions','upload'], function | ||
137 | ids.push(obj.id); | 137 | ids.push(obj.id); |
138 | }); | 138 | }); |
139 | ids = ids.toString(); | 139 | ids = ids.toString(); |
140 | - var path = common.domainName + '/api-web/inspection/document/download?access_token='+accessToken+"&ids="+ids; | 140 | + var path = common.domainName + '/api-web/inspection/document/download?access_token=' + accessToken + "&ids=" + ids; |
141 | window.open(path); | 141 | window.open(path); |
142 | 142 | ||
143 | }); | 143 | }); |
@@ -172,57 +172,62 @@ layui.define([ 'table', 'form', 'admin', 'common','sessions','upload'], function | @@ -172,57 +172,62 @@ layui.define([ 'table', 'form', 'admin', 'common','sessions','upload'], function | ||
172 | , url: common.domainName + '/api-web/inspection/document/list' | 172 | , url: common.domainName + '/api-web/inspection/document/list' |
173 | , where: { | 173 | , where: { |
174 | access_token: accessToken, | 174 | access_token: accessToken, |
175 | - name:$("#doc_keyword").val(), | ||
176 | - docNo:$("#doc_code").val(), | ||
177 | - category:nodeId, | ||
178 | - createUser:'', | 175 | + name: $("#doc_keyword").val(), |
176 | + docNo: $("#doc_code").val(), | ||
177 | + category: nodeId, | ||
178 | + createUser: '', | ||
179 | flag: 'true', | 179 | flag: 'true', |
180 | - docType:"doc" | 180 | + docType: "doc" |
181 | } | 181 | } |
182 | , height: 'full' | 182 | , height: 'full' |
183 | , page: { | 183 | , page: { |
184 | layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] | 184 | layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] |
185 | - ,theme: '#1E9FFF' | 185 | + , theme: '#1E9FFF' |
186 | } | 186 | } |
187 | - ,limit: common.limit | ||
188 | - ,limits: common.limits | 187 | + , limit: common.limit |
188 | + , limits: common.limits | ||
189 | , even: true | 189 | , even: true |
190 | , cols: [[ | 190 | , cols: [[ |
191 | - {type: 'checkbox',width:50} | ||
192 | - , {field: 'docNo', title: '文档编号', align: 'center',width:150} | ||
193 | - , {field: 'name', title: '文档名称', align: 'left', | ||
194 | - templet: '<div><span data-id="{{d.id}}" data-path="{{d.localPath}}" class="layui-table-link preview-btn">{{d.name}}</span></div>' } | ||
195 | - , {field: 'categoryName', title: '文档类型', align: 'center',width:200} | ||
196 | - , {field: 'createUserName', title: '提交人', align: 'center',width:150} | ||
197 | - , {field: 'createTime', title: '提交时间', align: 'center',width:170 | ||
198 | - ,templet:'<div>{{ layui.util.toDateString(d.createTime, "yyyy-MM-dd HH:mm:ss") }}</div>'} | 191 | + {type: 'checkbox', width: 50} |
192 | + , {field: 'docNo', title: '文档编号', align: 'center', width: 150} | ||
199 | , { | 193 | , { |
200 | - field: 'path', title: '下载', align: 'center',width:100, | ||
201 | - templet:function (v) { | ||
202 | - var url = common.domainName + '/api-web/inspection/document/download?access_token='+accessToken+"&ids="+v.id; | ||
203 | - return '<a class=" layui-table-link" href="'+url+'">下载</a>'; | 194 | + field: 'name', title: '文档名称', align: 'left', |
195 | + templet: '<div><span data-id="{{d.id}}" data-path="{{d.localPath}}" class="layui-table-link preview-btn">{{d.name}}</span></div>' | ||
204 | } | 196 | } |
197 | + , {field: 'categoryName', title: '文档类型', align: 'center', width: 200} | ||
198 | + , {field: 'createUserName', title: '提交人', align: 'center', width: 150} | ||
199 | + , { | ||
200 | + field: 'createTime', title: '提交时间', align: 'center', width: 170 | ||
201 | + , templet: '<div>{{ layui.util.toDateString(d.createTime, "yyyy-MM-dd HH:mm:ss") }}</div>' | ||
202 | + } | ||
203 | + , { | ||
204 | + field: 'path', title: '下载', align: 'center', width: 100, | ||
205 | + templet: function (v) { | ||
206 | + var url = common.domainName + '/api-web/inspection/document/download?access_token=' + accessToken + "&ids=" + v.id; | ||
207 | + return '<a class=" layui-table-link" href="' + url + '">下载</a>'; | ||
205 | } | 208 | } |
206 | - ]],done:function () { | 209 | + } |
210 | + ]], done: function () { | ||
207 | $('.preview-btn').on('click', function () { | 211 | $('.preview-btn').on('click', function () { |
208 | var id = $(this).data('id') | 212 | var id = $(this).data('id') |
209 | var localPath = $(this).data('path') | 213 | var localPath = $(this).data('path') |
210 | - common.openReport(id,'','','','',1) | 214 | + common.openReport(id, '', '', '', '', 1) |
211 | }) | 215 | }) |
212 | } | 216 | } |
213 | }); | 217 | }); |
214 | } | 218 | } |
219 | + | ||
215 | //刷新表格 | 220 | //刷新表格 |
216 | function reloadDocTable() { | 221 | function reloadDocTable() { |
217 | documentTable.reload({ | 222 | documentTable.reload({ |
218 | where: { | 223 | where: { |
219 | access_token: accessToken, | 224 | access_token: accessToken, |
220 | - name:$("#doc_keyword").val(), | ||
221 | - docNo:$("#doc_code").val(), | ||
222 | - createUser:'', | ||
223 | - category:nodeId, | 225 | + name: $("#doc_keyword").val(), |
226 | + docNo: $("#doc_code").val(), | ||
227 | + createUser: '', | ||
228 | + category: nodeId, | ||
224 | flag: 'true', | 229 | flag: 'true', |
225 | - docType:"doc" | 230 | + docType: "doc" |
226 | } | 231 | } |
227 | }) | 232 | }) |
228 | } | 233 | } |
1 | //活动告警 | 1 | //活动告警 |
2 | -layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 'sessions','commonDetail','soulTable', 'treeTable'], function (exports) { | 2 | +layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 'sessions', 'commonDetail', 'soulTable', 'treeTable'], function (exports) { |
3 | var $ = layui.$; | 3 | var $ = layui.$; |
4 | var form = layui.form; | 4 | var form = layui.form; |
5 | var layer = layui.layer; | 5 | var layer = layui.layer; |
@@ -9,7 +9,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -9,7 +9,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
9 | var laytpl = layui.laytpl; | 9 | var laytpl = layui.laytpl; |
10 | var treeTable = layui.treeTable; | 10 | var treeTable = layui.treeTable; |
11 | var common = layui.common; | 11 | var common = layui.common; |
12 | - var commonDetail=layui.commonDetail; | 12 | + var commonDetail = layui.commonDetail; |
13 | var domainName = common.domainName; | 13 | var domainName = common.domainName; |
14 | var todayStr = ''; | 14 | var todayStr = ''; |
15 | //对外暴露的接口 | 15 | //对外暴露的接口 |
@@ -25,8 +25,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -25,8 +25,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
25 | var alarmNo = router.search.alarmNo;//告警编号 | 25 | var alarmNo = router.search.alarmNo;//告警编号 |
26 | var busIdSelect; | 26 | var busIdSelect; |
27 | var busTypeList = []; | 27 | var busTypeList = []; |
28 | - if(!bizId){ | ||
29 | - bizId=''; | 28 | + if (!bizId) { |
29 | + bizId = ''; | ||
30 | } | 30 | } |
31 | if (resId) { | 31 | if (resId) { |
32 | resId = decodeURIComponent(resId); | 32 | resId = decodeURIComponent(resId); |
@@ -87,7 +87,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -87,7 +87,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
87 | parentId: item.parentId | 87 | parentId: item.parentId |
88 | } | 88 | } |
89 | }); | 89 | }); |
90 | - var bizTree=common.pidToChildren(bizList, 'value', 'parentId'); | 90 | + var bizTree = common.pidToChildren(bizList, 'value', 'parentId'); |
91 | 91 | ||
92 | // 影响业务下拉框 | 92 | // 影响业务下拉框 |
93 | busIdSelect = xmSelect.render({ | 93 | busIdSelect = xmSelect.render({ |
@@ -119,11 +119,11 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -119,11 +119,11 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
119 | data: bizTree, | 119 | data: bizTree, |
120 | on: function (data) { | 120 | on: function (data) { |
121 | if (data.arr.length != 0) { | 121 | if (data.arr.length != 0) { |
122 | - var str=''; | ||
123 | - $.each(data.arr,function (i,v) { | ||
124 | - str+=v.value+','; | 122 | + var str = ''; |
123 | + $.each(data.arr, function (i, v) { | ||
124 | + str += v.value + ','; | ||
125 | }) | 125 | }) |
126 | - bizId = str.substring(0,str.length-1); | 126 | + bizId = str.substring(0, str.length - 1); |
127 | } else { | 127 | } else { |
128 | bizId = ''; | 128 | bizId = ''; |
129 | } | 129 | } |
@@ -131,9 +131,9 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -131,9 +131,9 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
131 | reloadTable(); | 131 | reloadTable(); |
132 | } | 132 | } |
133 | }); | 133 | }); |
134 | - if(busIdSelect){ | 134 | + if (busIdSelect) { |
135 | //追加样式 | 135 | //追加样式 |
136 | - $('#bisTypeSearchBox').find('.xm-body').eq(0).css("width","230px"); | 136 | + $('#bisTypeSearchBox').find('.xm-body').eq(0).css("width", "230px"); |
137 | } | 137 | } |
138 | } else { | 138 | } else { |
139 | layer.msg('获取业务失败', {icon: 2}); | 139 | layer.msg('获取业务失败', {icon: 2}); |
@@ -145,13 +145,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -145,13 +145,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
145 | }); | 145 | }); |
146 | 146 | ||
147 | $.ajax({ | 147 | $.ajax({ |
148 | - url: common.domainName + '/api-web/manage/kpi/findKpiInAlarm?access_token='+accessToken+'&tableName=b_alarm', | 148 | + url: common.domainName + '/api-web/manage/kpi/findKpiInAlarm?access_token=' + accessToken + '&tableName=b_alarm', |
149 | type: "get", | 149 | type: "get", |
150 | - success:function (res) { | 150 | + success: function (res) { |
151 | var kpis = res.data; | 151 | var kpis = res.data; |
152 | var html = '<option value="">=指标名称=</option>' | 152 | var html = '<option value="">=指标名称=</option>' |
153 | - $.each(kpis,function (i,e) { | ||
154 | - html+='<option value="'+e.kpiId+'">'+e.kpiName+'</option>' | 153 | + $.each(kpis, function (i, e) { |
154 | + html += '<option value="' + e.kpiId + '">' + e.kpiName + '</option>' | ||
155 | }) | 155 | }) |
156 | $("#alarmKpiSearchBox").html(''); | 156 | $("#alarmKpiSearchBox").html(''); |
157 | $("#alarmKpiSearchBox").append(html); | 157 | $("#alarmKpiSearchBox").append(html); |
@@ -198,7 +198,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -198,7 +198,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
198 | height: 'auto', | 198 | height: 'auto', |
199 | data: resTypeTree, | 199 | data: resTypeTree, |
200 | on: function (data) { | 200 | on: function (data) { |
201 | - if(data.isAdd){ | 201 | + if (data.isAdd) { |
202 | if (data.arr.length != 0) { | 202 | if (data.arr.length != 0) { |
203 | resType = data.arr[0].value; | 203 | resType = data.arr[0].value; |
204 | } else { | 204 | } else { |
@@ -243,22 +243,28 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -243,22 +243,28 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
243 | admin.req({ | 243 | admin.req({ |
244 | url: common.domainName + '/api-web/home/alarm/clear/reason', | 244 | url: common.domainName + '/api-web/home/alarm/clear/reason', |
245 | type: "get", | 245 | type: "get", |
246 | - data:{ | 246 | + data: { |
247 | alarmId: ids.toString() | 247 | alarmId: ids.toString() |
248 | }, | 248 | }, |
249 | - done:function (data) { | 249 | + done: function (data) { |
250 | var clearReson = "暂无参考处理方案,请输入处理方案"; | 250 | var clearReson = "暂无参考处理方案,请输入处理方案"; |
251 | var hisReason = ""; | 251 | var hisReason = ""; |
252 | var reasonlist = data.reason; | 252 | var reasonlist = data.reason; |
253 | - if(reasonlist && reasonlist.length > 0){ | 253 | + if (reasonlist && reasonlist.length > 0) { |
254 | hisReason = "参考方案:\n"; | 254 | hisReason = "参考方案:\n"; |
255 | - $.each(reasonlist,function (i,v) { | 255 | + $.each(reasonlist, function (i, v) { |
256 | var idx = i + 1; | 256 | var idx = i + 1; |
257 | - hisReason += idx +":"+v +"\n"; | 257 | + hisReason += idx + ":" + v + "\n"; |
258 | }); | 258 | }); |
259 | } | 259 | } |
260 | 260 | ||
261 | - layer.prompt({id: "alarms_clear_id", title: '告警消除', area: ['400px'], formType: 2,value: hisReason}, function (text, index) { | 261 | + layer.prompt({ |
262 | + id: "alarms_clear_id", | ||
263 | + title: '告警消除', | ||
264 | + area: ['400px'], | ||
265 | + formType: 2, | ||
266 | + value: hisReason | ||
267 | + }, function (text, index) { | ||
262 | admin.req({ | 268 | admin.req({ |
263 | url: common.domainName + '/api-web/home/alarm/clear' | 269 | url: common.domainName + '/api-web/home/alarm/clear' |
264 | , type: "post" | 270 | , type: "post" |
@@ -546,10 +552,10 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -546,10 +552,10 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
546 | , btn: ['发送', '关闭'] | 552 | , btn: ['发送', '关闭'] |
547 | , yes: function () { | 553 | , yes: function () { |
548 | var names = []; | 554 | var names = []; |
549 | - $("input[class='userName']:checked").each(function(i){ | 555 | + $("input[class='userName']:checked").each(function (i) { |
550 | names.push($(this).attr("data-name")); | 556 | names.push($(this).attr("data-name")); |
551 | }); | 557 | }); |
552 | - if(names.length<1){ | 558 | + if (names.length < 1) { |
553 | layer.msg('请最少选择一个用户', {icon: 7, time: 2000}); | 559 | layer.msg('请最少选择一个用户', {icon: 7, time: 2000}); |
554 | return; | 560 | return; |
555 | } | 561 | } |
@@ -558,7 +564,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -558,7 +564,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
558 | , type: "post" | 564 | , type: "post" |
559 | , data: { | 565 | , data: { |
560 | ids: ids.toString(), | 566 | ids: ids.toString(), |
561 | - names:names.toString(), | 567 | + names: names.toString(), |
562 | access_token: accessToken | 568 | access_token: accessToken |
563 | } | 569 | } |
564 | , done: function (res) { | 570 | , done: function (res) { |
@@ -589,7 +595,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -589,7 +595,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
589 | domId: 'activewarningTable', | 595 | domId: 'activewarningTable', |
590 | moduleId: 'activewarning', | 596 | moduleId: 'activewarning', |
591 | resType: '' | 597 | resType: '' |
592 | - },function (retCols) { | 598 | + }, function (retCols) { |
593 | var cols = [ | 599 | var cols = [ |
594 | {type: 'checkbox', fixed: 'left'} | 600 | {type: 'checkbox', fixed: 'left'} |
595 | , { | 601 | , { |
@@ -611,7 +617,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -611,7 +617,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
611 | } | 617 | } |
612 | , { | 618 | , { |
613 | field: 'resName', title: '资源名称', width: 230, sort: true, | 619 | field: 'resName', title: '资源名称', width: 230, sort: true, |
614 | - templet:` | 620 | + templet: ` |
615 | <div> | 621 | <div> |
616 | {{# if (d.confirmStatus == 0 || d.confirmStatus == null) { }} | 622 | {{# if (d.confirmStatus == 0 || d.confirmStatus == null) { }} |
617 | <i lay-tips="新的告警未确认,告警确认后消失!" class="shake iconfont" style="color: red;font-size: 28px;"></i> | 623 | <i lay-tips="新的告警未确认,告警确认后消失!" class="shake iconfont" style="color: red;font-size: 28px;"></i> |
@@ -693,7 +699,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -693,7 +699,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
693 | durationVal: $('#inline-condition-duration input[name="durationVal"]').val(), | 699 | durationVal: $('#inline-condition-duration input[name="durationVal"]').val(), |
694 | durationUnit: $('#inline-condition-duration select[name="durationUnit"]').val(), | 700 | durationUnit: $('#inline-condition-duration select[name="durationUnit"]').val(), |
695 | netFlag: netFlag, | 701 | netFlag: netFlag, |
696 | - resType:resType | 702 | + resType: resType |
697 | } | 703 | } |
698 | , height: 'full-245' | 704 | , height: 'full-245' |
699 | , cellMinWidth: 80 | 705 | , cellMinWidth: 80 |
@@ -726,7 +732,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -726,7 +732,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
726 | durationVal: $('#inline-condition-duration input[name="durationVal"]').val(), | 732 | durationVal: $('#inline-condition-duration input[name="durationVal"]').val(), |
727 | durationUnit: $('#inline-condition-duration select[name="durationUnit"]').val(), | 733 | durationUnit: $('#inline-condition-duration select[name="durationUnit"]').val(), |
728 | netFlag: netFlag, | 734 | netFlag: netFlag, |
729 | - resType:resType | 735 | + resType: resType |
730 | }, | 736 | }, |
731 | success: function (res) { | 737 | success: function (res) { |
732 | var map = res.map; | 738 | var map = res.map; |
@@ -765,13 +771,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -765,13 +771,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
765 | var adminName = ''; | 771 | var adminName = ''; |
766 | var manageIp = ''; | 772 | var manageIp = ''; |
767 | var collProtocol = ''; | 773 | var collProtocol = ''; |
768 | - var sign='false'; | 774 | + var sign = 'false'; |
769 | $.ajax({ | 775 | $.ajax({ |
770 | - url: common.domainName + "/api-web/home/resource/findById?resId="+resId + '&access_token='+ accessToken, | 776 | + url: common.domainName + "/api-web/home/resource/findById?resId=" + resId + '&access_token=' + accessToken, |
771 | async: false, | 777 | async: false, |
772 | - type:'get', | 778 | + type: 'get', |
773 | success: function (res) { | 779 | success: function (res) { |
774 | - sign=res.str; | 780 | + sign = res.str; |
775 | var data = res.object; | 781 | var data = res.object; |
776 | resType = data.resType; | 782 | resType = data.resType; |
777 | adminName = data.adminName; | 783 | adminName = data.adminName; |
@@ -780,7 +786,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -780,7 +786,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
780 | resTypeName = data.resTypeName; | 786 | resTypeName = data.resTypeName; |
781 | } | 787 | } |
782 | }) | 788 | }) |
783 | - if(sign=='false'){ | 789 | + if (sign == 'false') { |
784 | layer.msg('当前用户暂无此资源权限!', {icon: 7, time: 3000}); | 790 | layer.msg('当前用户暂无此资源权限!', {icon: 7, time: 3000}); |
785 | return false; | 791 | return false; |
786 | } | 792 | } |
@@ -800,7 +806,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -800,7 +806,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
800 | title += ip + '|'; | 806 | title += ip + '|'; |
801 | } | 807 | } |
802 | } | 808 | } |
803 | - if (resType === 'HOST_X86SERVER' && collProtocol && collProtocol.indexOf('SNMP') !== -1 ) { | 809 | + if (resType === 'HOST_X86SERVER' && collProtocol && collProtocol.indexOf('SNMP') !== -1) { |
804 | if (manageIp) { | 810 | if (manageIp) { |
805 | title += '管理IP-' + manageIp + '|'; | 811 | title += '管理IP-' + manageIp + '|'; |
806 | } | 812 | } |
@@ -944,13 +950,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -944,13 +950,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
944 | }); | 950 | }); |
945 | } | 951 | } |
946 | 952 | ||
947 | - $("#todayOrAllBtn").unbind().on("click",function () { | 953 | + $("#todayOrAllBtn").unbind().on("click", function () { |
948 | var $that = $(this); | 954 | var $that = $(this); |
949 | var str = $(this).text(); | 955 | var str = $(this).text(); |
950 | - if(str.indexOf("今日") > -1){ | 956 | + if (str.indexOf("今日") > -1) { |
951 | $that.text("全部告警") | 957 | $that.text("全部告警") |
952 | todayStr = common.getToday('day'); | 958 | todayStr = common.getToday('day'); |
953 | - }else{ | 959 | + } else { |
954 | todayStr = '' | 960 | todayStr = '' |
955 | $that.text("今日告警") | 961 | $that.text("今日告警") |
956 | } | 962 | } |
@@ -960,14 +966,14 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -960,14 +966,14 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
960 | 966 | ||
961 | //刷新表格 | 967 | //刷新表格 |
962 | function reloadTable(type) { | 968 | function reloadTable(type) { |
963 | - if (type != 'sort'){ | 969 | + if (type != 'sort') { |
964 | sortKey = ''; | 970 | sortKey = ''; |
965 | } | 971 | } |
966 | activeAlarmTable.reload({ | 972 | activeAlarmTable.reload({ |
967 | page: { | 973 | page: { |
968 | curr: 1 | 974 | curr: 1 |
969 | } | 975 | } |
970 | - ,where: { | 976 | + , where: { |
971 | access_token: accessToken, | 977 | access_token: accessToken, |
972 | kpiName: $("#activewarningkw").val(), | 978 | kpiName: $("#activewarningkw").val(), |
973 | busId: bizId, | 979 | busId: bizId, |
@@ -982,8 +988,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -982,8 +988,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
982 | alarmKpi: $("#alarmKpiSearchBox").val(), | 988 | alarmKpi: $("#alarmKpiSearchBox").val(), |
983 | durationVal: $('#inline-condition-duration input[name="durationVal"]').val(), | 989 | durationVal: $('#inline-condition-duration input[name="durationVal"]').val(), |
984 | durationUnit: $('#inline-condition-duration select[name="durationUnit"]').val(), | 990 | durationUnit: $('#inline-condition-duration select[name="durationUnit"]').val(), |
985 | - alarmTimeDay:todayStr, | ||
986 | - resType:resType | 991 | + alarmTimeDay: todayStr, |
992 | + resType: resType | ||
987 | } | 993 | } |
988 | }); | 994 | }); |
989 | } | 995 | } |
@@ -1019,6 +1025,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -1019,6 +1025,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
1019 | var el = target.find('span'); | 1025 | var el = target.find('span'); |
1020 | var checked = target.find('input').prop('checked'); | 1026 | var checked = target.find('input').prop('checked'); |
1021 | localStorage.setItem('alarm_auto__flush', checked); | 1027 | localStorage.setItem('alarm_auto__flush', checked); |
1028 | + | ||
1022 | function fn() { | 1029 | function fn() { |
1023 | var second = el.data('second'); | 1030 | var second = el.data('second'); |
1024 | var checked = target.find('input').prop('checked'); | 1031 | var checked = target.find('input').prop('checked'); |
@@ -1038,13 +1045,15 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -1038,13 +1045,15 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
1038 | fn(); | 1045 | fn(); |
1039 | } | 1046 | } |
1040 | } | 1047 | } |
1048 | + | ||
1041 | if (checked) { | 1049 | if (checked) { |
1042 | timer = setTimeout(fn, 1000); | 1050 | timer = setTimeout(fn, 1000); |
1043 | } else { | 1051 | } else { |
1044 | clearTimeout(timer); | 1052 | clearTimeout(timer); |
1045 | } | 1053 | } |
1046 | } | 1054 | } |
1047 | - form.on("checkbox(warnActiveAutoFlush)",function (data) { | 1055 | + |
1056 | + form.on("checkbox(warnActiveAutoFlush)", function (data) { | ||
1048 | autoFlush(autoBtn); | 1057 | autoFlush(autoBtn); |
1049 | }) | 1058 | }) |
1050 | /*autoBtn.change(function () { | 1059 | /*autoBtn.change(function () { |
1 | //告警策略 | 1 | //告警策略 |
2 | -layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], function (exports) { | 2 | +layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], function (exports) { |
3 | var $ = layui.$; | 3 | var $ = layui.$; |
4 | var form = layui.form; | 4 | var form = layui.form; |
5 | var laydate = layui.laydate; | 5 | var laydate = layui.laydate; |
@@ -16,32 +16,33 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | @@ -16,32 +16,33 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | ||
16 | //初始化日期组件 | 16 | //初始化日期组件 |
17 | laydate.render({ | 17 | laydate.render({ |
18 | elem: '#seriousTimes' | 18 | elem: '#seriousTimes' |
19 | - ,type: 'time' | ||
20 | - ,range: true | 19 | + , type: 'time' |
20 | + , range: true | ||
21 | }); | 21 | }); |
22 | laydate.render({ | 22 | laydate.render({ |
23 | elem: '#importantTimes' | 23 | elem: '#importantTimes' |
24 | - ,type: 'time' | ||
25 | - ,range: true | 24 | + , type: 'time' |
25 | + , range: true | ||
26 | }); | 26 | }); |
27 | laydate.render({ | 27 | laydate.render({ |
28 | elem: '#commonlyTimes' | 28 | elem: '#commonlyTimes' |
29 | - ,type: 'time' | ||
30 | - ,range: true | 29 | + , type: 'time' |
30 | + , range: true | ||
31 | }); | 31 | }); |
32 | var resType = localStorage.getItem("currentResType"); | 32 | var resType = localStorage.getItem("currentResType"); |
33 | var NoticeMergeFlag = 'off'; | 33 | var NoticeMergeFlag = 'off'; |
34 | // 获取合并通知开关是否开启 | 34 | // 获取合并通知开关是否开启 |
35 | getNoticeMergeFlag(); | 35 | getNoticeMergeFlag(); |
36 | - function getNoticeMergeFlag(){ | 36 | + |
37 | + function getNoticeMergeFlag() { | ||
37 | admin.req({ | 38 | admin.req({ |
38 | url: common.domainName + '/api-web/manage/ddic/findSucDdics/noticeMergeFlag' | 39 | url: common.domainName + '/api-web/manage/ddic/findSucDdics/noticeMergeFlag' |
39 | , method: 'POST' | 40 | , method: 'POST' |
40 | , async: false | 41 | , async: false |
41 | , success: function (res) { | 42 | , success: function (res) { |
42 | $.each(res.data, function (i, v) { | 43 | $.each(res.data, function (i, v) { |
43 | - if(v.ddicCode == 'on'){ | ||
44 | - NoticeMergeFlag= 'on'; | 44 | + if (v.ddicCode == 'on') { |
45 | + NoticeMergeFlag = 'on'; | ||
45 | $('#noticeMergeTab').show(); | 46 | $('#noticeMergeTab').show(); |
46 | } | 47 | } |
47 | }); | 48 | }); |
@@ -50,17 +51,17 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | @@ -50,17 +51,17 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | ||
50 | } | 51 | } |
51 | 52 | ||
52 | //编辑 | 53 | //编辑 |
53 | - if(data && data.id){ | 54 | + if (data && data.id) { |
54 | admin.req({ | 55 | admin.req({ |
55 | - url:domainName + '/api-web/alarmPolicy/getbyId/'+data.id | ||
56 | - ,done:function (res){ | 56 | + url: domainName + '/api-web/alarmPolicy/getbyId/' + data.id |
57 | + , done: function (res) { | ||
57 | exprToChar(res.object, 'alarmContentExpr'); | 58 | exprToChar(res.object, 'alarmContentExpr'); |
58 | exprToChar(res.object, 'cleanPolicy'); | 59 | exprToChar(res.object, 'cleanPolicy'); |
59 | exprToChar(res.object, 'commonlyExpr'); | 60 | exprToChar(res.object, 'commonlyExpr'); |
60 | exprToChar(res.object, 'importantExpr'); | 61 | exprToChar(res.object, 'importantExpr'); |
61 | exprToChar(res.object, 'seriousExpr'); | 62 | exprToChar(res.object, 'seriousExpr'); |
62 | - form.val("add-alarmpolicy-form",res.object); | ||
63 | - $("#alarm-policy-kpiName").val(res.object.kpiId +" "+ res.object.kpiName); | 63 | + form.val("add-alarmpolicy-form", res.object); |
64 | + $("#alarm-policy-kpiName").val(res.object.kpiId + " " + res.object.kpiName); | ||
64 | $("#seriousTimes").val(res.object.seriousTimes); | 65 | $("#seriousTimes").val(res.object.seriousTimes); |
65 | $("#importantTimes").val(res.object.importantTimes); | 66 | $("#importantTimes").val(res.object.importantTimes); |
66 | $("#commonlyTimes").val(res.object.commonlyTimes); | 67 | $("#commonlyTimes").val(res.object.commonlyTimes); |
@@ -69,13 +70,13 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | @@ -69,13 +70,13 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | ||
69 | }); | 70 | }); |
70 | // 获取通知合并策略的表达式 | 71 | // 获取通知合并策略的表达式 |
71 | admin.req({ | 72 | admin.req({ |
72 | - url:domainName + '/api-web/policyMerge/get?noticeMergePolicyId='+data.id | ||
73 | - ,done:function (res){ | 73 | + url: domainName + '/api-web/policyMerge/get?noticeMergePolicyId=' + data.id |
74 | + , done: function (res) { | ||
74 | $("#noticeMergeFlagExpr").val(res.data[0].noticeMergeExpr); | 75 | $("#noticeMergeFlagExpr").val(res.data[0].noticeMergeExpr); |
75 | } | 76 | } |
76 | }); | 77 | }); |
77 | 78 | ||
78 | - }else{ | 79 | + } else { |
79 | $("#seriousTimes").val('00:00:00 - 23:59:59'); | 80 | $("#seriousTimes").val('00:00:00 - 23:59:59'); |
80 | $("#importantTimes").val('00:00:00 - 23:59:59'); | 81 | $("#importantTimes").val('00:00:00 - 23:59:59'); |
81 | $("#commonlyTimes").val('00:00:00 - 23:59:59'); | 82 | $("#commonlyTimes").val('00:00:00 - 23:59:59'); |
@@ -85,14 +86,14 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | @@ -85,14 +86,14 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | ||
85 | return false; | 86 | return false; |
86 | }); | 87 | }); |
87 | //全天 | 88 | //全天 |
88 | - $(".allday").on("click",function (){ | 89 | + $(".allday").on("click", function () { |
89 | var id = $(this).data("flag"); | 90 | var id = $(this).data("flag"); |
90 | - $("#"+id).val('00:00:00 - 23:59:59'); | 91 | + $("#" + id).val('00:00:00 - 23:59:59'); |
91 | }); | 92 | }); |
92 | //工作时间 | 93 | //工作时间 |
93 | - $(".worktime").on("click",function (){ | 94 | + $(".worktime").on("click", function () { |
94 | var id = $(this).data("flag"); | 95 | var id = $(this).data("flag"); |
95 | - $("#"+id).val('08:00:00 - 19:59:59'); | 96 | + $("#" + id).val('08:00:00 - 19:59:59'); |
96 | }); | 97 | }); |
97 | $('.noticeExpr').unbind('click').on('click', function () { | 98 | $('.noticeExpr').unbind('click').on('click', function () { |
98 | var id = $(this).prop('id'); | 99 | var id = $(this).prop('id'); |
@@ -104,7 +105,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | @@ -104,7 +105,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | ||
104 | editNoticeExpr($(this).val(), alarmTimes, id); | 105 | editNoticeExpr($(this).val(), alarmTimes, id); |
105 | }); | 106 | }); |
106 | //指标信息 | 107 | //指标信息 |
107 | - if(data.kpiId){ | 108 | + if (data.kpiId) { |
108 | $("#alarm-policy-kpiId").val(data.kpiId); | 109 | $("#alarm-policy-kpiId").val(data.kpiId); |
109 | $("#alarm-policy-kpiName").val(data.kpiId + " " + data.name); | 110 | $("#alarm-policy-kpiName").val(data.kpiId + " " + data.name); |
110 | } | 111 | } |
@@ -112,48 +113,48 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | @@ -112,48 +113,48 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | ||
112 | //告警规则类型切换事件 | 113 | //告警规则类型切换事件 |
113 | form.on('radio(alarm-policy-rule-type)', function (data) { | 114 | form.on('radio(alarm-policy-rule-type)', function (data) { |
114 | var flag = $(data.elem).data("flag"); | 115 | var flag = $(data.elem).data("flag"); |
115 | - if(data.value == '1'){ | 116 | + if (data.value == '1') { |
116 | $(`.${flag}-tab-item`).find("div.cont-base").show(); | 117 | $(`.${flag}-tab-item`).find("div.cont-base").show(); |
117 | - }else{ | 118 | + } else { |
118 | $(`.${flag}-tab-item`).find("div.cont-base").hide(); | 119 | $(`.${flag}-tab-item`).find("div.cont-base").hide(); |
119 | $(`#${flag}Policy`).val(''); | 120 | $(`#${flag}Policy`).val(''); |
120 | } | 121 | } |
121 | }); | 122 | }); |
122 | //选择指标 | 123 | //选择指标 |
123 | - $("#alarmpolicy-form-select-kpi, #alarm-policy-kpiName").unbind('click').on("click",function (){ | ||
124 | - common.openWin("template/res/reskpilist","选择指标", {resType:null},["选择","取消"], function () { | 124 | + $("#alarmpolicy-form-select-kpi, #alarm-policy-kpiName").unbind('click').on("click", function () { |
125 | + common.openWin("template/res/reskpilist", "选择指标", {resType: null}, ["选择", "取消"], function () { | ||
125 | var data = layui.reskpilist().getData(); | 126 | var data = layui.reskpilist().getData(); |
126 | - if(data && data.length != 1){ | ||
127 | - layer.msg('只能选择一个指标!', {icon: 7,time:3000}); | 127 | + if (data && data.length != 1) { |
128 | + layer.msg('只能选择一个指标!', {icon: 7, time: 3000}); | ||
128 | return false; | 129 | return false; |
129 | } | 130 | } |
130 | - if(data && data.length > 0){ | 131 | + if (data && data.length > 0) { |
131 | $("#alarm-policy-kpiId").val(data[0].kpiId); | 132 | $("#alarm-policy-kpiId").val(data[0].kpiId); |
132 | $("#alarm-policy-kpiName").val(data[0].kpiId + " " + data[0].kpiName); | 133 | $("#alarm-policy-kpiName").val(data[0].kpiId + " " + data[0].kpiName); |
133 | $("#alarmPolicyName").val(data[0].kpiName + "告警策略"); | 134 | $("#alarmPolicyName").val(data[0].kpiName + "告警策略"); |
134 | 135 | ||
135 | - var arry = [ "base", "cpu", "mem"]; | 136 | + var arry = ["base", "cpu", "mem"]; |
136 | return true; | 137 | return true; |
137 | } | 138 | } |
138 | }); | 139 | }); |
139 | }); | 140 | }); |
140 | 141 | ||
141 | //增加一行策略表达式输入框 | 142 | //增加一行策略表达式输入框 |
142 | - $("i.policy-input-add").off("click").on("click",function (){ | 143 | + $("i.policy-input-add").off("click").on("click", function () { |
143 | var id = $(this).data("id"); | 144 | var id = $(this).data("id"); |
144 | clonePolicyDoms(id); | 145 | clonePolicyDoms(id); |
145 | }); | 146 | }); |
146 | //删除告警策略规则行 | 147 | //删除告警策略规则行 |
147 | - $("i.policy-input-del").on("click",function (){ | 148 | + $("i.policy-input-del").on("click", function () { |
148 | var id = $(this).data("id"); | 149 | var id = $(this).data("id"); |
149 | $(`#${id}`).remove(); | 150 | $(`#${id}`).remove(); |
150 | }); | 151 | }); |
151 | 152 | ||
152 | 153 | ||
153 | //生成策略 | 154 | //生成策略 |
154 | - $("a.createpolicybtn").on("click",function (){ | 155 | + $("a.createpolicybtn").on("click", function () { |
155 | var kpiId = $("#alarm-policy-kpiId").val(); | 156 | var kpiId = $("#alarm-policy-kpiId").val(); |
156 | - if(!kpiId){ | 157 | + if (!kpiId) { |
157 | layer.msg("请先选择指标!", { | 158 | layer.msg("请先选择指标!", { |
158 | icon: 7 | 159 | icon: 7 |
159 | , time: 3000 | 160 | , time: 3000 |
@@ -161,30 +162,44 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | @@ -161,30 +162,44 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | ||
161 | return false; | 162 | return false; |
162 | } | 163 | } |
163 | var policyFlag = $(this).data("flag"); | 164 | var policyFlag = $(this).data("flag"); |
164 | - var conOjb = {"0":">","1":"<","2":"=","3":">=","4":"<=","5":"equals","6":"contains","7":"startsWith","8":"endsWith"}; | 165 | + var conOjb = { |
166 | + "0": ">", | ||
167 | + "1": "<", | ||
168 | + "2": "=", | ||
169 | + "3": ">=", | ||
170 | + "4": "<=", | ||
171 | + "5": "equals", | ||
172 | + "6": "contains", | ||
173 | + "7": "startsWith", | ||
174 | + "8": "endsWith" | ||
175 | + }; | ||
165 | var doms = $(`[id^=${policyFlag}-policy-box]`); | 176 | var doms = $(`[id^=${policyFlag}-policy-box]`); |
166 | var policyStr = ''; | 177 | var policyStr = ''; |
167 | - $(doms).each(function(i,v){ | 178 | + $(doms).each(function (i, v) { |
168 | var domId = $(v).attr("id"); | 179 | var domId = $(v).attr("id"); |
169 | - if(domId.indexOf("condition") != -1){//条件 | 180 | + if (domId.indexOf("condition") != -1) {//条件 |
170 | var open = $(v).find('.layui-form-switch').hasClass("layui-form-onswitch"); | 181 | var open = $(v).find('.layui-form-switch').hasClass("layui-form-onswitch"); |
171 | - if(open){ policyStr += "||" }else{ policyStr += "&&" } | ||
172 | - }else{ //值 | ||
173 | - var conditon = $(v).find("."+policyFlag+"_condition").val(); | ||
174 | - var cls = policyFlag +"_value"; | ||
175 | - var conval = $(v).find('[flag="'+cls+'"]').val().trim(); | ||
176 | - if(conval){ | ||
177 | - if(conditon < 5){ //数字类的 | 182 | + if (open) { |
183 | + policyStr += "||" | ||
184 | + } else { | ||
185 | + policyStr += "&&" | ||
186 | + } | ||
187 | + } else { //值 | ||
188 | + var conditon = $(v).find("." + policyFlag + "_condition").val(); | ||
189 | + var cls = policyFlag + "_value"; | ||
190 | + var conval = $(v).find('[flag="' + cls + '"]').val().trim(); | ||
191 | + if (conval) { | ||
192 | + if (conditon < 5) { //数字类的 | ||
178 | policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`; | 193 | policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`; |
179 | - }else{ //字符串类的 | 194 | + } else { //字符串类的 |
180 | policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`; | 195 | policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`; |
181 | } | 196 | } |
182 | } | 197 | } |
183 | } | 198 | } |
184 | }); | 199 | }); |
185 | - if(policyStr){ | 200 | + if (policyStr) { |
186 | $(`#${policyFlag}Policy`).val(policyStr); | 201 | $(`#${policyFlag}Policy`).val(policyStr); |
187 | - }else{ | 202 | + } else { |
188 | layer.msg("请先输入策略值!", { | 203 | layer.msg("请先输入策略值!", { |
189 | icon: 7 | 204 | icon: 7 |
190 | , time: 3000 | 205 | , time: 3000 |
@@ -194,7 +209,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | @@ -194,7 +209,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | ||
194 | }); | 209 | }); |
195 | 210 | ||
196 | //保存策略 | 211 | //保存策略 |
197 | - $("#alarmpolicy-form-save-id").on("click",function (){ | 212 | + $("#alarmpolicy-form-save-id").on("click", function () { |
198 | var data = form.val("add-alarmpolicy-form"); | 213 | var data = form.val("add-alarmpolicy-form"); |
199 | //移除非数进性的属性 | 214 | //移除非数进性的属性 |
200 | delete data['serious-policy-type']; | 215 | delete data['serious-policy-type']; |
@@ -208,7 +223,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | @@ -208,7 +223,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | ||
208 | data.commonlyTimes = $("#commonlyTimes").val(); | 223 | data.commonlyTimes = $("#commonlyTimes").val(); |
209 | var that = this; | 224 | var that = this; |
210 | 225 | ||
211 | - if(!data.kpiId){ | 226 | + if (!data.kpiId) { |
212 | layer.msg("请先选择指标!", { | 227 | layer.msg("请先选择指标!", { |
213 | icon: 7 | 228 | icon: 7 |
214 | , time: 3000 | 229 | , time: 3000 |
@@ -216,7 +231,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | @@ -216,7 +231,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | ||
216 | return false; | 231 | return false; |
217 | } | 232 | } |
218 | 233 | ||
219 | - if(!data.kpiId || data.kpiId == ''){ | 234 | + if (!data.kpiId || data.kpiId == '') { |
220 | layer.msg("请先选择指标!", { | 235 | layer.msg("请先选择指标!", { |
221 | icon: 7 | 236 | icon: 7 |
222 | , time: 3000 | 237 | , time: 3000 |
@@ -224,7 +239,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | @@ -224,7 +239,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | ||
224 | return false; | 239 | return false; |
225 | } | 240 | } |
226 | 241 | ||
227 | - if(!data.alarmContentExpr || data.alarmContentExpr == ''){ | 242 | + if (!data.alarmContentExpr || data.alarmContentExpr == '') { |
228 | layer.msg("请先填写告警内容描述表达式!", { | 243 | layer.msg("请先填写告警内容描述表达式!", { |
229 | icon: 7 | 244 | icon: 7 |
230 | , time: 3000 | 245 | , time: 3000 |
@@ -232,8 +247,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | @@ -232,8 +247,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | ||
232 | return false; | 247 | return false; |
233 | } | 248 | } |
234 | 249 | ||
235 | - if(NoticeMergeFlag && NoticeMergeFlag == 'on'){ | ||
236 | - if(!data.alarmContentExpr || data.alarmContentExpr == ''){ | 250 | + if (NoticeMergeFlag && NoticeMergeFlag == 'on') { |
251 | + if (!data.alarmContentExpr || data.alarmContentExpr == '') { | ||
237 | layer.msg("请先填写告警内容描述表达式!", { | 252 | layer.msg("请先填写告警内容描述表达式!", { |
238 | icon: 7 | 253 | icon: 7 |
239 | , time: 3000 | 254 | , time: 3000 |
@@ -246,7 +261,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | @@ -246,7 +261,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | ||
246 | var importantPolicy = data.seriousPolicy; | 261 | var importantPolicy = data.seriousPolicy; |
247 | var importantExpr = data.importantPolicy; | 262 | var importantExpr = data.importantPolicy; |
248 | var commonlyPolicy = data.commonlyPolicy; | 263 | var commonlyPolicy = data.commonlyPolicy; |
249 | - if((!importantPolicy || importantPolicy == '') && (!importantExpr || importantExpr == '') && (!commonlyPolicy || commonlyPolicy == '')){ | 264 | + if ((!importantPolicy || importantPolicy == '') && (!importantExpr || importantExpr == '') && (!commonlyPolicy || commonlyPolicy == '')) { |
250 | layer.msg("严重、重要和一般告警的表达式必须有一项不为空!", { | 265 | layer.msg("严重、重要和一般告警的表达式必须有一项不为空!", { |
251 | icon: 7 | 266 | icon: 7 |
252 | , time: 3000 | 267 | , time: 3000 |
@@ -254,7 +269,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | @@ -254,7 +269,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | ||
254 | return false; | 269 | return false; |
255 | } | 270 | } |
256 | 271 | ||
257 | - if(!data.noticeMergeFlagExpr || data.noticeMergeFlagExpr == ''){ | 272 | + if (!data.noticeMergeFlagExpr || data.noticeMergeFlagExpr == '') { |
258 | layer.msg("请先填写通知合并策略描述表达式!", { | 273 | layer.msg("请先填写通知合并策略描述表达式!", { |
259 | icon: 7 | 274 | icon: 7 |
260 | , time: 3000 | 275 | , time: 3000 |
@@ -267,7 +282,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | @@ -267,7 +282,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | ||
267 | * 保存通知合并策略 | 282 | * 保存通知合并策略 |
268 | */ | 283 | */ |
269 | var noticeMergeFlagExpr = $("#noticeMergeFlagExpr").val() | 284 | var noticeMergeFlagExpr = $("#noticeMergeFlagExpr").val() |
270 | - function saveNoticeMerge(id){ | 285 | + |
286 | + function saveNoticeMerge(id) { | ||
271 | var noticeMergeData = { | 287 | var noticeMergeData = { |
272 | "mergePolicyId": id, | 288 | "mergePolicyId": id, |
273 | "mergePolicyName": data.alarmPolicyName, | 289 | "mergePolicyName": data.alarmPolicyName, |
@@ -277,44 +293,45 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | @@ -277,44 +293,45 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | ||
277 | "kpiId": data.kpiId | 293 | "kpiId": data.kpiId |
278 | } | 294 | } |
279 | admin.req({ | 295 | admin.req({ |
280 | - url : domainName + '/api-web/policyMerge/save?access_token='+accessToken | ||
281 | - ,data:JSON.stringify(noticeMergeData) | ||
282 | - ,type:'post' | ||
283 | - ,contentType: "application/json; charset=utf-8" | ||
284 | - ,done:function (res){ | ||
285 | - if(!res.success){ | ||
286 | - layer.msg(res.msg ? res.msg : '通知合并策略保存失败', { offset: '15px' , icon: 7 , time: 1000 }); | 296 | + url: domainName + '/api-web/policyMerge/save?access_token=' + accessToken |
297 | + , data: JSON.stringify(noticeMergeData) | ||
298 | + , type: 'post' | ||
299 | + , contentType: "application/json; charset=utf-8" | ||
300 | + , done: function (res) { | ||
301 | + if (!res.success) { | ||
302 | + layer.msg(res.msg ? res.msg : '通知合并策略保存失败', {offset: '15px', icon: 7, time: 1000}); | ||
287 | } | 303 | } |
288 | } | 304 | } |
289 | }); | 305 | }); |
290 | } | 306 | } |
307 | + | ||
291 | charToExpr(data, 'alarmContentExpr'); | 308 | charToExpr(data, 'alarmContentExpr'); |
292 | charToExpr(data, 'cleanPolicy'); | 309 | charToExpr(data, 'cleanPolicy'); |
293 | charToExpr(data, 'commonlyExpr'); | 310 | charToExpr(data, 'commonlyExpr'); |
294 | charToExpr(data, 'importantExpr'); | 311 | charToExpr(data, 'importantExpr'); |
295 | charToExpr(data, 'seriousExpr'); | 312 | charToExpr(data, 'seriousExpr'); |
296 | 313 | ||
297 | - form.on('submit(add-alarmpolicy-form)',function () { | 314 | + form.on('submit(add-alarmpolicy-form)', function () { |
298 | delete data.noticeMergeFlagExpr; | 315 | delete data.noticeMergeFlagExpr; |
299 | admin.req({ | 316 | admin.req({ |
300 | - url : domainName + '/api-web/alarmPolicy/save?access_token='+accessToken | ||
301 | - ,data:JSON.stringify(data) | ||
302 | - ,type:'post' | ||
303 | - ,contentType: "application/json; charset=utf-8" | ||
304 | - ,done:function (res){ | ||
305 | - if(res.success){ | 317 | + url: domainName + '/api-web/alarmPolicy/save?access_token=' + accessToken |
318 | + , data: JSON.stringify(data) | ||
319 | + , type: 'post' | ||
320 | + , contentType: "application/json; charset=utf-8" | ||
321 | + , done: function (res) { | ||
322 | + if (res.success) { | ||
306 | // 保存通知合并策略 | 323 | // 保存通知合并策略 |
307 | saveNoticeMerge(res.str); | 324 | saveNoticeMerge(res.str); |
308 | 325 | ||
309 | - localStorage.setItem("detailPageOfcustomPolicyId",res.str) | ||
310 | - layer.msg(res.msg, { offset: '15px' , icon: 1 , time: 1000 },function (){ | 326 | + localStorage.setItem("detailPageOfcustomPolicyId", res.str) |
327 | + layer.msg(res.msg, {offset: '15px', icon: 1, time: 1000}, function () { | ||
311 | localStorage.removeItem("currentResType"); | 328 | localStorage.removeItem("currentResType"); |
312 | - if(layui.alarmpolicyIndex && layui.alarmpolicyIndex()){ | 329 | + if (layui.alarmpolicyIndex && layui.alarmpolicyIndex()) { |
313 | layui.alarmpolicyIndex().reloadAlarmPolicy() | 330 | layui.alarmpolicyIndex().reloadAlarmPolicy() |
314 | } | 331 | } |
315 | }); | 332 | }); |
316 | - }else{ | ||
317 | - layer.msg(res.msg, { offset: '15px' , icon: 7 , time: 1000 }); | 333 | + } else { |
334 | + layer.msg(res.msg, {offset: '15px', icon: 7, time: 1000}); | ||
318 | } | 335 | } |
319 | } | 336 | } |
320 | }); | 337 | }); |
@@ -324,24 +341,24 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | @@ -324,24 +341,24 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | ||
324 | }); | 341 | }); |
325 | 342 | ||
326 | //克隆告警策略元素 | 343 | //克隆告警策略元素 |
327 | - function clonePolicyDoms(id){ | 344 | + function clonePolicyDoms(id) { |
328 | var times = new Date().getTime() | 345 | var times = new Date().getTime() |
329 | var cond = `<div class="layui-form-item cont-base" id="${id}-${times}-condition"> | 346 | var cond = `<div class="layui-form-item cont-base" id="${id}-${times}-condition"> |
330 | <input type="checkbox" checked="" lay-skin="switch" lay-text="或|且"> | 347 | <input type="checkbox" checked="" lay-skin="switch" lay-text="或|且"> |
331 | </div>`; | 348 | </div>`; |
332 | var clone = $(`#${id}`).clone(); | 349 | var clone = $(`#${id}`).clone(); |
333 | - clone.attr("id",id+"-"+times).find("i.policy-input-add").addClass("hide") | ||
334 | - .parent().parent().find("i.policy-input-del").attr("data-id",id + "-"+times).removeClass("hide") | 350 | + clone.attr("id", id + "-" + times).find("i.policy-input-add").addClass("hide") |
351 | + .parent().parent().find("i.policy-input-del").attr("data-id", id + "-" + times).removeClass("hide") | ||
335 | .parent().parent().find("input.layui-input").val(""); | 352 | .parent().parent().find("input.layui-input").val(""); |
336 | $(`#${id}`).after(clone).after(cond); | 353 | $(`#${id}`).after(clone).after(cond); |
337 | 354 | ||
338 | form.render(); | 355 | form.render(); |
339 | //渲染新增事件 | 356 | //渲染新增事件 |
340 | - $("i.policy-input-add").off("click").on("click",function (){ | 357 | + $("i.policy-input-add").off("click").on("click", function () { |
341 | clonePolicyDoms($(this).data("id")); | 358 | clonePolicyDoms($(this).data("id")); |
342 | }); | 359 | }); |
343 | //删除告警策略规则行 | 360 | //删除告警策略规则行 |
344 | - $("i.policy-input-del").off("click").on("click",function (){ | 361 | + $("i.policy-input-del").off("click").on("click", function () { |
345 | var id = $(this).data("id"); | 362 | var id = $(this).data("id"); |
346 | $(`#${id}`).remove(); | 363 | $(`#${id}`).remove(); |
347 | $(`#${id}-condition`).remove(); | 364 | $(`#${id}-condition`).remove(); |
@@ -372,7 +389,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | @@ -372,7 +389,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun | ||
372 | //如果是详情页过来的,则不能改变指标和默认状态 | 389 | //如果是详情页过来的,则不能改变指标和默认状态 |
373 | if (data && data.from === 'detail') { | 390 | if (data && data.from === 'detail') { |
374 | $("#alarmpolicy-form-select-kpi, #alarm-policy-kpiName").off('click'); | 391 | $("#alarmpolicy-form-select-kpi, #alarm-policy-kpiName").off('click'); |
375 | - $('#add-alarmpolicy-form').find('[name="policyType"]').attr("disabled","disabled"); | 392 | + $('#add-alarmpolicy-form').find('[name="policyType"]').attr("disabled", "disabled"); |
376 | } | 393 | } |
377 | }); | 394 | }); |
378 | }); | 395 | }); |
1 | //告警策略 | 1 | //告警策略 |
2 | -layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect','treeTable'], function (exports) { | 2 | +layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect', 'treeTable'], function (exports) { |
3 | var $ = layui.$; | 3 | var $ = layui.$; |
4 | var form = layui.form; | 4 | var form = layui.form; |
5 | var layer = layui.layer; | 5 | var layer = layui.layer; |
@@ -20,7 +20,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | @@ -20,7 +20,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | ||
20 | 20 | ||
21 | if (data && data.type == 'alarmTemplate') { | 21 | if (data && data.type == 'alarmTemplate') { |
22 | $('#alarmpolicy_policyType').val('0'); | 22 | $('#alarmpolicy_policyType').val('0'); |
23 | - $('#alarmpolicy_policyType').attr('disabled','disabled'); | 23 | + $('#alarmpolicy_policyType').attr('disabled', 'disabled'); |
24 | } else { | 24 | } else { |
25 | $('#alarmpolicy_policyType').val('1'); | 25 | $('#alarmpolicy_policyType').val('1'); |
26 | } | 26 | } |
@@ -32,28 +32,28 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | @@ -32,28 +32,28 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | ||
32 | } | 32 | } |
33 | }); | 33 | }); |
34 | //查询按钮点击事件 joke add 20210428 | 34 | //查询按钮点击事件 joke add 20210428 |
35 | - $('#alarmpolicyQueryBtn').on('click',function () { | 35 | + $('#alarmpolicyQueryBtn').on('click', function () { |
36 | reloadAlarmPolicyTable(); | 36 | reloadAlarmPolicyTable(); |
37 | }); | 37 | }); |
38 | 38 | ||
39 | //指标类型 | 39 | //指标类型 |
40 | - form.on('select(alarmpolicy_kpitype)', function(){ | 40 | + form.on('select(alarmpolicy_kpitype)', function () { |
41 | reloadAlarmPolicyTable(); | 41 | reloadAlarmPolicyTable(); |
42 | }); | 42 | }); |
43 | 43 | ||
44 | //指标分类 | 44 | //指标分类 |
45 | - form.on('select(alarmpolicy_category)', function(){ | 45 | + form.on('select(alarmpolicy_category)', function () { |
46 | reloadAlarmPolicyTable(); | 46 | reloadAlarmPolicyTable(); |
47 | }); | 47 | }); |
48 | 48 | ||
49 | //策略类型分类 | 49 | //策略类型分类 |
50 | - form.on('select(alarmpolicy_policyType)', function(){ | 50 | + form.on('select(alarmpolicy_policyType)', function () { |
51 | reloadAlarmPolicyTable(); | 51 | reloadAlarmPolicyTable(); |
52 | }); | 52 | }); |
53 | 53 | ||
54 | form.render(null, 'alarmpolicy-form'); | 54 | form.render(null, 'alarmpolicy-form'); |
55 | //新增 | 55 | //新增 |
56 | - $("#alarmpolicy_create").unbind("click").on("click",function () { | 56 | + $("#alarmpolicy_create").unbind("click").on("click", function () { |
57 | if ($.inArray('back:alarmpolicy:save', checkList) == -1) { | 57 | if ($.inArray('back:alarmpolicy:save', checkList) == -1) { |
58 | layer.msg('暂无权限!', {icon: 7, time: 3000}); | 58 | layer.msg('暂无权限!', {icon: 7, time: 3000}); |
59 | return; | 59 | return; |
@@ -62,7 +62,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | @@ -62,7 +62,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | ||
62 | }); | 62 | }); |
63 | 63 | ||
64 | //同步 | 64 | //同步 |
65 | - $("#alarmpolicy_sync").on("click",function (){ | 65 | + $("#alarmpolicy_sync").on("click", function () { |
66 | if ($.inArray('back:alarmpolicy:synchronization', checkList) == -1) { | 66 | if ($.inArray('back:alarmpolicy:synchronization', checkList) == -1) { |
67 | layer.msg('暂无权限!', {icon: 7, time: 3000}); | 67 | layer.msg('暂无权限!', {icon: 7, time: 3000}); |
68 | return; | 68 | return; |
@@ -70,7 +70,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | @@ -70,7 +70,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | ||
70 | syncAlarmPolicy(); | 70 | syncAlarmPolicy(); |
71 | }); | 71 | }); |
72 | //删除 | 72 | //删除 |
73 | - $("#alarmpolicy_delete").unbind("click").on("click",function () { | 73 | + $("#alarmpolicy_delete").unbind("click").on("click", function () { |
74 | deleteAlarmPolicy(); | 74 | deleteAlarmPolicy(); |
75 | }); | 75 | }); |
76 | 76 | ||
@@ -78,55 +78,64 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | @@ -78,55 +78,64 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | ||
78 | var alarmpolicyTable = table.render({ | 78 | var alarmpolicyTable = table.render({ |
79 | elem: '#alarmpolicyTable' | 79 | elem: '#alarmpolicyTable' |
80 | , url: domainName + '/api-web/alarmPolicy/page' | 80 | , url: domainName + '/api-web/alarmPolicy/page' |
81 | - , where:{ | ||
82 | - access_token:accessToken, | ||
83 | - alarmPolicyName:$("#alarmpolicykw").val(), | ||
84 | - kpiIdent:$('#alarmpolicy_category').val(), | ||
85 | - resType:$('#alarmpolicy_kpitype').val(), | ||
86 | - policyType:$('#alarmpolicy_policyType').val(), | 81 | + , where: { |
82 | + access_token: accessToken, | ||
83 | + alarmPolicyName: $("#alarmpolicykw").val(), | ||
84 | + kpiIdent: $('#alarmpolicy_category').val(), | ||
85 | + resType: $('#alarmpolicy_kpitype').val(), | ||
86 | + policyType: $('#alarmpolicy_policyType').val(), | ||
87 | resName: resName | 87 | resName: resName |
88 | } | 88 | } |
89 | , height: 'full-200' | 89 | , height: 'full-200' |
90 | , page: { | 90 | , page: { |
91 | layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] | 91 | layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] |
92 | - ,theme: '#1E9FFF'//自定义分页主题颜色 | 92 | + , theme: '#1E9FFF'//自定义分页主题颜色 |
93 | } | 93 | } |
94 | - , end: function(e){ | 94 | + , end: function (e) { |
95 | form.render(); | 95 | form.render(); |
96 | } | 96 | } |
97 | , even: true | 97 | , even: true |
98 | , cols: [[ | 98 | , cols: [[ |
99 | {type: 'checkbox'} | 99 | {type: 'checkbox'} |
100 | - , {field: 'policyType', title: '策略类型', align: 'center', sort: true, width:120, | ||
101 | - templet: function(d){ | 100 | + , { |
101 | + field: 'policyType', title: '策略类型', align: 'center', sort: true, width: 120, | ||
102 | + templet: function (d) { | ||
102 | var checked = ''; | 103 | var checked = ''; |
103 | - if(d.policyType == '1'){ //默认 | 104 | + if (d.policyType == '1') { //默认 |
104 | checked = "checked"; | 105 | checked = "checked"; |
105 | } | 106 | } |
106 | return `<input type="checkbox" id="${d.alarmPolicyId}" data-kpiid="${d.kpiId}" name="close" ${checked} lay-skin="switch" lay-filter="switchPolicyType" lay-text="默认|非默认">`; | 107 | return `<input type="checkbox" id="${d.alarmPolicyId}" data-kpiid="${d.kpiId}" name="close" ${checked} lay-skin="switch" lay-filter="switchPolicyType" lay-text="默认|非默认">`; |
107 | - }} | 108 | + } |
109 | + } | ||
108 | , { | 110 | , { |
109 | field: 'alarmPolicyName', title: '策略名称', align: 'center', sort: true, | 111 | field: 'alarmPolicyName', title: '策略名称', align: 'center', sort: true, |
110 | templet: '<div><span data-id="{{d.alarmPolicyId}}" class="layui-table-link view-alarmPolicy-name">{{d.alarmPolicyName}}</span></div>' | 112 | templet: '<div><span data-id="{{d.alarmPolicyId}}" class="layui-table-link view-alarmPolicy-name">{{d.alarmPolicyName}}</span></div>' |
111 | } | 113 | } |
112 | - , {title: '资源类型', align: 'center',templet:function (d){ | 114 | + , { |
115 | + title: '资源类型', align: 'center', templet: function (d) { | ||
113 | return `${d.resTypeName}` | 116 | return `${d.resTypeName}` |
114 | - }} | ||
115 | - , {field: 'kpiName', title: '指标', align: 'center', width:240} | ||
116 | - , {title: '策略内容', align: 'center',templet:function (d){ | 117 | + } |
118 | + } | ||
119 | + , {field: 'kpiName', title: '指标', align: 'center', width: 240} | ||
120 | + , { | ||
121 | + title: '策略内容', align: 'center', templet: function (d) { | ||
117 | return `告警策略表达式:严重告警:【${d.seriousPolicy}】,<br>重要告警:【${d.importantPolicy}】,<br>一般告警:【${d.commonlyPolicy}】`; | 122 | return `告警策略表达式:严重告警:【${d.seriousPolicy}】,<br>重要告警:【${d.importantPolicy}】,<br>一般告警:【${d.commonlyPolicy}】`; |
118 | - }} | ||
119 | - , {field: 'alarmTempTotal', title: '所属告警模板量', align: 'center', sort: true, width:180, | ||
120 | - templet:function (d){ | ||
121 | - if(d.alarmTempTotal != '0'){ | 123 | + } |
124 | + } | ||
125 | + , { | ||
126 | + field: 'alarmTempTotal', title: '所属告警模板量', align: 'center', sort: true, width: 180, | ||
127 | + templet: function (d) { | ||
128 | + if (d.alarmTempTotal != '0') { | ||
122 | return `<div><span data-id="${d.alarmPolicyId}" class="layui-table-link view-alarm-template-total">${d.alarmTempTotal}</span></div>`; | 129 | return `<div><span data-id="${d.alarmPolicyId}" class="layui-table-link view-alarm-template-total">${d.alarmTempTotal}</span></div>`; |
123 | - }else{ | 130 | + } else { |
124 | return d.alarmTempTotal; | 131 | return d.alarmTempTotal; |
125 | } | 132 | } |
126 | - }} | 133 | + } |
134 | + } | ||
127 | // , {field: 'kpiTypes', title: '指标类型', align: 'center', sort: true,minWith:180} | 135 | // , {field: 'kpiTypes', title: '指标类型', align: 'center', sort: true,minWith:180} |
128 | - , {field: 'kpiIdent', title: '指标类型', align: 'center', width:120, templet: function(d){ | ||
129 | - switch (d.kpiIdent){ | 136 | + , { |
137 | + field: 'kpiIdent', title: '指标类型', align: 'center', width: 120, templet: function (d) { | ||
138 | + switch (d.kpiIdent) { | ||
130 | case "0": | 139 | case "0": |
131 | return "基本指标"; | 140 | return "基本指标"; |
132 | case "1": | 141 | case "1": |
@@ -137,13 +146,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | @@ -137,13 +146,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | ||
137 | return "告警指标"; | 146 | return "告警指标"; |
138 | 147 | ||
139 | } | 148 | } |
140 | - }} | ||
141 | - , {field: 'syncFlag',title: '同步状态',align: 'center', sort: true,width:120, | ||
142 | - templet: function(d){ | 149 | + } |
150 | + } | ||
151 | + , { | ||
152 | + field: 'syncFlag', title: '同步状态', align: 'center', sort: true, width: 120, | ||
153 | + templet: function (d) { | ||
143 | if (d.policyType == '1') { //默认 | 154 | if (d.policyType == '1') { //默认 |
144 | - if(d.syncFlag != 1){ //未同步 | 155 | + if (d.syncFlag != 1) { //未同步 |
145 | return `<input type="checkbox" id="${d.alarmPolicyId}" name="close" lay-skin="switch" lay-filter="switchSyncPolicy" lay-text="已同步|未同步">`; | 156 | return `<input type="checkbox" id="${d.alarmPolicyId}" name="close" lay-skin="switch" lay-filter="switchSyncPolicy" lay-text="已同步|未同步">`; |
146 | - }else{ | 157 | + } else { |
147 | return ' <button type="button" class="layui-btn layui-bg-green layui-btn-radius layui-btn-xs p-0-15">已同步</button>'; | 158 | return ' <button type="button" class="layui-btn layui-bg-green layui-btn-radius layui-btn-xs p-0-15">已同步</button>'; |
148 | } | 159 | } |
149 | } else { | 160 | } else { |
@@ -151,35 +162,36 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | @@ -151,35 +162,36 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | ||
151 | } | 162 | } |
152 | } | 163 | } |
153 | } | 164 | } |
154 | - , {title: '操作', align: 'center',width:100, fixed: 'right', | 165 | + , { |
166 | + title: '操作', align: 'center', width: 100, fixed: 'right', | ||
155 | templet: '<div>' + | 167 | templet: '<div>' + |
156 | - '<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>'+ | 168 | + '<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>' + |
157 | '</div>' | 169 | '</div>' |
158 | } | 170 | } |
159 | ]], | 171 | ]], |
160 | - done:function () { | 172 | + done: function () { |
161 | //设置默认 | 173 | //设置默认 |
162 | - form.on('switch(switchPolicyType)', function(obj){ | 174 | + form.on('switch(switchPolicyType)', function (obj) { |
163 | var alarmPolicyId = obj.elem.id; | 175 | var alarmPolicyId = obj.elem.id; |
164 | var alarmPolicyKpiId = $(obj.elem).data("kpiid"); | 176 | var alarmPolicyKpiId = $(obj.elem).data("kpiid"); |
165 | - var isChecked = obj.elem.checked?"1":"0"; | 177 | + var isChecked = obj.elem.checked ? "1" : "0"; |
166 | admin.req({ | 178 | admin.req({ |
167 | - url:common.domainName + '/api-web/alarmPolicy/default' | ||
168 | - , type : 'post' | ||
169 | - , data:{ | ||
170 | - id:alarmPolicyId, | ||
171 | - type:isChecked, | ||
172 | - kpiId:alarmPolicyKpiId | 179 | + url: common.domainName + '/api-web/alarmPolicy/default' |
180 | + , type: 'post' | ||
181 | + , data: { | ||
182 | + id: alarmPolicyId, | ||
183 | + type: isChecked, | ||
184 | + kpiId: alarmPolicyKpiId | ||
173 | } | 185 | } |
174 | }).done(function (res) { | 186 | }).done(function (res) { |
175 | - layer.msg(res.msg, { offset: '15px' , icon: 1, time: 2000},function (){ | 187 | + layer.msg(res.msg, {offset: '15px', icon: 1, time: 2000}, function () { |
176 | reloadAlarmPolicyTable(); | 188 | reloadAlarmPolicyTable(); |
177 | }); | 189 | }); |
178 | }); | 190 | }); |
179 | }); | 191 | }); |
180 | 192 | ||
181 | //点击名称编辑 | 193 | //点击名称编辑 |
182 | - $(".view-alarmPolicy-name").off("click").on("click",function () { | 194 | + $(".view-alarmPolicy-name").off("click").on("click", function () { |
183 | if ($.inArray('back:alarmpolicy:update', checkList) == -1) { | 195 | if ($.inArray('back:alarmpolicy:update', checkList) == -1) { |
184 | layer.msg('暂无权限!', {icon: 7, time: 3000}); | 196 | layer.msg('暂无权限!', {icon: 7, time: 3000}); |
185 | return; | 197 | return; |
@@ -188,19 +200,19 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | @@ -188,19 +200,19 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | ||
188 | }); | 200 | }); |
189 | 201 | ||
190 | //查看告警策略所属模板列表 | 202 | //查看告警策略所属模板列表 |
191 | - $(".view-alarm-template-total").on("click",function (){ | 203 | + $(".view-alarm-template-total").on("click", function () { |
192 | var id = $(this).data("id"); | 204 | var id = $(this).data("id"); |
193 | - common.openWin('baseconfig/alarmtemplate/list',"告警模板",{policyId:id}) | 205 | + common.openWin('baseconfig/alarmtemplate/list', "告警模板", {policyId: id}) |
194 | }); | 206 | }); |
195 | 207 | ||
196 | //设置同步 | 208 | //设置同步 |
197 | - form.on('switch(switchSyncPolicy)', function(obj){ | 209 | + form.on('switch(switchSyncPolicy)', function (obj) { |
198 | var alarmPolicyId = obj.elem.id; | 210 | var alarmPolicyId = obj.elem.id; |
199 | syncAlarmPolicy(alarmPolicyId); | 211 | syncAlarmPolicy(alarmPolicyId); |
200 | }); | 212 | }); |
201 | 213 | ||
202 | //删除 | 214 | //删除 |
203 | - $(".delete-alarmPolicy-btn").on("click",function () { | 215 | + $(".delete-alarmPolicy-btn").on("click", function () { |
204 | var id = $(this).data("id"); | 216 | var id = $(this).data("id"); |
205 | deleteAlarmPolicy(id) | 217 | deleteAlarmPolicy(id) |
206 | }); | 218 | }); |
@@ -208,13 +220,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | @@ -208,13 +220,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | ||
208 | }); | 220 | }); |
209 | 221 | ||
210 | //同步策略 | 222 | //同步策略 |
211 | - function syncAlarmPolicy(alarmPolicyId){ | 223 | + function syncAlarmPolicy(alarmPolicyId) { |
212 | if (typeof (alarmPolicyId) != "string") { | 224 | if (typeof (alarmPolicyId) != "string") { |
213 | var ids = []; | 225 | var ids = []; |
214 | var data = table.checkStatus('alarmpolicyTable').data; | 226 | var data = table.checkStatus('alarmpolicyTable').data; |
215 | var flag = true; | 227 | var flag = true; |
216 | - if(data && data.length > 0){ | ||
217 | - $.each(data,function (i,obj) { | 228 | + if (data && data.length > 0) { |
229 | + $.each(data, function (i, obj) { | ||
218 | if (obj.policyType == '0') { | 230 | if (obj.policyType == '0') { |
219 | flag = false | 231 | flag = false |
220 | } | 232 | } |
@@ -222,11 +234,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | @@ -222,11 +234,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | ||
222 | }); | 234 | }); |
223 | } | 235 | } |
224 | if (!flag) { | 236 | if (!flag) { |
225 | - layer.msg('非默认策略类型禁止同步!',{icon: 7,time:2000}) | 237 | + layer.msg('非默认策略类型禁止同步!', {icon: 7, time: 2000}) |
226 | return; | 238 | return; |
227 | } | 239 | } |
228 | if (ids.length == 0) { | 240 | if (ids.length == 0) { |
229 | - layer.msg('请选择要同步的数据',{icon: 7,time:2000}); | 241 | + layer.msg('请选择要同步的数据', {icon: 7, time: 2000}); |
230 | return; | 242 | return; |
231 | } | 243 | } |
232 | alarmPolicyId = ids.toString(); | 244 | alarmPolicyId = ids.toString(); |
@@ -245,20 +257,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | @@ -245,20 +257,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | ||
245 | }); | 257 | }); |
246 | 258 | ||
247 | admin.req({ | 259 | admin.req({ |
248 | - url:common.domainName + '/api-web/alarmPolicy/sync' | ||
249 | - , data:{ | ||
250 | - ids:alarmPolicyId | 260 | + url: common.domainName + '/api-web/alarmPolicy/sync' |
261 | + , data: { | ||
262 | + ids: alarmPolicyId | ||
251 | } | 263 | } |
252 | }).done(function (res) { | 264 | }).done(function (res) { |
253 | layer.close(syncload) | 265 | layer.close(syncload) |
254 | - if(res.success){ | ||
255 | - layer.msg(res.msg, { offset: '15px' , icon: 1 , time: 1000 },function (){ | 266 | + if (res.success) { |
267 | + layer.msg(res.msg, {offset: '15px', icon: 1, time: 1000}, function () { | ||
256 | reloadAlarmPolicyTable(); | 268 | reloadAlarmPolicyTable(); |
257 | }); | 269 | }); |
258 | - }else{ | ||
259 | - layer.msg(res.msg, { offset: '15px' , icon: 7 , time: 1000 }); | 270 | + } else { |
271 | + layer.msg(res.msg, {offset: '15px', icon: 7, time: 1000}); | ||
260 | } | 272 | } |
261 | - }).error(function (){ | 273 | + }).error(function () { |
262 | layer.close(syncload) | 274 | layer.close(syncload) |
263 | }); | 275 | }); |
264 | } | 276 | } |
@@ -266,12 +278,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | @@ -266,12 +278,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | ||
266 | //刷新表格 | 278 | //刷新表格 |
267 | function reloadAlarmPolicyTable() { | 279 | function reloadAlarmPolicyTable() { |
268 | alarmpolicyTable.reload({ | 280 | alarmpolicyTable.reload({ |
269 | - where:{ | ||
270 | - access_token:accessToken, | ||
271 | - alarmPolicyName:$("#alarmpolicykw").val(), | ||
272 | - kpiIdent:$('#alarmpolicy_category').val(), | ||
273 | - resType:$('#alarmpolicy_kpitype').val(), | ||
274 | - policyType:$('#alarmpolicy_policyType').val(), | 281 | + where: { |
282 | + access_token: accessToken, | ||
283 | + alarmPolicyName: $("#alarmpolicykw").val(), | ||
284 | + kpiIdent: $('#alarmpolicy_category').val(), | ||
285 | + resType: $('#alarmpolicy_kpitype').val(), | ||
286 | + policyType: $('#alarmpolicy_policyType').val(), | ||
275 | resName: resName | 287 | resName: resName |
276 | } | 288 | } |
277 | }); | 289 | }); |
@@ -286,13 +298,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | @@ -286,13 +298,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | ||
286 | if (typeof (id) != "string") { | 298 | if (typeof (id) != "string") { |
287 | var ids = []; | 299 | var ids = []; |
288 | var data = table.checkStatus('alarmpolicyTable').data; | 300 | var data = table.checkStatus('alarmpolicyTable').data; |
289 | - if(data && data.length > 0){ | ||
290 | - $.each(data,function (i,obj) { | 301 | + if (data && data.length > 0) { |
302 | + $.each(data, function (i, obj) { | ||
291 | ids.push(obj.alarmPolicyId); | 303 | ids.push(obj.alarmPolicyId); |
292 | }); | 304 | }); |
293 | } | 305 | } |
294 | if (ids.length == 0) { | 306 | if (ids.length == 0) { |
295 | - layer.msg('请选择要删除的数据',{icon: 7,time:2000}); | 307 | + layer.msg('请选择要删除的数据', {icon: 7, time: 2000}); |
296 | return; | 308 | return; |
297 | } | 309 | } |
298 | id = ids.toString(); | 310 | id = ids.toString(); |
@@ -303,8 +315,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | @@ -303,8 +315,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | ||
303 | }, function () { | 315 | }, function () { |
304 | admin.req({ | 316 | admin.req({ |
305 | url: common.domainName + '/api-web/alarmPolicy/delete' | 317 | url: common.domainName + '/api-web/alarmPolicy/delete' |
306 | - ,type:"delete" | ||
307 | - ,data:{ids:id} | 318 | + , type: "delete" |
319 | + , data: {ids: id} | ||
308 | }).done(function (res) { | 320 | }).done(function (res) { |
309 | layer.msg('删除成功', { | 321 | layer.msg('删除成功', { |
310 | offset: '15px' | 322 | offset: '15px' |
@@ -362,7 +374,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | @@ -362,7 +374,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | ||
362 | height: 'auto', | 374 | height: 'auto', |
363 | data: resTypeTree, | 375 | data: resTypeTree, |
364 | on: function (data) { | 376 | on: function (data) { |
365 | - if(data.isAdd){ | 377 | + if (data.isAdd) { |
366 | if (data.arr.length != 0) { | 378 | if (data.arr.length != 0) { |
367 | resName = data.arr[0].name; | 379 | resName = data.arr[0].name; |
368 | } else { | 380 | } else { |
@@ -376,13 +388,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | @@ -376,13 +388,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | ||
376 | }); | 388 | }); |
377 | 389 | ||
378 | //新增、编辑策略表单 | 390 | //新增、编辑策略表单 |
379 | - function openPolicyForm(id){ | ||
380 | - var title = id?"编辑策略":"新增策略"; | 391 | + function openPolicyForm(id) { |
392 | + var title = id ? "编辑策略" : "新增策略"; | ||
381 | title = `<a class="layui-icon layui-icon-edit win_title_icon"></a>${title}`; | 393 | title = `<a class="layui-icon layui-icon-edit win_title_icon"></a>${title}`; |
382 | - common.openWin('baseconfig/alarmpolicy/add',title, {id:id},['保存','取消'],function () { | 394 | + common.openWin('baseconfig/alarmpolicy/add', title, {id: id}, ['保存', '取消'], function () { |
383 | $("#alarmpolicy-form-save-id").trigger("click"); | 395 | $("#alarmpolicy-form-save-id").trigger("click"); |
384 | return true; | 396 | return true; |
385 | - },null,['90%','90%']); | 397 | + }, null, ['90%', '90%']); |
386 | } | 398 | } |
387 | 399 | ||
388 | //获取选中的数据 | 400 | //获取选中的数据 |
@@ -390,6 +402,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | @@ -390,6 +402,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', | ||
390 | return table.checkStatus('alarmpolicyTable').data; | 402 | return table.checkStatus('alarmpolicyTable').data; |
391 | } | 403 | } |
392 | 404 | ||
393 | - return { getData: getCheckAlarmPolicyData,reloadAlarmPolicy:reloadAlarmPolicyTable()}; | 405 | + return {getData: getCheckAlarmPolicyData, reloadAlarmPolicy: reloadAlarmPolicyTable()}; |
394 | }); | 406 | }); |
395 | }); | 407 | }); |
1 | //告警订阅表单 | 1 | //告警订阅表单 |
2 | -layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','orgusergroup'], function (exports) { | 2 | +layui.define(['form', 'admin', 'laydate', 'table', 'common', 'sessions', 'cron', 'orgusergroup'], function (exports) { |
3 | var $ = layui.$; | 3 | var $ = layui.$; |
4 | var form = layui.form; | 4 | var form = layui.form; |
5 | var laydate = layui.laydate; | 5 | var laydate = layui.laydate; |
@@ -24,100 +24,100 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | @@ -24,100 +24,100 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | ||
24 | //初始化日期组件 | 24 | //初始化日期组件 |
25 | laydate.render({ | 25 | laydate.render({ |
26 | elem: '.alarm_subscribe_times' | 26 | elem: '.alarm_subscribe_times' |
27 | - ,type: 'time' | ||
28 | - ,range: true | 27 | + , type: 'time' |
28 | + , range: true | ||
29 | }); | 29 | }); |
30 | 30 | ||
31 | - if(data && data.id){ | 31 | + if (data && data.id) { |
32 | admin.req({ | 32 | admin.req({ |
33 | - url:domainName + '/api-web/alarmsubscribe/getbyId/'+data.id | ||
34 | - ,async:false | ||
35 | - ,done:function (res){ | 33 | + url: domainName + '/api-web/alarmsubscribe/getbyId/' + data.id |
34 | + , async: false | ||
35 | + , done: function (res) { | ||
36 | //处理时间段回显 | 36 | //处理时间段回显 |
37 | - if(res.object.times){ | ||
38 | - var times=res.object.times.split(','); | ||
39 | - if(times.length>1){ | ||
40 | - res.object.times=times[0]; | ||
41 | - $.each(times,function(i,v){ | ||
42 | - if(i>0){ | 37 | + if (res.object.times) { |
38 | + var times = res.object.times.split(','); | ||
39 | + if (times.length > 1) { | ||
40 | + res.object.times = times[0]; | ||
41 | + $.each(times, function (i, v) { | ||
42 | + if (i > 0) { | ||
43 | addTimeQuantum(times[i]); | 43 | addTimeQuantum(times[i]); |
44 | } | 44 | } |
45 | }); | 45 | }); |
46 | } | 46 | } |
47 | } | 47 | } |
48 | - form.val("add-alarmsubscribe-form",res.object); | 48 | + form.val("add-alarmsubscribe-form", res.object); |
49 | //处理回显 | 49 | //处理回显 |
50 | - if(res.object.subWay){ | 50 | + if (res.object.subWay) { |
51 | var subWay = res.object.subWay; | 51 | var subWay = res.object.subWay; |
52 | - $("#alarmsubscribe_add_subway").find('[data-type="'+subWay+'"]').removeClass("gray").siblings().addClass("gray"); | 52 | + $("#alarmsubscribe_add_subway").find('[data-type="' + subWay + '"]').removeClass("gray").siblings().addClass("gray"); |
53 | } | 53 | } |
54 | 54 | ||
55 | - if(res.data){ | ||
56 | - $.each(res.data,function (i,v){ | 55 | + if (res.data) { |
56 | + $.each(res.data, function (i, v) { | ||
57 | writeTagsInfo(v); | 57 | writeTagsInfo(v); |
58 | }) | 58 | }) |
59 | } | 59 | } |
60 | 60 | ||
61 | - if (res.obj){ | ||
62 | - if (res.obj.subOrgLists){ | ||
63 | - $.each(res.obj.subOrgLists,function (i,v){ | 61 | + if (res.obj) { |
62 | + if (res.obj.subOrgLists) { | ||
63 | + $.each(res.obj.subOrgLists, function (i, v) { | ||
64 | v.value = v.targetId; | 64 | v.value = v.targetId; |
65 | - writeOrgTagsInfo(v,'selecte_org_content_id') | 65 | + writeOrgTagsInfo(v, 'selecte_org_content_id') |
66 | }); | 66 | }); |
67 | } | 67 | } |
68 | - if (res.obj.subGroupLists){ | ||
69 | - $.each(res.obj.subGroupLists,function (i,v){ | 68 | + if (res.obj.subGroupLists) { |
69 | + $.each(res.obj.subGroupLists, function (i, v) { | ||
70 | v.value = v.targetId; | 70 | v.value = v.targetId; |
71 | - writeOrgTagsInfo(v,'selecte_group_content_id') | 71 | + writeOrgTagsInfo(v, 'selecte_group_content_id') |
72 | }); | 72 | }); |
73 | } | 73 | } |
74 | 74 | ||
75 | } | 75 | } |
76 | 76 | ||
77 | - if(res.object.subType == '1'){//告警订阅 | 77 | + if (res.object.subType == '1') {//告警订阅 |
78 | $("div.alarmLevel").show(); | 78 | $("div.alarmLevel").show(); |
79 | $("div.reportType").hide(); | 79 | $("div.reportType").hide(); |
80 | var alarmLevels = res.object.alarmLevel.split(","); | 80 | var alarmLevels = res.object.alarmLevel.split(","); |
81 | - for(var i in alarmLevels){ | 81 | + for (var i in alarmLevels) { |
82 | let chkbox = $(`input[type="checkbox"][name="alarmLevel"][value="${alarmLevels[i]}"]`); | 82 | let chkbox = $(`input[type="checkbox"][name="alarmLevel"][value="${alarmLevels[i]}"]`); |
83 | if (chkbox && chkbox.length > 0) { | 83 | if (chkbox && chkbox.length > 0) { |
84 | chkbox[0].checked = true; | 84 | chkbox[0].checked = true; |
85 | form.render(); | 85 | form.render(); |
86 | } | 86 | } |
87 | } | 87 | } |
88 | - }else if(res.object.subType == '2'){//报表订阅 | 88 | + } else if (res.object.subType == '2') {//报表订阅 |
89 | $("div.alarmLevel").hide(); | 89 | $("div.alarmLevel").hide(); |
90 | $("div.reportType").show(); | 90 | $("div.reportType").show(); |
91 | var reportTypes = res.object.reportType.split(","); | 91 | var reportTypes = res.object.reportType.split(","); |
92 | - for(var i in reportTypes){ | 92 | + for (var i in reportTypes) { |
93 | let chkbox = $(`input[type="checkbox"][name="reportType"][value="${reportTypes[i]}"]`); | 93 | let chkbox = $(`input[type="checkbox"][name="reportType"][value="${reportTypes[i]}"]`); |
94 | if (chkbox && chkbox.length > 0) { | 94 | if (chkbox && chkbox.length > 0) { |
95 | chkbox[0].checked = true; | 95 | chkbox[0].checked = true; |
96 | form.render(); | 96 | form.render(); |
97 | } | 97 | } |
98 | } | 98 | } |
99 | - }else{ | 99 | + } else { |
100 | $("div.alarmLevel").hide(); | 100 | $("div.alarmLevel").hide(); |
101 | $("div.reportType").hide(); | 101 | $("div.reportType").hide(); |
102 | } | 102 | } |
103 | 103 | ||
104 | - if(res.object.sentFrequency && res.object.sentFrequency.indexOf("?")>0){ | 104 | + if (res.object.sentFrequency && res.object.sentFrequency.indexOf("?") > 0) { |
105 | $("#sentFrequency_input").val(res.object.sentFrequency); | 105 | $("#sentFrequency_input").val(res.object.sentFrequency); |
106 | $(".sentFrequency_input").show(); | 106 | $(".sentFrequency_input").show(); |
107 | $(".sentFrequency_select").hide(); | 107 | $(".sentFrequency_select").hide(); |
108 | - }else{ | 108 | + } else { |
109 | $("#sentFrequency_select").val(res.object.sentFrequency); | 109 | $("#sentFrequency_select").val(res.object.sentFrequency); |
110 | $(".sentFrequency_input").hide(); | 110 | $(".sentFrequency_input").hide(); |
111 | $(".sentFrequency_select").show(); | 111 | $(".sentFrequency_select").show(); |
112 | } | 112 | } |
113 | - switchSubType(res.object.subType,res.object) | 113 | + switchSubType(res.object.subType, res.object) |
114 | form.render(); | 114 | form.render(); |
115 | } | 115 | } |
116 | }); | 116 | }); |
117 | } | 117 | } |
118 | 118 | ||
119 | //corn表达式 | 119 | //corn表达式 |
120 | - $("#show_corn_info").on("click",function (){ | 120 | + $("#show_corn_info").on("click", function () { |
121 | layer.open({ | 121 | layer.open({ |
122 | type: 1 | 122 | type: 1 |
123 | , title: 'Cron表达式示例' | 123 | , title: 'Cron表达式示例' |
@@ -140,20 +140,21 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | @@ -140,20 +140,21 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | ||
140 | }); | 140 | }); |
141 | 141 | ||
142 | //全天 | 142 | //全天 |
143 | - $(".allday_subscribe").on("click",function (){ | 143 | + $(".allday_subscribe").on("click", function () { |
144 | $(this).prev().find('input[name="times"]').val('00:00:00 - 23:59:59'); | 144 | $(this).prev().find('input[name="times"]').val('00:00:00 - 23:59:59'); |
145 | }); | 145 | }); |
146 | //工作时间 | 146 | //工作时间 |
147 | - $(".worktime_subscribe").on("click",function (){ | 147 | + $(".worktime_subscribe").on("click", function () { |
148 | $(this).prev().prev().find('input[name="times"]').val('08:00:00 - 19:59:59'); | 148 | $(this).prev().prev().find('input[name="times"]').val('08:00:00 - 19:59:59'); |
149 | }); | 149 | }); |
150 | //添加时间段 | 150 | //添加时间段 |
151 | - $("#save_subscribe").on("click",function (){ | 151 | + $("#save_subscribe").on("click", function () { |
152 | addTimeQuantum(); | 152 | addTimeQuantum(); |
153 | }); | 153 | }); |
154 | + | ||
154 | //添加时间段 | 155 | //添加时间段 |
155 | - function addTimeQuantum(v){ | ||
156 | - var html=' <div class="layui-form-item">\n' + | 156 | + function addTimeQuantum(v) { |
157 | + var html = ' <div class="layui-form-item">\n' + | ||
157 | ' <div class="layui-inline-block">\n' + | 158 | ' <div class="layui-inline-block">\n' + |
158 | ' <label class="layui-form-label">通知时间段</label>\n' + | 159 | ' <label class="layui-form-label">通知时间段</label>\n' + |
159 | ' <div class="layui-input-inline">\n' + | 160 | ' <div class="layui-input-inline">\n' + |
@@ -167,75 +168,76 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | @@ -167,75 +168,76 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | ||
167 | //添加组件 | 168 | //添加组件 |
168 | $('#message-time-quantum-div').before(html); | 169 | $('#message-time-quantum-div').before(html); |
169 | //获取添加的节点 | 170 | //获取添加的节点 |
170 | - var alarm_subscribe_times=$('#message-time-quantum-div').prev().find('.alarm_subscribe_times').eq(0).get(0); | 171 | + var alarm_subscribe_times = $('#message-time-quantum-div').prev().find('.alarm_subscribe_times').eq(0).get(0); |
171 | 172 | ||
172 | laydate.render({ | 173 | laydate.render({ |
173 | elem: alarm_subscribe_times | 174 | elem: alarm_subscribe_times |
174 | - ,type: 'time' | ||
175 | - ,range: true | 175 | + , type: 'time' |
176 | + , range: true | ||
176 | }); | 177 | }); |
177 | 178 | ||
178 | //全天 | 179 | //全天 |
179 | - $('#message-time-quantum-div').prev().find('.allday_subscribe').on("click",function (){ | 180 | + $('#message-time-quantum-div').prev().find('.allday_subscribe').on("click", function () { |
180 | $(this).prev().find('.alarm_subscribe_times').val('00:00:00 - 23:59:59'); | 181 | $(this).prev().find('.alarm_subscribe_times').val('00:00:00 - 23:59:59'); |
181 | }); | 182 | }); |
182 | //工作时间 | 183 | //工作时间 |
183 | - $('#message-time-quantum-div').prev().find('.worktime_subscribe').on("click",function (){ | 184 | + $('#message-time-quantum-div').prev().find('.worktime_subscribe').on("click", function () { |
184 | $(this).prev().prev().find('.alarm_subscribe_times').val('08:00:00 - 19:59:59'); | 185 | $(this).prev().prev().find('.alarm_subscribe_times').val('08:00:00 - 19:59:59'); |
185 | }); | 186 | }); |
186 | //删除 | 187 | //删除 |
187 | - $('#message-time-quantum-div').prev().find('.del_subscribe').on("click",function (){ | 188 | + $('#message-time-quantum-div').prev().find('.del_subscribe').on("click", function () { |
188 | $(this).closest('.layui-form-item').remove(); | 189 | $(this).closest('.layui-form-item').remove(); |
189 | layer.closeAll('tips'); | 190 | layer.closeAll('tips'); |
190 | }); | 191 | }); |
191 | - if(v){ | 192 | + if (v) { |
192 | $('#message-time-quantum-div').prev().find('.alarm_subscribe_times').val(v); | 193 | $('#message-time-quantum-div').prev().find('.alarm_subscribe_times').val(v); |
193 | } | 194 | } |
194 | form.render(); | 195 | form.render(); |
195 | } | 196 | } |
197 | + | ||
196 | //订阅方式 | 198 | //订阅方式 |
197 | - $("#alarmsubscribe_add_subway li").on("click",function (){ | 199 | + $("#alarmsubscribe_add_subway li").on("click", function () { |
198 | $(this).removeClass("gray").siblings().addClass("gray"); | 200 | $(this).removeClass("gray").siblings().addClass("gray"); |
199 | $("#alarmsubscribe_subway").val($(this).data("type")); | 201 | $("#alarmsubscribe_subway").val($(this).data("type")); |
200 | }); | 202 | }); |
201 | 203 | ||
202 | //订阅类型切换事件 | 204 | //订阅类型切换事件 |
203 | form.on('select(alarm-subscribe-subype)', function (data) { | 205 | form.on('select(alarm-subscribe-subype)', function (data) { |
204 | - if(data.value == '1'){ | 206 | + if (data.value == '1') { |
205 | $("div.alarmLevel").show(); | 207 | $("div.alarmLevel").show(); |
206 | $("div.reportType").hide(); | 208 | $("div.reportType").hide(); |
207 | - }else if(data.value == '2'){ | 209 | + } else if (data.value == '2') { |
208 | $("div.alarmLevel").hide(); | 210 | $("div.alarmLevel").hide(); |
209 | $("div.reportType").show(); | 211 | $("div.reportType").show(); |
210 | - }else{ | 212 | + } else { |
211 | $("div.alarmLevel").hide(); | 213 | $("div.alarmLevel").hide(); |
212 | $("div.reportType").hide(); | 214 | $("div.reportType").hide(); |
213 | } | 215 | } |
214 | - switchSubType(data.value,undefined) | 216 | + switchSubType(data.value, undefined) |
215 | form.render() | 217 | form.render() |
216 | }); | 218 | }); |
217 | 219 | ||
218 | //通知类型 | 220 | //通知类型 |
219 | form.on('radio(sub_send-type)', function (data) { | 221 | form.on('radio(sub_send-type)', function (data) { |
220 | - if(data.value == '1'){ | 222 | + if (data.value == '1') { |
221 | $(".sentFrequency_select").show(); | 223 | $(".sentFrequency_select").show(); |
222 | $(".sentFrequency_input").hide(); | 224 | $(".sentFrequency_input").hide(); |
223 | - }else{ | 225 | + } else { |
224 | $(".sentFrequency_select").hide(); | 226 | $(".sentFrequency_select").hide(); |
225 | $(".sentFrequency_input").show(); | 227 | $(".sentFrequency_input").show(); |
226 | } | 228 | } |
227 | }); | 229 | }); |
228 | 230 | ||
229 | - $('#orgusergroup').on('click',function () { | 231 | + $('#orgusergroup').on('click', function () { |
230 | 232 | ||
231 | }); | 233 | }); |
232 | 234 | ||
233 | //选择用户 | 235 | //选择用户 |
234 | - $("#alarmsubscirbe-form-select-users").on("click",function (){ | ||
235 | - var selObj ={}; | 236 | + $("#alarmsubscirbe-form-select-users").on("click", function () { |
237 | + var selObj = {}; | ||
236 | //回填订阅用户 | 238 | //回填订阅用户 |
237 | var selectedUserTags = $("#selecte_content_id").find("span"); | 239 | var selectedUserTags = $("#selecte_content_id").find("span"); |
238 | - if (selectedUserTags.length > 0){ | 240 | + if (selectedUserTags.length > 0) { |
239 | var userSelIds = new Array(); | 241 | var userSelIds = new Array(); |
240 | selectedUserTags.each(function () { | 242 | selectedUserTags.each(function () { |
241 | userSelIds.push($(this).data("username")); | 243 | userSelIds.push($(this).data("username")); |
@@ -244,7 +246,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | @@ -244,7 +246,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | ||
244 | } | 246 | } |
245 | //回填订阅部门 | 247 | //回填订阅部门 |
246 | var selecteOrgTags = $("#selecte_org_content_id").find("span"); | 248 | var selecteOrgTags = $("#selecte_org_content_id").find("span"); |
247 | - if (selecteOrgTags.length > 0){ | 249 | + if (selecteOrgTags.length > 0) { |
248 | var orgSelIds = new Array(); | 250 | var orgSelIds = new Array(); |
249 | selecteOrgTags.each(function () { | 251 | selecteOrgTags.each(function () { |
250 | orgSelIds.push($(this).data("id")); | 252 | orgSelIds.push($(this).data("id")); |
@@ -253,7 +255,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | @@ -253,7 +255,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | ||
253 | } | 255 | } |
254 | //回填订阅组 | 256 | //回填订阅组 |
255 | var selecteGoupTags = $("#selecte_group_content_id").find("span"); | 257 | var selecteGoupTags = $("#selecte_group_content_id").find("span"); |
256 | - if (selecteGoupTags.length > 0){ | 258 | + if (selecteGoupTags.length > 0) { |
257 | var groupSelIds = new Array(); | 259 | var groupSelIds = new Array(); |
258 | selecteGoupTags.each(function () { | 260 | selecteGoupTags.each(function () { |
259 | groupSelIds.push($(this).data("id")); | 261 | groupSelIds.push($(this).data("id")); |
@@ -264,38 +266,39 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | @@ -264,38 +266,39 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | ||
264 | }); | 266 | }); |
265 | 267 | ||
266 | //通知时间段拼接字符 | 268 | //通知时间段拼接字符 |
267 | - function times(timeVal){ | ||
268 | - var str=''; | ||
269 | - $.each($('.alarm_subscribe_times'),function (i,v) { | ||
270 | - if($('.alarm_subscribe_times').eq(i).val()!=''){ | ||
271 | - str+=$('.alarm_subscribe_times').eq(i).val()+','; | ||
272 | - }else{ | ||
273 | - timeVal.val=0; | 269 | + function times(timeVal) { |
270 | + var str = ''; | ||
271 | + $.each($('.alarm_subscribe_times'), function (i, v) { | ||
272 | + if ($('.alarm_subscribe_times').eq(i).val() != '') { | ||
273 | + str += $('.alarm_subscribe_times').eq(i).val() + ','; | ||
274 | + } else { | ||
275 | + timeVal.val = 0; | ||
274 | } | 276 | } |
275 | }) | 277 | }) |
276 | - return str.slice(0,str.length-1); | 278 | + return str.slice(0, str.length - 1); |
277 | } | 279 | } |
280 | + | ||
278 | //保存 | 281 | //保存 |
279 | - var str=0; | ||
280 | - $("#alarmsubscribe-form-save-id").on("click",function (){ | 282 | + var str = 0; |
283 | + $("#alarmsubscribe-form-save-id").on("click", function () { | ||
281 | 284 | ||
282 | - if(str==1){ | 285 | + if (str == 1) { |
283 | layer.msg("数据正在保存,请稍后在试!"); | 286 | layer.msg("数据正在保存,请稍后在试!"); |
284 | return false; | 287 | return false; |
285 | } | 288 | } |
286 | var data = form.val("add-alarmsubscribe-form"); | 289 | var data = form.val("add-alarmsubscribe-form"); |
287 | - var val=1; | ||
288 | - var timeVal={val}; | 290 | + var val = 1; |
291 | + var timeVal = {val}; | ||
289 | //通知时间段 | 292 | //通知时间段 |
290 | - data.times=times(timeVal); | ||
291 | - if(data.times=='' || timeVal.val==0){ | 293 | + data.times = times(timeVal); |
294 | + if (data.times == '' || timeVal.val == 0) { | ||
292 | layer.msg("请将信息填写完整", {offset: '15px', icon: 7, time: 1500}); | 295 | layer.msg("请将信息填写完整", {offset: '15px', icon: 7, time: 1500}); |
293 | return false; | 296 | return false; |
294 | } | 297 | } |
295 | - var verdict=1; | ||
296 | - var timeVals={verdict}; | 298 | + var verdict = 1; |
299 | + var timeVals = {verdict}; | ||
297 | //时间格式判断 | 300 | //时间格式判断 |
298 | - if(timeHorizon(data.times,timeVals)==0 || timeVals.verdict==0){ | 301 | + if (timeHorizon(data.times, timeVals) == 0 || timeVals.verdict == 0) { |
299 | layer.msg("请选择合理的时间范围或时间段", {offset: '15px', icon: 7, time: 1500}); | 302 | layer.msg("请选择合理的时间范围或时间段", {offset: '15px', icon: 7, time: 1500}); |
300 | return false; | 303 | return false; |
301 | } | 304 | } |
@@ -305,11 +308,11 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | @@ -305,11 +308,11 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | ||
305 | selectedTags.each(function () { | 308 | selectedTags.each(function () { |
306 | contents.push($(this).data("id")) | 309 | contents.push($(this).data("id")) |
307 | receiveUserInfos.push({ | 310 | receiveUserInfos.push({ |
308 | - username:$(this).data("username"), | ||
309 | - nickname:$(this).data("nickname"), | ||
310 | - phone:$(this).data("phone"), | ||
311 | - operator:$(this).data("operator"), | ||
312 | - email:$(this).data("email") | 311 | + username: $(this).data("username"), |
312 | + nickname: $(this).data("nickname"), | ||
313 | + phone: $(this).data("phone"), | ||
314 | + operator: $(this).data("operator"), | ||
315 | + email: $(this).data("email") | ||
313 | }) | 316 | }) |
314 | }); | 317 | }); |
315 | receiveUser = contents.toString() | 318 | receiveUser = contents.toString() |
@@ -319,7 +322,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | @@ -319,7 +322,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | ||
319 | var selectedOrgs = $("#selecte_org_content_id").find("span"); | 322 | var selectedOrgs = $("#selecte_org_content_id").find("span"); |
320 | selectedOrgs.each(function () { | 323 | selectedOrgs.each(function () { |
321 | receiveOrgInfos.push({ | 324 | receiveOrgInfos.push({ |
322 | - targetId: $(this).data("id")+'', | 325 | + targetId: $(this).data("id") + '', |
323 | type: 1 | 326 | type: 1 |
324 | }); | 327 | }); |
325 | }); | 328 | }); |
@@ -328,47 +331,47 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | @@ -328,47 +331,47 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | ||
328 | var selectedGroups = $("#selecte_group_content_id").find("span"); | 331 | var selectedGroups = $("#selecte_group_content_id").find("span"); |
329 | selectedGroups.each(function () { | 332 | selectedGroups.each(function () { |
330 | receiveGroupInfoS.push({ | 333 | receiveGroupInfoS.push({ |
331 | - targetId: $(this).data("id")+'', | 334 | + targetId: $(this).data("id") + '', |
332 | type: 2 | 335 | type: 2 |
333 | }) | 336 | }) |
334 | }); | 337 | }); |
335 | data.subGroupLists = receiveGroupInfoS; | 338 | data.subGroupLists = receiveGroupInfoS; |
336 | delete data["sub_send_type"]; | 339 | delete data["sub_send_type"]; |
337 | - form.on('submit(add-alarmsubscribe-form)',function () { | ||
338 | - var alrmlevels = [],reportTypes = []; | ||
339 | - $('input[name="reportType"]:checked').each(function() { | 340 | + form.on('submit(add-alarmsubscribe-form)', function () { |
341 | + var alrmlevels = [], reportTypes = []; | ||
342 | + $('input[name="reportType"]:checked').each(function () { | ||
340 | reportTypes.push($(this).val()); | 343 | reportTypes.push($(this).val()); |
341 | }); | 344 | }); |
342 | - $('input[name="alarmLevel"]:checked').each(function() { | 345 | + $('input[name="alarmLevel"]:checked').each(function () { |
343 | alrmlevels.push($(this).val()); | 346 | alrmlevels.push($(this).val()); |
344 | }); | 347 | }); |
345 | data.alarmLevel = alrmlevels.toString(); | 348 | data.alarmLevel = alrmlevels.toString(); |
346 | data.reportType = reportTypes.toString(); | 349 | data.reportType = reportTypes.toString(); |
347 | //通知周期 | 350 | //通知周期 |
348 | - if($('input[name="sub_send_type"]:checked').val() == "1"){ | 351 | + if ($('input[name="sub_send_type"]:checked').val() == "1") { |
349 | data.sentFrequency = $("#sentFrequency_select").val(); | 352 | data.sentFrequency = $("#sentFrequency_select").val(); |
350 | - }else{ | 353 | + } else { |
351 | data.sentFrequency = $("#sentFrequency_input").val(); | 354 | data.sentFrequency = $("#sentFrequency_input").val(); |
352 | } | 355 | } |
353 | - str=1; | 356 | + str = 1; |
354 | admin.req({ | 357 | admin.req({ |
355 | - url : domainName + '/api-web/alarmsubscribe/save?access_token='+accessToken | ||
356 | - ,data:JSON.stringify(data) | ||
357 | - ,type:'post' | ||
358 | - ,contentType: "application/json; charset=utf-8" | ||
359 | - ,done:function (res){ | ||
360 | - if(res.success){ | ||
361 | - localStorage.setItem("detailPageOfcustomSubId",res.str) | ||
362 | - layer.msg(res.msg, { offset: '15px' , icon: 1 , time: 1000 },function (){ | 358 | + url: domainName + '/api-web/alarmsubscribe/save?access_token=' + accessToken |
359 | + , data: JSON.stringify(data) | ||
360 | + , type: 'post' | ||
361 | + , contentType: "application/json; charset=utf-8" | ||
362 | + , done: function (res) { | ||
363 | + if (res.success) { | ||
364 | + localStorage.setItem("detailPageOfcustomSubId", res.str) | ||
365 | + layer.msg(res.msg, {offset: '15px', icon: 1, time: 1000}, function () { | ||
363 | receiveUserInfos = []; | 366 | receiveUserInfos = []; |
364 | - if(layui.alarmsubscribeIndex && layui.alarmsubscribeIndex()){ | 367 | + if (layui.alarmsubscribeIndex && layui.alarmsubscribeIndex()) { |
365 | layer.closeAll(); | 368 | layer.closeAll(); |
366 | - str=0; | 369 | + str = 0; |
367 | layui.alarmsubscribeIndex().reloadsubscribe(); | 370 | layui.alarmsubscribeIndex().reloadsubscribe(); |
368 | } | 371 | } |
369 | }); | 372 | }); |
370 | - }else{ | ||
371 | - layer.msg(res.msg, { offset: '15px' , icon: 7 , time: 1000 }); | 373 | + } else { |
374 | + layer.msg(res.msg, {offset: '15px', icon: 7, time: 1000}); | ||
372 | } | 375 | } |
373 | } | 376 | } |
374 | }); | 377 | }); |
@@ -397,7 +400,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | @@ -397,7 +400,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | ||
397 | var selectUser = returnValue.selectUser; | 400 | var selectUser = returnValue.selectUser; |
398 | // if (selectUser){ //如果有选择用户返回 | 401 | // if (selectUser){ //如果有选择用户返回 |
399 | $('#selecte_content_id').html(''); | 402 | $('#selecte_content_id').html(''); |
400 | - $.each(selectUser,function (i,v){ //处理元素,满足writeTagsInfo格式 | 403 | + $.each(selectUser, function (i, v) { //处理元素,满足writeTagsInfo格式 |
401 | v.nickname = v.name; | 404 | v.nickname = v.name; |
402 | v.username = v.value; | 405 | v.username = v.value; |
403 | writeTagsInfo(v); //将选择的用户回填到 | 406 | writeTagsInfo(v); //将选择的用户回填到 |
@@ -407,18 +410,18 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | @@ -407,18 +410,18 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | ||
407 | var selectOrg = returnValue.selectOrg; | 410 | var selectOrg = returnValue.selectOrg; |
408 | // if (selectOrg){ | 411 | // if (selectOrg){ |
409 | var divId = 'selecte_org_content_id'; | 412 | var divId = 'selecte_org_content_id'; |
410 | - $('#'+divId).html(''); | ||
411 | - $.each(selectOrg,function (i,v){ | ||
412 | - writeOrgTagsInfo(v,divId); | 413 | + $('#' + divId).html(''); |
414 | + $.each(selectOrg, function (i, v) { | ||
415 | + writeOrgTagsInfo(v, divId); | ||
413 | }) | 416 | }) |
414 | // } | 417 | // } |
415 | //回填订阅组 | 418 | //回填订阅组 |
416 | var selectGroup = returnValue.selectGroup; | 419 | var selectGroup = returnValue.selectGroup; |
417 | // if (selectGroup){ | 420 | // if (selectGroup){ |
418 | var divId = 'selecte_group_content_id'; | 421 | var divId = 'selecte_group_content_id'; |
419 | - $('#'+divId).html(''); | ||
420 | - $.each(selectGroup,function (i,v){ | ||
421 | - writeOrgTagsInfo(v,divId); | 422 | + $('#' + divId).html(''); |
423 | + $.each(selectGroup, function (i, v) { | ||
424 | + writeOrgTagsInfo(v, divId); | ||
422 | }) | 425 | }) |
423 | 426 | ||
424 | // } | 427 | // } |
@@ -436,7 +439,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | @@ -436,7 +439,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | ||
436 | <button type="button" value="${data.id}" class="tagsclose close">×</button> | 439 | <button type="button" value="${data.id}" class="tagsclose close">×</button> |
437 | </span> | 440 | </span> |
438 | `; | 441 | `; |
439 | - if(data.username){ | 442 | + if (data.username) { |
440 | //拼接标签 | 443 | //拼接标签 |
441 | $("#selecte_content_id").append(tags); | 444 | $("#selecte_content_id").append(tags); |
442 | //绑定标签的删除事件 | 445 | //绑定标签的删除事件 |
@@ -446,29 +449,29 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | @@ -446,29 +449,29 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | ||
446 | 449 | ||
447 | //写入订阅部门或组标签内容 | 450 | //写入订阅部门或组标签内容 |
448 | //data:数据 type:org/group | 451 | //data:数据 type:org/group |
449 | - function writeOrgTagsInfo(data,divId) { | 452 | + function writeOrgTagsInfo(data, divId) { |
450 | var tags = ` | 453 | var tags = ` |
451 | <span id="tags_span_${data.value}" data-id="${data.value}" data-name="${data.name}" | 454 | <span id="tags_span_${data.value}" data-id="${data.value}" data-name="${data.name}" |
452 | ><em>${data.name}</em> | 455 | ><em>${data.name}</em> |
453 | <button type="button" value="${data.value}" class="tagsclose close">×</button> | 456 | <button type="button" value="${data.value}" class="tagsclose close">×</button> |
454 | </span> | 457 | </span> |
455 | `; | 458 | `; |
456 | - if(data.value){ | 459 | + if (data.value) { |
457 | //拼接标签 | 460 | //拼接标签 |
458 | - $("#"+divId).append(tags); | 461 | + $("#" + divId).append(tags); |
459 | //绑定标签的删除事件 | 462 | //绑定标签的删除事件 |
460 | bindTagesDelEvent(); | 463 | bindTagesDelEvent(); |
461 | } | 464 | } |
462 | } | 465 | } |
463 | 466 | ||
464 | //切换订阅类型 | 467 | //切换订阅类型 |
465 | - function switchSubType(subType,data) { | 468 | + function switchSubType(subType, data) { |
466 | var dom = $('form[name="add-alarmsubscribe-form"]'); | 469 | var dom = $('form[name="add-alarmsubscribe-form"]'); |
467 | - if (subType == '3'){ | ||
468 | - dom.find('input[name="sendTotal"]').attr('readonly','readonly').val('1'); | ||
469 | - dom.find('input[name="sub_send_type"]').attr('disabled','disabled'); | ||
470 | - dom.find('input[type="radio"][name="sub_send_type"][value="1"]').attr('checked','checked'); | ||
471 | - dom.find('#sentFrequency_select').attr('disabled','disabled').val('1'); | 470 | + if (subType == '3') { |
471 | + dom.find('input[name="sendTotal"]').attr('readonly', 'readonly').val('1'); | ||
472 | + dom.find('input[name="sub_send_type"]').attr('disabled', 'disabled'); | ||
473 | + dom.find('input[type="radio"][name="sub_send_type"][value="1"]').attr('checked', 'checked'); | ||
474 | + dom.find('#sentFrequency_select').attr('disabled', 'disabled').val('1'); | ||
472 | } else { | 475 | } else { |
473 | var sendTotal = ''; | 476 | var sendTotal = ''; |
474 | var sentFrequency = '1'; | 477 | var sentFrequency = '1'; |
@@ -485,52 +488,53 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | @@ -485,52 +488,53 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common','sessions','cron','o | ||
485 | //删除标签事件 | 488 | //删除标签事件 |
486 | function bindTagesDelEvent() { | 489 | function bindTagesDelEvent() { |
487 | //删除已选主体的页签 | 490 | //删除已选主体的页签 |
488 | - $("button.tagsclose").on("click",function () { | 491 | + $("button.tagsclose").on("click", function () { |
489 | var id = $(this).attr("value"); | 492 | var id = $(this).attr("value"); |
490 | - $("#tags_span_"+id).remove(); | 493 | + $("#tags_span_" + id).remove(); |
491 | }); | 494 | }); |
492 | } | 495 | } |
493 | 496 | ||
494 | //时间范围判断 | 497 | //时间范围判断 |
495 | - function timeHorizon(times,timeVals){ | ||
496 | - var judge=1; | ||
497 | - var list=times.split(','); | ||
498 | - if(list.length.length<=1){ | 498 | + function timeHorizon(times, timeVals) { |
499 | + var judge = 1; | ||
500 | + var list = times.split(','); | ||
501 | + if (list.length.length <= 1) { | ||
499 | return 1; | 502 | return 1; |
500 | } | 503 | } |
501 | var listTime = [...new Set(list)]; | 504 | var listTime = [...new Set(list)]; |
502 | - if(list.length-listTime.length>0){ | ||
503 | - timeVals.verdict=0; | 505 | + if (list.length - listTime.length > 0) { |
506 | + timeVals.verdict = 0; | ||
504 | } | 507 | } |
505 | - $.each(list,function (x,y) { | ||
506 | - var beforeTime=dateTime(y.split(' - ')[0]); | ||
507 | - var afterTime=dateTime(y.split(' - ')[1]); | 508 | + $.each(list, function (x, y) { |
509 | + var beforeTime = dateTime(y.split(' - ')[0]); | ||
510 | + var afterTime = dateTime(y.split(' - ')[1]); | ||
508 | //判断时间段是否错误 | 511 | //判断时间段是否错误 |
509 | - if(beforeTime>=afterTime){ | ||
510 | - timeVals.verdict=0; | 512 | + if (beforeTime >= afterTime) { |
513 | + timeVals.verdict = 0; | ||
511 | } | 514 | } |
512 | - $.each(list,function (i,v) { | ||
513 | - if(v!=y){ | 515 | + $.each(list, function (i, v) { |
516 | + if (v != y) { | ||
514 | //获取开始时间 | 517 | //获取开始时间 |
515 | - var startTime=dateTime(v.split(' - ')[0]); | 518 | + var startTime = dateTime(v.split(' - ')[0]); |
516 | //获取结束时间 | 519 | //获取结束时间 |
517 | - var overTime=dateTime(v.split(' - ')[1]); | 520 | + var overTime = dateTime(v.split(' - ')[1]); |
518 | //判断是否在时间段里 | 521 | //判断是否在时间段里 |
519 | if (beforeTime >= startTime && beforeTime <= overTime) { | 522 | if (beforeTime >= startTime && beforeTime <= overTime) { |
520 | - judge=0; | 523 | + judge = 0; |
521 | } | 524 | } |
522 | - if(afterTime >= startTime && afterTime <= overTime){ | ||
523 | - judge=0; | 525 | + if (afterTime >= startTime && afterTime <= overTime) { |
526 | + judge = 0; | ||
524 | } | 527 | } |
525 | } | 528 | } |
526 | }); | 529 | }); |
527 | }); | 530 | }); |
528 | return judge; | 531 | return judge; |
529 | } | 532 | } |
533 | + | ||
530 | //时间格式转换 | 534 | //时间格式转换 |
531 | - function dateTime(timeDate){ | ||
532 | - var split=timeDate.split(":"); | ||
533 | - var myDate=new Date(2021,6,14,split[0],split[1],split[2]); | 535 | + function dateTime(timeDate) { |
536 | + var split = timeDate.split(":"); | ||
537 | + var myDate = new Date(2021, 6, 14, split[0], split[1], split[2]); | ||
534 | return myDate; | 538 | return myDate; |
535 | } | 539 | } |
536 | }); | 540 | }); |
1 | //告警订阅 | 1 | //告警订阅 |
2 | -layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function (exports) { | 2 | +layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function (exports) { |
3 | var $ = layui.$; | 3 | var $ = layui.$; |
4 | var form = layui.form; | 4 | var form = layui.form; |
5 | var layer = layui.layer; | 5 | var layer = layui.layer; |
@@ -14,9 +14,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -14,9 +14,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
14 | var noticeWaySelect = {}; //通知方式下拉框 | 14 | var noticeWaySelect = {}; //通知方式下拉框 |
15 | var subTypeSelect = {}; //订阅类型下拉框 | 15 | var subTypeSelect = {}; //订阅类型下拉框 |
16 | var busId = ''; | 16 | var busId = ''; |
17 | - if(data && data.policyId){ | 17 | + if (data && data.policyId) { |
18 | policyId = data.policyId; | 18 | policyId = data.policyId; |
19 | - }else{ | 19 | + } else { |
20 | var policyId = ""; | 20 | var policyId = ""; |
21 | } | 21 | } |
22 | var resIdList = (data && data.resIdList) ? data.resIdList : []; | 22 | var resIdList = (data && data.resIdList) ? data.resIdList : []; |
@@ -32,20 +32,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -32,20 +32,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
32 | } | 32 | } |
33 | }); | 33 | }); |
34 | //查询按钮点击事件 joke add 20210427 | 34 | //查询按钮点击事件 joke add 20210427 |
35 | - $('#alarmsubscribeQueryBtn').on('click',function () { | 35 | + $('#alarmsubscribeQueryBtn').on('click', function () { |
36 | reloadalarmsubscribeTable(); | 36 | reloadalarmsubscribeTable(); |
37 | }) | 37 | }) |
38 | //资源类型 | 38 | //资源类型 |
39 | - form.on('select(alarmsubscribe_type)', function(){ | 39 | + form.on('select(alarmsubscribe_type)', function () { |
40 | reloadalarmsubscribeTable(); | 40 | reloadalarmsubscribeTable(); |
41 | }); | 41 | }); |
42 | //业务类型 | 42 | //业务类型 |
43 | - form.on('select(alarmsubscribe_noticeway)', function(){ | 43 | + form.on('select(alarmsubscribe_noticeway)', function () { |
44 | reloadalarmsubscribeTable(); | 44 | reloadalarmsubscribeTable(); |
45 | }); | 45 | }); |
46 | form.render(null, 'alarmsubscribe-form'); | 46 | form.render(null, 'alarmsubscribe-form'); |
47 | //新增 | 47 | //新增 |
48 | - $("#alarmsubscribe_create").off("click").on("click",function () { | 48 | + $("#alarmsubscribe_create").off("click").on("click", function () { |
49 | if ($.inArray('back:alarmsubscribe:save', checkList) == -1) { | 49 | if ($.inArray('back:alarmsubscribe:save', checkList) == -1) { |
50 | layer.msg('暂无权限!', {icon: 7, time: 3000}); | 50 | layer.msg('暂无权限!', {icon: 7, time: 3000}); |
51 | return; | 51 | return; |
@@ -53,53 +53,53 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -53,53 +53,53 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
53 | openAlarmsubscribeForm(); | 53 | openAlarmsubscribeForm(); |
54 | }); | 54 | }); |
55 | //删除 | 55 | //删除 |
56 | - $("#alarmsubscribe_delete").on("click",function () { | 56 | + $("#alarmsubscribe_delete").on("click", function () { |
57 | deletealarmsubscribe(); | 57 | deletealarmsubscribe(); |
58 | }); | 58 | }); |
59 | //同步 | 59 | //同步 |
60 | - $("#alarmsubscribe_sync").on("click",function () { | 60 | + $("#alarmsubscribe_sync").on("click", function () { |
61 | if ($.inArray('back:alarmsubscribe:synchronization', checkList) == -1) { | 61 | if ($.inArray('back:alarmsubscribe:synchronization', checkList) == -1) { |
62 | layer.msg('暂无权限!', {icon: 7, time: 3000}); | 62 | layer.msg('暂无权限!', {icon: 7, time: 3000}); |
63 | return; | 63 | return; |
64 | } | 64 | } |
65 | var ids = []; | 65 | var ids = []; |
66 | var data = table.checkStatus('alarmsubscribeTable').data; | 66 | var data = table.checkStatus('alarmsubscribeTable').data; |
67 | - if(data && data.length > 0){ | ||
68 | - $.each(data,function (i,obj) { | 67 | + if (data && data.length > 0) { |
68 | + $.each(data, function (i, obj) { | ||
69 | ids.push(obj.subId); | 69 | ids.push(obj.subId); |
70 | }); | 70 | }); |
71 | } | 71 | } |
72 | if (ids.length == 0) { | 72 | if (ids.length == 0) { |
73 | - layer.msg('请选择要同步的数据',{icon: 7,time:2000}); | 73 | + layer.msg('请选择要同步的数据', {icon: 7, time: 2000}); |
74 | return; | 74 | return; |
75 | } | 75 | } |
76 | admin.req({ | 76 | admin.req({ |
77 | - url:common.domainName + '/api-web/alarmsubscribe/sync' | ||
78 | - , data:{ | ||
79 | - ids:ids.toString() | 77 | + url: common.domainName + '/api-web/alarmsubscribe/sync' |
78 | + , data: { | ||
79 | + ids: ids.toString() | ||
80 | } | 80 | } |
81 | }).done(function (res) { | 81 | }).done(function (res) { |
82 | - if(res.success){ | ||
83 | - layer.msg(res.msg, { offset: '15px' , icon: 1, time: 2000},function (){ | 82 | + if (res.success) { |
83 | + layer.msg(res.msg, {offset: '15px', icon: 1, time: 2000}, function () { | ||
84 | reloadalarmsubscribeTable(); | 84 | reloadalarmsubscribeTable(); |
85 | }); | 85 | }); |
86 | - }else{ | ||
87 | - layer.msg(res.msg, { offset: '15px' , icon: 7, time: 2000}); | 86 | + } else { |
87 | + layer.msg(res.msg, {offset: '15px', icon: 7, time: 2000}); | ||
88 | } | 88 | } |
89 | }); | 89 | }); |
90 | }); | 90 | }); |
91 | - if(resIdList && resIdList.length > 0){ | 91 | + if (resIdList && resIdList.length > 0) { |
92 | $('#alarmsubscribe_unbind_res').removeClass('hide'); | 92 | $('#alarmsubscribe_unbind_res').removeClass('hide'); |
93 | $('#alarmsubscribe_unbind_res').unbind('click').on('click', function () { | 93 | $('#alarmsubscribe_unbind_res').unbind('click').on('click', function () { |
94 | var ids = []; | 94 | var ids = []; |
95 | var data = table.checkStatus('alarmsubscribeTable').data; | 95 | var data = table.checkStatus('alarmsubscribeTable').data; |
96 | - if(data && data.length > 0){ | ||
97 | - $.each(data,function (i,obj) { | 96 | + if (data && data.length > 0) { |
97 | + $.each(data, function (i, obj) { | ||
98 | ids.push(obj.subId); | 98 | ids.push(obj.subId); |
99 | }); | 99 | }); |
100 | } | 100 | } |
101 | if (ids.length == 0) { | 101 | if (ids.length == 0) { |
102 | - layer.msg('请选择数据',{icon: 7,time:2000}); | 102 | + layer.msg('请选择数据', {icon: 7, time: 2000}); |
103 | return; | 103 | return; |
104 | } | 104 | } |
105 | layer.confirm('确认要取消绑定吗?', {icon: 3}, function (index) { | 105 | layer.confirm('确认要取消绑定吗?', {icon: 3}, function (index) { |
@@ -154,12 +154,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -154,12 +154,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
154 | filterable: true, | 154 | filterable: true, |
155 | layVerType: 'msg', | 155 | layVerType: 'msg', |
156 | data: [ | 156 | data: [ |
157 | - {name: '微信',value: 'wechat'}, | ||
158 | - {name: '短信',value: 'msg'}, | ||
159 | - {name: '邮件',value: 'email'}, | 157 | + {name: '微信', value: 'wechat'}, |
158 | + {name: '短信', value: 'msg'}, | ||
159 | + {name: '邮件', value: 'email'}, | ||
160 | ] | 160 | ] |
161 | }) | 161 | }) |
162 | } | 162 | } |
163 | + | ||
163 | //初始化订阅方式下拉框 | 164 | //初始化订阅方式下拉框 |
164 | function initSubWaySelect() { | 165 | function initSubWaySelect() { |
165 | subTypeSelect = xmSelect.render({ | 166 | subTypeSelect = xmSelect.render({ |
@@ -183,10 +184,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -183,10 +184,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
183 | filterable: true, | 184 | filterable: true, |
184 | layVerType: 'msg', | 185 | layVerType: 'msg', |
185 | data: [ | 186 | data: [ |
186 | - {name: '告警订阅',value: '1'}, | ||
187 | - {name: '报表订阅',value: '2'}, | ||
188 | - {name: '系统通知订阅',value: '3'}, | ||
189 | - {name: '采集器异常订阅',value: '4'} | 187 | + {name: '告警订阅', value: '1'}, |
188 | + {name: '报表订阅', value: '2'}, | ||
189 | + {name: '系统通知订阅', value: '3'}, | ||
190 | + {name: '采集器异常订阅', value: '4'} | ||
190 | ] | 191 | ] |
191 | }) | 192 | }) |
192 | } | 193 | } |
@@ -196,9 +197,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -196,9 +197,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
196 | var alarmsubscribeTable = table.render({ | 197 | var alarmsubscribeTable = table.render({ |
197 | elem: '#alarmsubscribeTable' | 198 | elem: '#alarmsubscribeTable' |
198 | , url: domainName + '/api-web/alarmsubscribe/page' | 199 | , url: domainName + '/api-web/alarmsubscribe/page' |
199 | - , where:{ | ||
200 | - access_token:accessToken, | ||
201 | - policyId:policyId, | 200 | + , where: { |
201 | + access_token: accessToken, | ||
202 | + policyId: policyId, | ||
202 | subName: conditions.subName, | 203 | subName: conditions.subName, |
203 | subType: subTypeSelect.getValue("valueStr"), | 204 | subType: subTypeSelect.getValue("valueStr"), |
204 | subWay: noticeWaySelect.getValue("valueStr"), | 205 | subWay: noticeWaySelect.getValue("valueStr"), |
@@ -208,9 +209,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -208,9 +209,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
208 | , height: 'full-200' | 209 | , height: 'full-200' |
209 | , page: { | 210 | , page: { |
210 | layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] | 211 | layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] |
211 | - ,theme: '#1E9FFF'//自定义分页主题颜色 | 212 | + , theme: '#1E9FFF'//自定义分页主题颜色 |
212 | } | 213 | } |
213 | - , end: function(e){ | 214 | + , end: function (e) { |
214 | form.render(); | 215 | form.render(); |
215 | } | 216 | } |
216 | // , limit: 20 | 217 | // , limit: 20 |
@@ -218,12 +219,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -218,12 +219,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
218 | , cols: [[ | 219 | , cols: [[ |
219 | {type: 'checkbox'} | 220 | {type: 'checkbox'} |
220 | , { | 221 | , { |
221 | - field: 'subName', title: '订阅名称', align: 'center', sort: true,minWidth:200, | 222 | + field: 'subName', title: '订阅名称', align: 'center', sort: true, minWidth: 200, |
222 | templet: '<div><span data-id="{{d.subId}}" class="layui-table-link view-alarmsubscribe-name">{{d.subName}}</span></div>' | 223 | templet: '<div><span data-id="{{d.subId}}" class="layui-table-link view-alarmsubscribe-name">{{d.subName}}</span></div>' |
223 | } | 224 | } |
224 | - , {field: 'subType', title: '订阅类型', align: 'center', sort: true, width:120, | ||
225 | - templet: function (d){ | ||
226 | - switch (d.subType){ | 225 | + , { |
226 | + field: 'subType', title: '订阅类型', align: 'center', sort: true, width: 120, | ||
227 | + templet: function (d) { | ||
228 | + switch (d.subType) { | ||
227 | case '1': | 229 | case '1': |
228 | return '告警订阅' | 230 | return '告警订阅' |
229 | break; | 231 | break; |
@@ -237,10 +239,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -237,10 +239,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
237 | return '采集器异常订阅' | 239 | return '采集器异常订阅' |
238 | break; | 240 | break; |
239 | } | 241 | } |
240 | - }} | ||
241 | - , {field: 'subWay', title: '通知类型', align: 'center', sort: true, width:120, | ||
242 | - templet: function (d){ | ||
243 | - switch (d.subWay){ | 242 | + } |
243 | + } | ||
244 | + , { | ||
245 | + field: 'subWay', title: '通知类型', align: 'center', sort: true, width: 120, | ||
246 | + templet: function (d) { | ||
247 | + switch (d.subWay) { | ||
244 | case 'wechat': | 248 | case 'wechat': |
245 | return '<div class="small-icon small-icon-wechat"></div>' | 249 | return '<div class="small-icon small-icon-wechat"></div>' |
246 | break; | 250 | break; |
@@ -270,11 +274,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -270,11 +274,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
270 | <span data-id="${d.subId}" class="layui-table-link view-alarmsubscribe-busId" lay-tips="业务系统">${d.busSubTotal}</span> | 274 | <span data-id="${d.subId}" class="layui-table-link view-alarmsubscribe-busId" lay-tips="业务系统">${d.busSubTotal}</span> |
271 | </div>`; | 275 | </div>`; |
272 | 276 | ||
273 | - }} | ||
274 | - , {field: 'tempType', title: '通知说明', align: 'left', sort: true, width:240, | ||
275 | - templet: function (d){ | 277 | + } |
278 | + } | ||
279 | + , { | ||
280 | + field: 'tempType', title: '通知说明', align: 'left', sort: true, width: 240, | ||
281 | + templet: function (d) { | ||
276 | var sendWay = ''; | 282 | var sendWay = ''; |
277 | - switch (d.subWay){ | 283 | + switch (d.subWay) { |
278 | case 'wechat': | 284 | case 'wechat': |
279 | sendWay = '微信' | 285 | sendWay = '微信' |
280 | break; | 286 | break; |
@@ -285,28 +291,33 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -285,28 +291,33 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
285 | sendWay = '短信'; | 291 | sendWay = '短信'; |
286 | break; | 292 | break; |
287 | } | 293 | } |
288 | - var unit = d.sentFrequency && d.sentFrequency.indexOf("?")>0?"":"分钟一次"; | 294 | + var unit = d.sentFrequency && d.sentFrequency.indexOf("?") > 0 ? "" : "分钟一次"; |
289 | return `${sendWay}通知${d.sendTotal}次;频率${d.sentFrequency}${unit}`; | 295 | return `${sendWay}通知${d.sendTotal}次;频率${d.sentFrequency}${unit}`; |
290 | - }} | ||
291 | - , {field: 'userTotal', title: '订阅人数', align: 'right', sort: true, width:120, | ||
292 | - templet:function (d){ | ||
293 | - if(d.userTotal != '0'){ | 296 | + } |
297 | + } | ||
298 | + , { | ||
299 | + field: 'userTotal', title: '订阅人数', align: 'right', sort: true, width: 120, | ||
300 | + templet: function (d) { | ||
301 | + if (d.userTotal != '0') { | ||
294 | return `<div><span data-id="${d.subId}" class="layui-table-link view-alarmsubscribe-users-total">${d.userTotal}</span></div>`; | 302 | return `<div><span data-id="${d.subId}" class="layui-table-link view-alarmsubscribe-users-total">${d.userTotal}</span></div>`; |
295 | - }else{ | 303 | + } else { |
296 | return d.userTotal; | 304 | return d.userTotal; |
297 | } | 305 | } |
298 | - }} | ||
299 | - , {field: 'times', title: '允许通知时间段', align: 'center', sort: true, width:180} | ||
300 | - , {field: 'syncFlag',title: '同步状态',align: 'center', sort: true,width:120, | ||
301 | - templet: function(d){ | ||
302 | - if(d.syncFlag == 0){ //未同步 | 306 | + } |
307 | + } | ||
308 | + , {field: 'times', title: '允许通知时间段', align: 'center', sort: true, width: 180} | ||
309 | + , { | ||
310 | + field: 'syncFlag', title: '同步状态', align: 'center', sort: true, width: 120, | ||
311 | + templet: function (d) { | ||
312 | + if (d.syncFlag == 0) { //未同步 | ||
303 | return `<input type="checkbox" id="${d.subId}" name="close" lay-skin="switch" lay-filter="switchSyncalarmsubscribe" lay-text="已同步|未同步">`; | 313 | return `<input type="checkbox" id="${d.subId}" name="close" lay-skin="switch" lay-filter="switchSyncalarmsubscribe" lay-text="已同步|未同步">`; |
304 | - }else{ | 314 | + } else { |
305 | return ' <button type="button" class="layui-btn layui-bg-green layui-btn-radius layui-btn-xs p-0-15">已同步</button>'; | 315 | return ' <button type="button" class="layui-btn layui-bg-green layui-btn-radius layui-btn-xs p-0-15">已同步</button>'; |
306 | } | 316 | } |
307 | } | 317 | } |
308 | } | 318 | } |
309 | - , {title: '操作', align: 'center',minWidth:200,fixed: 'right', toolbar: | 319 | + , { |
320 | + title: '操作', align: 'center', minWidth: 200, fixed: 'right', toolbar: | ||
310 | '<div>' + | 321 | '<div>' + |
311 | '<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>' + | 322 | '<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>' + |
312 | '<button data-id="{{d.subId}}" lay-tips="资源订阅" type="button" class="layui-btn layui-btn-xs layui-btn-normal alarmsubscribe-resource-btn"><i class="iconfont"></i></button>' + | 323 | '<button data-id="{{d.subId}}" lay-tips="资源订阅" type="button" class="layui-btn layui-btn-xs layui-btn-normal alarmsubscribe-resource-btn"><i class="iconfont"></i></button>' + |
@@ -317,9 +328,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -317,9 +328,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
317 | '</div>' | 328 | '</div>' |
318 | } | 329 | } |
319 | ]], | 330 | ]], |
320 | - done:function () { | 331 | + done: function () { |
321 | //点击名称编辑 | 332 | //点击名称编辑 |
322 | - $(".view-alarmsubscribe-name").on("click",function () { | 333 | + $(".view-alarmsubscribe-name").on("click", function () { |
323 | if ($.inArray('back:alarmsubscribe:update', checkList) == -1) { | 334 | if ($.inArray('back:alarmsubscribe:update', checkList) == -1) { |
324 | layer.msg('暂无权限!', {icon: 7, time: 3000}); | 335 | layer.msg('暂无权限!', {icon: 7, time: 3000}); |
325 | return; | 336 | return; |
@@ -328,16 +339,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -328,16 +339,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
328 | }); | 339 | }); |
329 | 340 | ||
330 | //绑定对象列表 | 341 | //绑定对象列表 |
331 | - $(".view-alarmsubscribe-target").on("click",function (){ | 342 | + $(".view-alarmsubscribe-target").on("click", function () { |
332 | var id = $(this).data("id"); | 343 | var id = $(this).data("id"); |
333 | admin.req({ | 344 | admin.req({ |
334 | - url:domainName + '/api-web/bSubscribeBind/bindlist/'+id | ||
335 | - ,data:{subId:id} | ||
336 | - ,done:function (res){ | ||
337 | - if(res.data && res.data.length > 0){ | ||
338 | - var resbind = "",kpibind="",restypebind="",bizbind = ""; | ||
339 | - $.each(res.data,function (i,v){ | ||
340 | - switch (v.type){ | 345 | + url: domainName + '/api-web/bSubscribeBind/bindlist/' + id |
346 | + , data: {subId: id} | ||
347 | + , done: function (res) { | ||
348 | + if (res.data && res.data.length > 0) { | ||
349 | + var resbind = "", kpibind = "", restypebind = "", bizbind = ""; | ||
350 | + $.each(res.data, function (i, v) { | ||
351 | + switch (v.type) { | ||
341 | case "res": //资源订阅 | 352 | case "res": //资源订阅 |
342 | resbind += `<li>${v.mainName} - ${v.relationName}</li>`; | 353 | resbind += `<li>${v.mainName} - ${v.relationName}</li>`; |
343 | break; | 354 | break; |
@@ -380,16 +391,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -380,16 +391,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
380 | }); | 391 | }); |
381 | 392 | ||
382 | //订阅人 | 393 | //订阅人 |
383 | - $(".view-alarmsubscribe-users-total").on("click",function (){ | 394 | + $(".view-alarmsubscribe-users-total").on("click", function () { |
384 | var id = $(this).data("id"); | 395 | var id = $(this).data("id"); |
385 | admin.req({ | 396 | admin.req({ |
386 | - url:domainName + '/api-web/alarmsubscribe/users' | ||
387 | - ,data:{subId:id} | ||
388 | - ,done:function (res){ | ||
389 | - if(res.data && res.data.length > 0){ | 397 | + url: domainName + '/api-web/alarmsubscribe/users' |
398 | + , data: {subId: id} | ||
399 | + , done: function (res) { | ||
400 | + if (res.data && res.data.length > 0) { | ||
390 | var trs = ''; | 401 | var trs = ''; |
391 | - $.each(res.data,function (i,v){ | ||
392 | - trs += `<tr><td>${i+1}</td><td>${v.username}</td><td>${v.nickname}</td><td>${v.email}</td> | 402 | + $.each(res.data, function (i, v) { |
403 | + trs += `<tr><td>${i + 1}</td><td>${v.username}</td><td>${v.nickname}</td><td>${v.email}</td> | ||
393 | <td>${v.phone}</td><td>${v.operator}</td><td>${v.resTotal}</td><td>${v.bizTotal}</td></tr>`; | 404 | <td>${v.phone}</td><td>${v.operator}</td><td>${v.resTotal}</td><td>${v.bizTotal}</td></tr>`; |
394 | }); | 405 | }); |
395 | var tb = `<div class="layui-form" style="padding: 0 10px;"> | 406 | var tb = `<div class="layui-form" style="padding: 0 10px;"> |
@@ -416,49 +427,50 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -416,49 +427,50 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
416 | }); | 427 | }); |
417 | 428 | ||
418 | //设置同步 | 429 | //设置同步 |
419 | - form.on('switch(switchSyncalarmsubscribe)', function(obj){ | 430 | + form.on('switch(switchSyncalarmsubscribe)', function (obj) { |
420 | var alarmsubscribeId = obj.elem.id; | 431 | var alarmsubscribeId = obj.elem.id; |
421 | admin.req({ | 432 | admin.req({ |
422 | - url:common.domainName + '/api-web/alarmsubscribe/sync' | ||
423 | - , data:{ | ||
424 | - ids:alarmsubscribeId | 433 | + url: common.domainName + '/api-web/alarmsubscribe/sync' |
434 | + , data: { | ||
435 | + ids: alarmsubscribeId | ||
425 | } | 436 | } |
426 | }).done(function (res) { | 437 | }).done(function (res) { |
427 | - if(res.success){ | ||
428 | - layer.msg(res.msg, { offset: '15px' , icon: 1, time: 2000},function (){ | 438 | + if (res.success) { |
439 | + layer.msg(res.msg, {offset: '15px', icon: 1, time: 2000}, function () { | ||
429 | reloadalarmsubscribeTable(); | 440 | reloadalarmsubscribeTable(); |
430 | }); | 441 | }); |
431 | - }else{ | ||
432 | - layer.msg(res.msg, { offset: '15px' , icon: 7, time: 2000}); | 442 | + } else { |
443 | + layer.msg(res.msg, {offset: '15px', icon: 7, time: 2000}); | ||
433 | } | 444 | } |
434 | }); | 445 | }); |
435 | }); | 446 | }); |
436 | 447 | ||
437 | //删除 | 448 | //删除 |
438 | - $(".delete-alarmsubscribe-btn").on("click",function () { | 449 | + $(".delete-alarmsubscribe-btn").on("click", function () { |
439 | var id = $(this).data("id"); | 450 | var id = $(this).data("id"); |
440 | deletealarmsubscribe(id) | 451 | deletealarmsubscribe(id) |
441 | }); | 452 | }); |
442 | 453 | ||
443 | //查看资源订阅列表 | 454 | //查看资源订阅列表 |
444 | - $(".view-alarmsubscribe-resource").on("click",function (){ | ||
445 | - if($(this).text() == '0'){ | 455 | + $(".view-alarmsubscribe-resource").on("click", function () { |
456 | + if ($(this).text() == '0') { | ||
446 | layer.msg('暂无订阅资源,请先订阅!', {icon: 7, time: 3000}); | 457 | layer.msg('暂无订阅资源,请先订阅!', {icon: 7, time: 3000}); |
447 | return false; | 458 | return false; |
448 | } | 459 | } |
449 | 460 | ||
450 | 461 | ||
451 | var subId = $(this).data("id"); | 462 | var subId = $(this).data("id"); |
452 | - function getTableData(callback,selectBusId,selectResCode) { | 463 | + |
464 | + function getTableData(callback, selectBusId, selectResCode) { | ||
453 | layer.load(2); | 465 | layer.load(2); |
454 | var busId = ''; | 466 | var busId = ''; |
455 | var resTypeCode = ''; | 467 | var resTypeCode = ''; |
456 | var busType = xmSelect.get('#dyglResListBusType'); | 468 | var busType = xmSelect.get('#dyglResListBusType'); |
457 | var resType = xmSelect.get('#dyglResListResType'); | 469 | var resType = xmSelect.get('#dyglResListResType'); |
458 | - if(selectBusId == undefined){ | 470 | + if (selectBusId == undefined) { |
459 | try { | 471 | try { |
460 | busId = busType[0].getValue()[0].value; | 472 | busId = busType[0].getValue()[0].value; |
461 | - }catch (e) { | 473 | + } catch (e) { |
462 | 474 | ||
463 | } | 475 | } |
464 | } else { | 476 | } else { |
@@ -466,10 +478,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -466,10 +478,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
466 | } | 478 | } |
467 | 479 | ||
468 | 480 | ||
469 | - if(selectResCode == undefined){ | 481 | + if (selectResCode == undefined) { |
470 | try { | 482 | try { |
471 | resTypeCode = resType[0].getValue()[0].value; | 483 | resTypeCode = resType[0].getValue()[0].value; |
472 | - }catch (e) { | 484 | + } catch (e) { |
473 | 485 | ||
474 | } | 486 | } |
475 | } else { | 487 | } else { |
@@ -477,25 +489,26 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -477,25 +489,26 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
477 | } | 489 | } |
478 | 490 | ||
479 | 491 | ||
480 | - | ||
481 | admin.req({ | 492 | admin.req({ |
482 | - url:domainName + '/api-web/alarmsubscribe/ressublsit' | ||
483 | - ,data:{ | ||
484 | - subId:subId, | ||
485 | - busId:busId, | ||
486 | - resTypeCode:resTypeCode, | ||
487 | - keyword:$('#condition-resType-keyword').val() | ||
488 | - } | ||
489 | - ,done:function (res){ | 493 | + url: domainName + '/api-web/alarmsubscribe/ressublsit' |
494 | + , data: { | ||
495 | + subId: subId, | ||
496 | + busId: busId, | ||
497 | + resTypeCode: resTypeCode, | ||
498 | + keyword: $('#condition-resType-keyword').val() | ||
499 | + } | ||
500 | + , done: function (res) { | ||
490 | layer.closeAll('loading'); | 501 | layer.closeAll('loading'); |
491 | callback(res); | 502 | callback(res); |
492 | } | 503 | } |
493 | }); | 504 | }); |
494 | } | 505 | } |
506 | + | ||
495 | getTableData(function (res) { | 507 | getTableData(function (res) { |
496 | var tb = reloadData(res); | 508 | var tb = reloadData(res); |
497 | open(tb); | 509 | open(tb); |
498 | }); | 510 | }); |
511 | + | ||
499 | function open(tb) { | 512 | function open(tb) { |
500 | 513 | ||
501 | var resTypeSelect; | 514 | var resTypeSelect; |
@@ -506,7 +519,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -506,7 +519,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
506 | , area: ['80%', '90%'] | 519 | , area: ['80%', '90%'] |
507 | , id: 'alarm_subscribe_resource_list_id' //设定一个id,防止重复弹出 | 520 | , id: 'alarm_subscribe_resource_list_id' //设定一个id,防止重复弹出 |
508 | , content: tb, | 521 | , content: tb, |
509 | - success:function () { | 522 | + success: function () { |
510 | //绑定业务下拉选择数据 | 523 | //绑定业务下拉选择数据 |
511 | admin.req({ | 524 | admin.req({ |
512 | url: domainName + '/api-web/home/business/findAllBusType', | 525 | url: domainName + '/api-web/home/business/findAllBusType', |
@@ -520,7 +533,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -520,7 +533,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
520 | parentId: item.parentId | 533 | parentId: item.parentId |
521 | } | 534 | } |
522 | }); | 535 | }); |
523 | - var bizTree=common.pidToChildren(bizList, 'value', 'parentId'); | 536 | + var bizTree = common.pidToChildren(bizList, 'value', 'parentId'); |
524 | 537 | ||
525 | // 影响业务下拉框 | 538 | // 影响业务下拉框 |
526 | xmSelect.render({ | 539 | xmSelect.render({ |
@@ -556,10 +569,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -556,10 +569,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
556 | // } else { | 569 | // } else { |
557 | // busId = ''; | 570 | // busId = ''; |
558 | // } | 571 | // } |
559 | - if(data.arr[0]){ | ||
560 | - reloadTbody(data.arr[0].value,undefined); | 572 | + if (data.arr[0]) { |
573 | + reloadTbody(data.arr[0].value, undefined); | ||
561 | } else { | 574 | } else { |
562 | - reloadTbody('',undefined); | 575 | + reloadTbody('', undefined); |
563 | } | 576 | } |
564 | 577 | ||
565 | } | 578 | } |
@@ -613,10 +626,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -613,10 +626,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
613 | height: 'auto', | 626 | height: 'auto', |
614 | data: resTypeTree, | 627 | data: resTypeTree, |
615 | on: function (data) { | 628 | on: function (data) { |
616 | - if(data.arr[0]){ | ||
617 | - reloadTbody(undefined,data.arr[0].value); | 629 | + if (data.arr[0]) { |
630 | + reloadTbody(undefined, data.arr[0].value); | ||
618 | } else { | 631 | } else { |
619 | - reloadTbody(undefined,''); | 632 | + reloadTbody(undefined, ''); |
620 | } | 633 | } |
621 | } | 634 | } |
622 | }); | 635 | }); |
@@ -628,28 +641,28 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -628,28 +641,28 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
628 | if (e.keyCode === 13) { | 641 | if (e.keyCode === 13) { |
629 | var bus = xmSelect.get('#dyglResListBusType', true); | 642 | var bus = xmSelect.get('#dyglResListBusType', true); |
630 | var resType = xmSelect.get('#dyglResListResType', true); | 643 | var resType = xmSelect.get('#dyglResListResType', true); |
631 | - reloadTbody(bus.getValue('valueStr'),resType.getValue('valueStr')); | 644 | + reloadTbody(bus.getValue('valueStr'), resType.getValue('valueStr')); |
632 | } | 645 | } |
633 | }); | 646 | }); |
634 | } | 647 | } |
635 | }); | 648 | }); |
636 | 649 | ||
637 | //删除 | 650 | //删除 |
638 | - $("#alarm_subscribe_resource_list_id table tbody").on("click", "span.resource_sublist_del",function (){ | 651 | + $("#alarm_subscribe_resource_list_id table tbody").on("click", "span.resource_sublist_del", function () { |
639 | var id = $(this).attr("id"); | 652 | var id = $(this).attr("id"); |
640 | admin.req({ | 653 | admin.req({ |
641 | - url:common.domainName+'/api-web/alarmsubscribe/delete/ressub', | ||
642 | - data:{id:id}, | ||
643 | - type:"delete", | ||
644 | - done:function (res){ | ||
645 | - if(res.success){ | ||
646 | - layer.msg("删除成功",{icon:1,time:3000},function (){ | 654 | + url: common.domainName + '/api-web/alarmsubscribe/delete/ressub', |
655 | + data: {id: id}, | ||
656 | + type: "delete", | ||
657 | + done: function (res) { | ||
658 | + if (res.success) { | ||
659 | + layer.msg("删除成功", {icon: 1, time: 3000}, function () { | ||
647 | //reloadalarmsubscribeTable(); | 660 | //reloadalarmsubscribeTable(); |
648 | reloadTbody(); | 661 | reloadTbody(); |
649 | }); | 662 | }); |
650 | - $("#"+id).parent().parent().remove(); | ||
651 | - }else{ | ||
652 | - layer.msg("删除失败,请与管理员联系",{icon:7,time:3000}); | 663 | + $("#" + id).parent().parent().remove(); |
664 | + } else { | ||
665 | + layer.msg("删除失败,请与管理员联系", {icon: 7, time: 3000}); | ||
653 | } | 666 | } |
654 | } | 667 | } |
655 | }); | 668 | }); |
@@ -657,12 +670,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -657,12 +670,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
657 | } | 670 | } |
658 | 671 | ||
659 | 672 | ||
660 | - function reloadTbody(busId,resCode) { | 673 | + function reloadTbody(busId, resCode) { |
661 | getTableData(function (res) { | 674 | getTableData(function (res) { |
662 | var trs = ''; | 675 | var trs = ''; |
663 | - if(res.data && res.data.length > 0){ | ||
664 | - $.each(res.data,function (i,v){ | ||
665 | - trs += `<tr><td>${i+1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td> | 676 | + if (res.data && res.data.length > 0) { |
677 | + $.each(res.data, function (i, v) { | ||
678 | + trs += `<tr><td>${i + 1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td> | ||
666 | <td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`; | 679 | <td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`; |
667 | }); | 680 | }); |
668 | } | 681 | } |
@@ -671,14 +684,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -671,14 +684,14 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
671 | $('#alarm_subscribe_resource_list_id table tbody').html(trs); | 684 | $('#alarm_subscribe_resource_list_id table tbody').html(trs); |
672 | 685 | ||
673 | 686 | ||
674 | - },busId,resCode); | 687 | + }, busId, resCode); |
675 | 688 | ||
676 | } | 689 | } |
677 | 690 | ||
678 | function reloadData(res) { | 691 | function reloadData(res) { |
679 | var trs = ''; | 692 | var trs = ''; |
680 | - $.each(res.data,function (i,v){ | ||
681 | - trs += `<tr><td>${i+1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td> | 693 | + $.each(res.data, function (i, v) { |
694 | + trs += `<tr><td>${i + 1}</td><td>${v.resName}</td><td>${v.ip}</td><td>${v.adminName}</td> | ||
682 | <td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`; | 695 | <td>${v.resTypeName}</td><td>${v.collProtocol}</td><td><span id="${v.relId}" class="link resource_sublist_del">删除</span></td></tr>`; |
683 | }); | 696 | }); |
684 | var tb = ` | 697 | var tb = ` |
@@ -713,26 +726,34 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -713,26 +726,34 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
713 | }); | 726 | }); |
714 | 727 | ||
715 | //查看指标订阅列表 | 728 | //查看指标订阅列表 |
716 | - $(".view-alarmsubscribe-kpi").on("click",function (){ | ||
717 | - if($(this).text() == '0'){ | 729 | + $(".view-alarmsubscribe-kpi").on("click", function () { |
730 | + if ($(this).text() == '0') { | ||
718 | layer.msg('暂无订阅指标,请先订阅!', {icon: 7, time: 3000}); | 731 | layer.msg('暂无订阅指标,请先订阅!', {icon: 7, time: 3000}); |
719 | return false; | 732 | return false; |
720 | } | 733 | } |
721 | var subId = $(this).data("id"); | 734 | var subId = $(this).data("id"); |
722 | admin.req({ | 735 | admin.req({ |
723 | - url:domainName + '/api-web/alarmsubscribe/kpisublsit' | ||
724 | - ,data:{subId:subId} | ||
725 | - ,done:function (res){ | ||
726 | - if(res.data && res.data.length > 0){ | 736 | + url: domainName + '/api-web/alarmsubscribe/kpisublsit' |
737 | + , data: {subId: subId} | ||
738 | + , done: function (res) { | ||
739 | + if (res.data && res.data.length > 0) { | ||
727 | var trs = ''; | 740 | var trs = ''; |
728 | - $.each(res.data,function (i,v){ | 741 | + $.each(res.data, function (i, v) { |
729 | var kpiIdent = ''; | 742 | var kpiIdent = ''; |
730 | - if(v.kpiIdent == '0'){ kpiIdent = "基本指标";} | ||
731 | - if(v.kpiIdent == '1'){ kpiIdent = "性能指标";} | ||
732 | - if(v.kpiIdent == '2'){ kpiIdent = "状态指标";} | ||
733 | - if(v.kpiIdent == '3'){ kpiIdent = "告警指标";} | 743 | + if (v.kpiIdent == '0') { |
744 | + kpiIdent = "基本指标"; | ||
745 | + } | ||
746 | + if (v.kpiIdent == '1') { | ||
747 | + kpiIdent = "性能指标"; | ||
748 | + } | ||
749 | + if (v.kpiIdent == '2') { | ||
750 | + kpiIdent = "状态指标"; | ||
751 | + } | ||
752 | + if (v.kpiIdent == '3') { | ||
753 | + kpiIdent = "告警指标"; | ||
754 | + } | ||
734 | 755 | ||
735 | - trs += `<tr><td>${i+1}</td><td>${v.resId}</td><td>${v.kpiId}</td><td>${v.kpiName}</td> | 756 | + trs += `<tr><td>${i + 1}</td><td>${v.resId}</td><td>${v.kpiId}</td><td>${v.kpiName}</td> |
736 | <td>${kpiIdent}</td><td><span id="${v.relId}" class="link resource_kpi_sublist_del">删除</span></td></tr>`; | 757 | <td>${kpiIdent}</td><td><span id="${v.relId}" class="link resource_kpi_sublist_del">删除</span></td></tr>`; |
737 | }); | 758 | }); |
738 | var tb = `<div class="layui-form" style="padding: 0 10px;"> | 759 | var tb = `<div class="layui-form" style="padding: 0 10px;"> |
@@ -753,18 +774,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -753,18 +774,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
753 | }); | 774 | }); |
754 | 775 | ||
755 | //删除 | 776 | //删除 |
756 | - $("span.resource_kpi_sublist_del").on("click",function (){ | 777 | + $("span.resource_kpi_sublist_del").on("click", function () { |
757 | var id = $(this).attr("id"); | 778 | var id = $(this).attr("id"); |
758 | admin.req({ | 779 | admin.req({ |
759 | - url:common.domainName+'/api-web/alarmsubscribe/delete/kpisub', | ||
760 | - data:{id:id}, | ||
761 | - type:"delete", | ||
762 | - done:function (res){ | ||
763 | - if(res.success){ | ||
764 | - layer.msg("删除成功",{icon:1,time:3000},function (){ | 780 | + url: common.domainName + '/api-web/alarmsubscribe/delete/kpisub', |
781 | + data: {id: id}, | ||
782 | + type: "delete", | ||
783 | + done: function (res) { | ||
784 | + if (res.success) { | ||
785 | + layer.msg("删除成功", {icon: 1, time: 3000}, function () { | ||
765 | reloadalarmsubscribeTable(); | 786 | reloadalarmsubscribeTable(); |
766 | }); | 787 | }); |
767 | - $("#"+id).parent().parent().remove(); | 788 | + $("#" + id).parent().parent().remove(); |
768 | } else { | 789 | } else { |
769 | layer.msg("删除失败,请与管理员联系", {icon: 7, time: 3000}); | 790 | layer.msg("删除失败,请与管理员联系", {icon: 7, time: 3000}); |
770 | } | 791 | } |
@@ -778,7 +799,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -778,7 +799,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
778 | 799 | ||
779 | //查看资源类型订阅列表 | 800 | //查看资源类型订阅列表 |
780 | $(".view-alarmsubscribe-resType").on("click", function () { | 801 | $(".view-alarmsubscribe-resType").on("click", function () { |
781 | - if($(this).text() == '0'){ | 802 | + if ($(this).text() == '0') { |
782 | layer.msg('暂无订阅资源类型,请先订阅!', {icon: 7, time: 3000}); | 803 | layer.msg('暂无订阅资源类型,请先订阅!', {icon: 7, time: 3000}); |
783 | return false; | 804 | return false; |
784 | } | 805 | } |
@@ -794,7 +815,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -794,7 +815,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
794 | 815 | ||
795 | //查看业务类型订阅列表 | 816 | //查看业务类型订阅列表 |
796 | $(".view-alarmsubscribe-busId").on("click", function () { | 817 | $(".view-alarmsubscribe-busId").on("click", function () { |
797 | - if($(this).text() == '0'){ | 818 | + if ($(this).text() == '0') { |
798 | layer.msg('暂无订阅业务系统,请先订阅!', {icon: 7, time: 3000}); | 819 | layer.msg('暂无订阅业务系统,请先订阅!', {icon: 7, time: 3000}); |
799 | return false; | 820 | return false; |
800 | } | 821 | } |
@@ -819,30 +840,30 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -819,30 +840,30 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
819 | oldData = $.map(oldData, function (item) { | 840 | oldData = $.map(oldData, function (item) { |
820 | return item.resId; | 841 | return item.resId; |
821 | }) | 842 | }) |
822 | - common.openWin("template/res/reslist","选择资源",{oldData:oldData},["选择"], function () { | 843 | + common.openWin("template/res/reslist", "选择资源", {oldData: oldData}, ["选择"], function () { |
823 | var data = table.checkStatus('reslist_resListTable').data; | 844 | var data = table.checkStatus('reslist_resListTable').data; |
824 | - if(data.length == 0){ | ||
825 | - layer.msg("请至少选择一条数据!",{icon:7,time:3000}); | 845 | + if (data.length == 0) { |
846 | + layer.msg("请至少选择一条数据!", {icon: 7, time: 3000}); | ||
826 | return false; | 847 | return false; |
827 | } | 848 | } |
828 | var resIds = []; | 849 | var resIds = []; |
829 | - $.each(data,function (i,v){ | 850 | + $.each(data, function (i, v) { |
830 | resIds.push(v.resId); | 851 | resIds.push(v.resId); |
831 | }) | 852 | }) |
832 | 853 | ||
833 | admin.req({ | 854 | admin.req({ |
834 | - url:common.domainName+'/api-web/manage/resource/resourceSub?resIds='+resIds.toString()+'&subId='+subId, | ||
835 | - done:function (res){ | ||
836 | - if(res.success){ | 855 | + url: common.domainName + '/api-web/manage/resource/resourceSub?resIds=' + resIds.toString() + '&subId=' + subId, |
856 | + done: function (res) { | ||
857 | + if (res.success) { | ||
837 | layer.msg('资源订阅成功', { | 858 | layer.msg('资源订阅成功', { |
838 | offset: '15px' | 859 | offset: '15px' |
839 | , icon: 1 | 860 | , icon: 1 |
840 | , time: 2000 | 861 | , time: 2000 |
841 | - },function () { | 862 | + }, function () { |
842 | reloadalarmsubscribeTable(); | 863 | reloadalarmsubscribeTable(); |
843 | layer.closeAll(); | 864 | layer.closeAll(); |
844 | }); | 865 | }); |
845 | - }else{ | 866 | + } else { |
846 | layer.msg('资源订阅失败,请稍后重试', { | 867 | layer.msg('资源订阅失败,请稍后重试', { |
847 | offset: '15px' | 868 | offset: '15px' |
848 | , icon: 7 | 869 | , icon: 7 |
@@ -856,64 +877,64 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -856,64 +877,64 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
856 | }); | 877 | }); |
857 | 878 | ||
858 | //指标订阅 | 879 | //指标订阅 |
859 | - $(".alarmsubscribe-kpi-btn").on("click",function (){ | 880 | + $(".alarmsubscribe-kpi-btn").on("click", function () { |
860 | if ($.inArray('back:alarmsubscribe:target', checkList) == -1) { | 881 | if ($.inArray('back:alarmsubscribe:target', checkList) == -1) { |
861 | layer.msg('暂无权限!', {icon: 7, time: 3000}); | 882 | layer.msg('暂无权限!', {icon: 7, time: 3000}); |
862 | return; | 883 | return; |
863 | } | 884 | } |
864 | var subId = $(this).data("id"); | 885 | var subId = $(this).data("id"); |
865 | - var oldData = getResOrKpiBySubId(subId,'kpi'); | ||
866 | - var oldKpiData = Array.from(new Set($.map(oldData,function (item) { | 886 | + var oldData = getResOrKpiBySubId(subId, 'kpi'); |
887 | + var oldKpiData = Array.from(new Set($.map(oldData, function (item) { | ||
867 | return item.kpiId; | 888 | return item.kpiId; |
868 | }))) | 889 | }))) |
869 | 890 | ||
870 | - common.openWin("baseconfig/kpi/index","选择指标",{oldData:oldKpiData},["选择"], function () { | 891 | + common.openWin("baseconfig/kpi/index", "选择指标", {oldData: oldKpiData}, ["选择"], function () { |
871 | var kpilist = table.checkStatus('kpi_table').data; | 892 | var kpilist = table.checkStatus('kpi_table').data; |
872 | - if(kpilist.length == 0){ | ||
873 | - layer.msg("请至少选择一个指标数据!",{icon:7,time:3000}); | 893 | + if (kpilist.length == 0) { |
894 | + layer.msg("请至少选择一个指标数据!", {icon: 7, time: 3000}); | ||
874 | return false; | 895 | return false; |
875 | } | 896 | } |
876 | var kpiIds = []; | 897 | var kpiIds = []; |
877 | - $.each(kpilist,function (i,v){ | 898 | + $.each(kpilist, function (i, v) { |
878 | kpiIds.push(v.kpiId); | 899 | kpiIds.push(v.kpiId); |
879 | }); | 900 | }); |
880 | - var oldResData = Array.from(new Set($.map(oldData,function (item) { | 901 | + var oldResData = Array.from(new Set($.map(oldData, function (item) { |
881 | return item.resId; | 902 | return item.resId; |
882 | }))) | 903 | }))) |
883 | 904 | ||
884 | - common.openWin("template/res/reslist","选择资源",{oldData:oldResData},["选择"], function () { | 905 | + common.openWin("template/res/reslist", "选择资源", {oldData: oldResData}, ["选择"], function () { |
885 | var reslist = table.checkStatus('reslist_resListTable').data; | 906 | var reslist = table.checkStatus('reslist_resListTable').data; |
886 | - if(reslist.length == 0){ | ||
887 | - layer.msg("请至少选择一个资源!",{icon:7,time:3000}); | 907 | + if (reslist.length == 0) { |
908 | + layer.msg("请至少选择一个资源!", {icon: 7, time: 3000}); | ||
888 | return false; | 909 | return false; |
889 | } | 910 | } |
890 | var resIds = []; | 911 | var resIds = []; |
891 | - $.each(reslist,function (i,v){ | 912 | + $.each(reslist, function (i, v) { |
892 | resIds.push(v.resId); | 913 | resIds.push(v.resId); |
893 | }); | 914 | }); |
894 | 915 | ||
895 | var kpisubLoading = layer.load(2); | 916 | var kpisubLoading = layer.load(2); |
896 | admin.req({ | 917 | admin.req({ |
897 | - url:common.domainName+'/api-web/alarmsubscribe/kpisub', | ||
898 | - type:'post', | ||
899 | - data:{ | ||
900 | - resIds:resIds.toString(), | ||
901 | - kpiIds:kpiIds.toString(), | ||
902 | - subId:subId, | ||
903 | - access_token:accessToken | 918 | + url: common.domainName + '/api-web/alarmsubscribe/kpisub', |
919 | + type: 'post', | ||
920 | + data: { | ||
921 | + resIds: resIds.toString(), | ||
922 | + kpiIds: kpiIds.toString(), | ||
923 | + subId: subId, | ||
924 | + access_token: accessToken | ||
904 | }, | 925 | }, |
905 | - done:function (res){ | ||
906 | - if(res.success){ | 926 | + done: function (res) { |
927 | + if (res.success) { | ||
907 | layer.close(kpisubLoading); | 928 | layer.close(kpisubLoading); |
908 | layer.msg('指标订阅成功', { | 929 | layer.msg('指标订阅成功', { |
909 | offset: '15px' | 930 | offset: '15px' |
910 | , icon: 1 | 931 | , icon: 1 |
911 | , time: 2000 | 932 | , time: 2000 |
912 | - },function () { | 933 | + }, function () { |
913 | reloadalarmsubscribeTable(); | 934 | reloadalarmsubscribeTable(); |
914 | layer.closeAll(); | 935 | layer.closeAll(); |
915 | }); | 936 | }); |
916 | - }else{ | 937 | + } else { |
917 | layer.msg('指标订阅失败,请稍后重试!', { | 938 | layer.msg('指标订阅失败,请稍后重试!', { |
918 | offset: '15px' | 939 | offset: '15px' |
919 | , icon: 7 | 940 | , icon: 7 |
@@ -962,7 +983,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -962,7 +983,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
962 | }); | 983 | }); |
963 | 984 | ||
964 | // 排除订阅指标 | 985 | // 排除订阅指标 |
965 | - $(".alarmsubscribe-exclude-kpi").on("click",function () { | 986 | + $(".alarmsubscribe-exclude-kpi").on("click", function () { |
966 | var subId = $(this).data("id"); | 987 | var subId = $(this).data("id"); |
967 | var title = `<a class="layui-icon layui-icon-templeate-1"></a>告警订阅排除订阅指标`; | 988 | var title = `<a class="layui-icon layui-icon-templeate-1"></a>告警订阅排除订阅指标`; |
968 | layer.open({ | 989 | layer.open({ |
@@ -1071,13 +1092,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -1071,13 +1092,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
1071 | if (typeof (id) != "string") { | 1092 | if (typeof (id) != "string") { |
1072 | var ids = []; | 1093 | var ids = []; |
1073 | var data = table.checkStatus('alarmsubscribeTable').data; | 1094 | var data = table.checkStatus('alarmsubscribeTable').data; |
1074 | - if(data && data.length > 0){ | ||
1075 | - $.each(data,function (i,obj) { | 1095 | + if (data && data.length > 0) { |
1096 | + $.each(data, function (i, obj) { | ||
1076 | ids.push(obj.subId); | 1097 | ids.push(obj.subId); |
1077 | }); | 1098 | }); |
1078 | } | 1099 | } |
1079 | if (ids.length == 0) { | 1100 | if (ids.length == 0) { |
1080 | - layer.msg('请选择要删除的数据',{icon: 7,time:2000}); | 1101 | + layer.msg('请选择要删除的数据', {icon: 7, time: 2000}); |
1081 | return; | 1102 | return; |
1082 | } | 1103 | } |
1083 | id = ids.toString(); | 1104 | id = ids.toString(); |
@@ -1088,8 +1109,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -1088,8 +1109,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
1088 | }, function () { | 1109 | }, function () { |
1089 | admin.req({ | 1110 | admin.req({ |
1090 | url: common.domainName + '/api-web/alarmsubscribe/delete' | 1111 | url: common.domainName + '/api-web/alarmsubscribe/delete' |
1091 | - ,type:"delete" | ||
1092 | - ,data:{ids:id} | 1112 | + , type: "delete" |
1113 | + , data: {ids: id} | ||
1093 | }).done(function (res) { | 1114 | }).done(function (res) { |
1094 | layer.msg('删除成功', { | 1115 | layer.msg('删除成功', { |
1095 | offset: '15px' | 1116 | offset: '15px' |
@@ -1117,7 +1138,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -1117,7 +1138,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
1117 | parentId: item.parentId | 1138 | parentId: item.parentId |
1118 | } | 1139 | } |
1119 | }); | 1140 | }); |
1120 | - var bizTree=common.pidToChildren(bizList, 'value', 'parentId'); | 1141 | + var bizTree = common.pidToChildren(bizList, 'value', 'parentId'); |
1121 | 1142 | ||
1122 | // 影响业务下拉框 | 1143 | // 影响业务下拉框 |
1123 | xmSelect.render({ | 1144 | xmSelect.render({ |
@@ -1159,11 +1180,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -1159,11 +1180,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
1159 | } | 1180 | } |
1160 | } | 1181 | } |
1161 | }); | 1182 | }); |
1183 | + | ||
1162 | //获取选中的数据 | 1184 | //获取选中的数据 |
1163 | function getCheckSubscribeData() { | 1185 | function getCheckSubscribeData() { |
1164 | return table.checkStatus('alarmsubscTable').data; | 1186 | return table.checkStatus('alarmsubscTable').data; |
1165 | } | 1187 | } |
1166 | 1188 | ||
1167 | - return { getSubscribeData: getCheckSubscribeData,reloadsubscribe:reloadalarmsubscribeTable}; | 1189 | + return {getSubscribeData: getCheckSubscribeData, reloadsubscribe: reloadalarmsubscribeTable}; |
1168 | }); | 1190 | }); |
1169 | }); | 1191 | }); |
1 | //新增告警模板 | 1 | //新增告警模板 |
2 | -layui.define(['form','table', 'admin', 'common','sessions'], function (exports) { | 2 | +layui.define(['form', 'table', 'admin', 'common', 'sessions'], function (exports) { |
3 | var $ = layui.$; | 3 | var $ = layui.$; |
4 | var form = layui.form; | 4 | var form = layui.form; |
5 | var table = layui.table; | 5 | var table = layui.table; |
@@ -12,43 +12,43 @@ layui.define(['form','table', 'admin', 'common','sessions'], function (exports) | @@ -12,43 +12,43 @@ layui.define(['form','table', 'admin', 'common','sessions'], function (exports) | ||
12 | var sessions = layui.sessions; | 12 | var sessions = layui.sessions; |
13 | var accessToken = sessions.getToken()['access_token']; | 13 | var accessToken = sessions.getToken()['access_token']; |
14 | form.render(null, 'add-alarmtemplate-form'); | 14 | form.render(null, 'add-alarmtemplate-form'); |
15 | - if(data && data.id){ | 15 | + if (data && data.id) { |
16 | admin.req({ | 16 | admin.req({ |
17 | - url:domainName + '/api-web/alarmtemplate/getbyId/'+data.id | ||
18 | - ,done:function (res){ | ||
19 | - form.val("add-alarmtemplate-form",res.object); | 17 | + url: domainName + '/api-web/alarmtemplate/getbyId/' + data.id |
18 | + , done: function (res) { | ||
19 | + form.val("add-alarmtemplate-form", res.object); | ||
20 | createAlarmtemplatePolicyTable(res.object.policys); | 20 | createAlarmtemplatePolicyTable(res.object.policys); |
21 | } | 21 | } |
22 | }); | 22 | }); |
23 | - }else{ | 23 | + } else { |
24 | createAlarmtemplatePolicyTable(); | 24 | createAlarmtemplatePolicyTable(); |
25 | } | 25 | } |
26 | 26 | ||
27 | //保存 | 27 | //保存 |
28 | - $("#alarmtemplate-form-save-id").on("click",function (){ | ||
29 | - form.on('submit(add-alarmtemplate-form)',function () { | 28 | + $("#alarmtemplate-form-save-id").on("click", function () { |
29 | + form.on('submit(add-alarmtemplate-form)', function () { | ||
30 | var data = form.val("add-alarmtemplate-form"); | 30 | var data = form.val("add-alarmtemplate-form"); |
31 | var policyIds = []; | 31 | var policyIds = []; |
32 | var policylist = $("#alarmtemplate-policy-table-body").find("tr"); | 32 | var policylist = $("#alarmtemplate-policy-table-body").find("tr"); |
33 | - if(policylist && policylist.length > 0){ | ||
34 | - $.each(policylist,function (i,v){ | 33 | + if (policylist && policylist.length > 0) { |
34 | + $.each(policylist, function (i, v) { | ||
35 | policyIds.push($(v).data("id")); | 35 | policyIds.push($(v).data("id")); |
36 | }) | 36 | }) |
37 | } | 37 | } |
38 | data.policyIds = policyIds.toString(); | 38 | data.policyIds = policyIds.toString(); |
39 | admin.req({ | 39 | admin.req({ |
40 | - url : domainName + '/api-web/alarmtemplate/save?access_token='+accessToken | ||
41 | - ,data:JSON.stringify(data) | ||
42 | - ,type:'post' | ||
43 | - ,contentType: "application/json; charset=utf-8" | ||
44 | - ,done:function (res){ | ||
45 | - if(res.success){ | ||
46 | - layer.msg(res.msg, { offset: '15px' , icon: 1 , time: 1000 },function (){ | 40 | + url: domainName + '/api-web/alarmtemplate/save?access_token=' + accessToken |
41 | + , data: JSON.stringify(data) | ||
42 | + , type: 'post' | ||
43 | + , contentType: "application/json; charset=utf-8" | ||
44 | + , done: function (res) { | ||
45 | + if (res.success) { | ||
46 | + layer.msg(res.msg, {offset: '15px', icon: 1, time: 1000}, function () { | ||
47 | layui.alarmtemplateIndex().reloadtemplate(); | 47 | layui.alarmtemplateIndex().reloadtemplate(); |
48 | layer.closeAll(); | 48 | layer.closeAll(); |
49 | }); | 49 | }); |
50 | - }else{ | ||
51 | - layer.msg(res.msg, { offset: '15px' , icon: 7 , time: 1000 }); | 50 | + } else { |
51 | + layer.msg(res.msg, {offset: '15px', icon: 7, time: 1000}); | ||
52 | } | 52 | } |
53 | } | 53 | } |
54 | }); | 54 | }); |
@@ -58,9 +58,9 @@ layui.define(['form','table', 'admin', 'common','sessions'], function (exports) | @@ -58,9 +58,9 @@ layui.define(['form','table', 'admin', 'common','sessions'], function (exports) | ||
58 | }); | 58 | }); |
59 | 59 | ||
60 | //选择策略 | 60 | //选择策略 |
61 | - $("#add_alarmtemplate_policy").on("click",function (){ | 61 | + $("#add_alarmtemplate_policy").on("click", function () { |
62 | $('[lay-id="/baseconfig/alarmpolicy/index"]').find('.layui-tab-close').trigger('click'); | 62 | $('[lay-id="/baseconfig/alarmpolicy/index"]').find('.layui-tab-close').trigger('click'); |
63 | - common.openWin("baseconfig/alarmpolicy/index","选择策略",{},["选择","取消"], function () { | 63 | + common.openWin("baseconfig/alarmpolicy/index", "选择策略", {}, ["选择", "取消"], function () { |
64 | var data = layui.alarmpolicyIndex().getData(); | 64 | var data = layui.alarmpolicyIndex().getData(); |
65 | createAlarmtemplatePolicyTable(data); | 65 | createAlarmtemplatePolicyTable(data); |
66 | return true; | 66 | return true; |
@@ -68,21 +68,29 @@ layui.define(['form','table', 'admin', 'common','sessions'], function (exports) | @@ -68,21 +68,29 @@ layui.define(['form','table', 'admin', 'common','sessions'], function (exports) | ||
68 | }); | 68 | }); |
69 | 69 | ||
70 | //渲染策略列表 | 70 | //渲染策略列表 |
71 | - function createAlarmtemplatePolicyTable(data){ | ||
72 | - if(data && data.length > 0){ | 71 | + function createAlarmtemplatePolicyTable(data) { |
72 | + if (data && data.length > 0) { | ||
73 | var alarm_policy_tbody = ''; | 73 | var alarm_policy_tbody = ''; |
74 | - $.each(data,function (i,d){ | 74 | + $.each(data, function (i, d) { |
75 | var isDefault = ''; | 75 | var isDefault = ''; |
76 | - if(d.policyType == '1'){ //默认 | 76 | + if (d.policyType == '1') { //默认 |
77 | isDefault = '<button type="button" class="layui-btn layui-btn-warm layui-btn-radius layui-btn-xs p-0-15">默认</button>'; | 77 | isDefault = '<button type="button" class="layui-btn layui-btn-warm layui-btn-radius layui-btn-xs p-0-15">默认</button>'; |
78 | - }else{ | 78 | + } else { |
79 | isDefault = '<button type="button" class="layui-btn layui-btn-primary layui-btn-radius layui-btn-xs p-0-15">非默认</button>'; | 79 | isDefault = '<button type="button" class="layui-btn layui-btn-primary layui-btn-radius layui-btn-xs p-0-15">非默认</button>'; |
80 | } | 80 | } |
81 | var kpiIdent = ''; | 81 | var kpiIdent = ''; |
82 | - if(d.kpiIdent == '0'){ kpiIdent = "基本指标";} | ||
83 | - if(d.kpiIdent == '1'){ kpiIdent = "性能指标";} | ||
84 | - if(d.kpiIdent == '2'){ kpiIdent = "状态指标";} | ||
85 | - if(d.kpiIdent == '3'){ kpiIdent = "告警指标";} | 82 | + if (d.kpiIdent == '0') { |
83 | + kpiIdent = "基本指标"; | ||
84 | + } | ||
85 | + if (d.kpiIdent == '1') { | ||
86 | + kpiIdent = "性能指标"; | ||
87 | + } | ||
88 | + if (d.kpiIdent == '2') { | ||
89 | + kpiIdent = "状态指标"; | ||
90 | + } | ||
91 | + if (d.kpiIdent == '3') { | ||
92 | + kpiIdent = "告警指标"; | ||
93 | + } | ||
86 | alarm_policy_tbody += ` | 94 | alarm_policy_tbody += ` |
87 | <tr data-id="${d.alarmPolicyId}"> | 95 | <tr data-id="${d.alarmPolicyId}"> |
88 | <td><div><span data-id="${d.alarmPolicyId}" class="layui-table-link view-template-alarmpolicy-name">${d.alarmPolicyName}</span></div></td> | 96 | <td><div><span data-id="${d.alarmPolicyId}" class="layui-table-link view-template-alarmpolicy-name">${d.alarmPolicyName}</span></div></td> |
@@ -96,11 +104,11 @@ layui.define(['form','table', 'admin', 'common','sessions'], function (exports) | @@ -96,11 +104,11 @@ layui.define(['form','table', 'admin', 'common','sessions'], function (exports) | ||
96 | }) | 104 | }) |
97 | $("#emptytr").remove(); | 105 | $("#emptytr").remove(); |
98 | $("#alarmtemplate-policy-table-body").append(alarm_policy_tbody); | 106 | $("#alarmtemplate-policy-table-body").append(alarm_policy_tbody); |
99 | - }else{ | 107 | + } else { |
100 | $("#alarmtemplate-policy-table-body").html('<tr id="emptytr"><td colspan="5" align="center">暂无数据</td></tr>'); | 108 | $("#alarmtemplate-policy-table-body").html('<tr id="emptytr"><td colspan="5" align="center">暂无数据</td></tr>'); |
101 | } | 109 | } |
102 | //删除 | 110 | //删除 |
103 | - $(".delete-alarmtemplate-policy-btn").on("click",function (){ | 111 | + $(".delete-alarmtemplate-policy-btn").on("click", function () { |
104 | $(this).parent().parent().remove(); | 112 | $(this).parent().parent().remove(); |
105 | }); | 113 | }); |
106 | } | 114 | } |
1 | //告警模板 | 1 | //告警模板 |
2 | -layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','view','laytpl'], function (exports) { | 2 | +layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions', 'view', 'laytpl'], function (exports) { |
3 | var $ = layui.$; | 3 | var $ = layui.$; |
4 | var form = layui.form; | 4 | var form = layui.form; |
5 | var layer = layui.layer; | 5 | var layer = layui.layer; |
@@ -20,7 +20,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | @@ -20,7 +20,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | ||
20 | var checkList = common.checkPermission(accessToken); | 20 | var checkList = common.checkPermission(accessToken); |
21 | 21 | ||
22 | 22 | ||
23 | - | ||
24 | //回车搜索 | 23 | //回车搜索 |
25 | $('#alarmtemplatekw').keydown(function (e) { | 24 | $('#alarmtemplatekw').keydown(function (e) { |
26 | if (e.keyCode === 13) { | 25 | if (e.keyCode === 13) { |
@@ -28,12 +27,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | @@ -28,12 +27,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | ||
28 | } | 27 | } |
29 | }); | 28 | }); |
30 | 29 | ||
31 | - $('#alarmtemplateQueryBtn').on('click',function () { | 30 | + $('#alarmtemplateQueryBtn').on('click', function () { |
32 | reloadalarmtemplateTable(); | 31 | reloadalarmtemplateTable(); |
33 | }); | 32 | }); |
34 | form.render(null, 'alarmtemplate-form'); | 33 | form.render(null, 'alarmtemplate-form'); |
35 | //新增 | 34 | //新增 |
36 | - $("#alarmtemplate_create").on("click",function () { | 35 | + $("#alarmtemplate_create").on("click", function () { |
37 | if ($.inArray('back:alarmtemp:save', checkList) == -1) { | 36 | if ($.inArray('back:alarmtemp:save', checkList) == -1) { |
38 | layer.msg('暂无权限!', {icon: 7, time: 3000}); | 37 | layer.msg('暂无权限!', {icon: 7, time: 3000}); |
39 | return; | 38 | return; |
@@ -41,11 +40,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | @@ -41,11 +40,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | ||
41 | openAlarmTemplateForm(); | 40 | openAlarmTemplateForm(); |
42 | }); | 41 | }); |
43 | //删除 | 42 | //删除 |
44 | - $("#alarmtemplate_delete").on("click",function () { | 43 | + $("#alarmtemplate_delete").on("click", function () { |
45 | deletealarmtemplate(); | 44 | deletealarmtemplate(); |
46 | }); | 45 | }); |
47 | //同步 | 46 | //同步 |
48 | - $("#alarmtemplate_sync").on("click",function () { | 47 | + $("#alarmtemplate_sync").on("click", function () { |
49 | if ($.inArray('back:alarmtemp:synchronization', checkList) == -1) { | 48 | if ($.inArray('back:alarmtemp:synchronization', checkList) == -1) { |
50 | layer.msg('暂无权限!', {icon: 7, time: 3000}); | 49 | layer.msg('暂无权限!', {icon: 7, time: 3000}); |
51 | return; | 50 | return; |
@@ -53,55 +52,55 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | @@ -53,55 +52,55 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | ||
53 | syncAlarmTemplate(); | 52 | syncAlarmTemplate(); |
54 | }); | 53 | }); |
55 | //配置策略 | 54 | //配置策略 |
56 | - $("#alarmtemplate_configpolicy").on("click",function () { | 55 | + $("#alarmtemplate_configpolicy").on("click", function () { |
57 | if ($.inArray('back:alarmtemp:tactics', checkList) == -1) { | 56 | if ($.inArray('back:alarmtemp:tactics', checkList) == -1) { |
58 | layer.msg('暂无权限!', {icon: 7, time: 3000}); | 57 | layer.msg('暂无权限!', {icon: 7, time: 3000}); |
59 | return; | 58 | return; |
60 | } | 59 | } |
61 | var tempData = table.checkStatus('alarmtemplateTable').data; | 60 | var tempData = table.checkStatus('alarmtemplateTable').data; |
62 | - if(tempData && tempData.length > 0){ | 61 | + if (tempData && tempData.length > 0) { |
63 | $('[lay-id="/baseconfig/alarmpolicy/index"]').find('.layui-tab-close').trigger('click'); | 62 | $('[lay-id="/baseconfig/alarmpolicy/index"]').find('.layui-tab-close').trigger('click'); |
64 | var url = 'baseconfig/alarmpolicy/index'; | 63 | var url = 'baseconfig/alarmpolicy/index'; |
65 | - var params = {type:'alarmTemplate'}; | ||
66 | - view('commonViewModel').render(url,params).then(function (res) { | 64 | + var params = {type: 'alarmTemplate'}; |
65 | + view('commonViewModel').render(url, params).then(function (res) { | ||
67 | layer.open({ | 66 | layer.open({ |
68 | title: ["配置策略", 'font-size:18px;'], | 67 | title: ["配置策略", 'font-size:18px;'], |
69 | type: 1, | 68 | type: 1, |
70 | area: ['90%', '90%'], | 69 | area: ['90%', '90%'], |
71 | resize: false, | 70 | resize: false, |
72 | content: laytpl(res.body).render(JSON.stringify(params)), | 71 | content: laytpl(res.body).render(JSON.stringify(params)), |
73 | - btn: ["选择","取消"], | ||
74 | - id:'alarm_template_Table_tactics',//设定一个id,防止重复弹出 | 72 | + btn: ["选择", "取消"], |
73 | + id: 'alarm_template_Table_tactics',//设定一个id,防止重复弹出 | ||
75 | success: function (index, layero) { | 74 | success: function (index, layero) { |
76 | 75 | ||
77 | }, | 76 | }, |
78 | yes: function (index, layero) { | 77 | yes: function (index, layero) { |
79 | var policyData = layui.alarmpolicyIndex().getData(); | 78 | var policyData = layui.alarmpolicyIndex().getData(); |
80 | - if(policyData && policyData.length > 0){ | ||
81 | - var tempIds = [],policyIds=[]; | ||
82 | - $.each(tempData,function (i,v){ | 79 | + if (policyData && policyData.length > 0) { |
80 | + var tempIds = [], policyIds = []; | ||
81 | + $.each(tempData, function (i, v) { | ||
83 | tempIds.push(v.alarmTempId); | 82 | tempIds.push(v.alarmTempId); |
84 | }) | 83 | }) |
85 | - $.each(policyData,function (i,v){ | 84 | + $.each(policyData, function (i, v) { |
86 | policyIds.push(v.alarmPolicyId); | 85 | policyIds.push(v.alarmPolicyId); |
87 | }) | 86 | }) |
88 | admin.req({ | 87 | admin.req({ |
89 | - url : domainName + '/api-web/alarmtemplate/config/policy' | ||
90 | - ,type:'post' | ||
91 | - ,data:{ tempIds:tempIds.toString(),policyIds:policyIds.toString() } | ||
92 | - ,done:function (res){ | ||
93 | - if(res.success){ | ||
94 | - layer.msg(res.msg, { offset: '15px' , icon: 1 , time: 1000 },function (){ | 88 | + url: domainName + '/api-web/alarmtemplate/config/policy' |
89 | + , type: 'post' | ||
90 | + , data: {tempIds: tempIds.toString(), policyIds: policyIds.toString()} | ||
91 | + , done: function (res) { | ||
92 | + if (res.success) { | ||
93 | + layer.msg(res.msg, {offset: '15px', icon: 1, time: 1000}, function () { | ||
95 | layer.closeAll(); | 94 | layer.closeAll(); |
96 | reloadalarmtemplateTable(); | 95 | reloadalarmtemplateTable(); |
97 | }); | 96 | }); |
98 | - }else{ | ||
99 | - layer.msg(res.msg, { offset: '15px' , icon: 7 , time: 1000 }); | 97 | + } else { |
98 | + layer.msg(res.msg, {offset: '15px', icon: 7, time: 1000}); | ||
100 | } | 99 | } |
101 | } | 100 | } |
102 | }); | 101 | }); |
103 | - }else{ | ||
104 | - layer.msg("请至少选择一条策略", { offset: '15px' , icon: 7 , time: 1000 }); | 102 | + } else { |
103 | + layer.msg("请至少选择一条策略", {offset: '15px', icon: 7, time: 1000}); | ||
105 | return false; | 104 | return false; |
106 | } | 105 | } |
107 | return true; | 106 | return true; |
@@ -112,46 +111,46 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | @@ -112,46 +111,46 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | ||
112 | // common.openWin("baseconfig/alarmpolicy/index","配置策略",{type:'alarmTemplate'},["选择","取消"], function () { | 111 | // common.openWin("baseconfig/alarmpolicy/index","配置策略",{type:'alarmTemplate'},["选择","取消"], function () { |
113 | // | 112 | // |
114 | // }); | 113 | // }); |
115 | - }else{ | ||
116 | - layer.msg("请至少选择一条数据!", { offset: '15px' , icon: 7 , time: 1000 }); | 114 | + } else { |
115 | + layer.msg("请至少选择一条数据!", {offset: '15px', icon: 7, time: 1000}); | ||
117 | } | 116 | } |
118 | 117 | ||
119 | }); | 118 | }); |
120 | 119 | ||
121 | //配置资源 | 120 | //配置资源 |
122 | - $("#alarmtemplate_configres").on("click",function () { | 121 | + $("#alarmtemplate_configres").on("click", function () { |
123 | if ($.inArray('back:alarmtemp:resource', checkList) == -1) { | 122 | if ($.inArray('back:alarmtemp:resource', checkList) == -1) { |
124 | layer.msg('暂无权限!', {icon: 7, time: 3000}); | 123 | layer.msg('暂无权限!', {icon: 7, time: 3000}); |
125 | return; | 124 | return; |
126 | } | 125 | } |
127 | var tempIds = []; | 126 | var tempIds = []; |
128 | var data = table.checkStatus('alarmtemplateTable').data; | 127 | var data = table.checkStatus('alarmtemplateTable').data; |
129 | - if(data && data.length > 0){ | ||
130 | - $.each(data,function (i,obj) { | 128 | + if (data && data.length > 0) { |
129 | + $.each(data, function (i, obj) { | ||
131 | tempIds.push(obj.alarmTempId); | 130 | tempIds.push(obj.alarmTempId); |
132 | }); | 131 | }); |
133 | } | 132 | } |
134 | if (tempIds.length != 1) { | 133 | if (tempIds.length != 1) { |
135 | - layer.msg('请选择一条要配置的数据',{icon: 7,time:2000}); | 134 | + layer.msg('请选择一条要配置的数据', {icon: 7, time: 2000}); |
136 | return; | 135 | return; |
137 | } | 136 | } |
138 | - common.openWin("template/res/reslist","配置资源",{},["选择","取消"], function () { | 137 | + common.openWin("template/res/reslist", "配置资源", {}, ["选择", "取消"], function () { |
139 | var resObj = layui.reslist().getData(); | 138 | var resObj = layui.reslist().getData(); |
140 | - if(resObj && resObj.length > 0){ | 139 | + if (resObj && resObj.length > 0) { |
141 | var resIds = []; | 140 | var resIds = []; |
142 | - $.each(resObj,function (i,v){ | 141 | + $.each(resObj, function (i, v) { |
143 | resIds.push(v.resId); | 142 | resIds.push(v.resId); |
144 | }) | 143 | }) |
145 | admin.req({ | 144 | admin.req({ |
146 | - url : domainName + '/api-web/manage/resource/alarmTemplate?resIds='+resIds.toString()+'&alarmTempId='+tempIds.toString()+'&access_token='+accessToken, | ||
147 | - done:function (res){ | ||
148 | - if(res.success){ | ||
149 | - layer.msg("配置成功!", { offset: '15px' , icon: 1 , time: 1000 },function (){ | 145 | + url: domainName + '/api-web/manage/resource/alarmTemplate?resIds=' + resIds.toString() + '&alarmTempId=' + tempIds.toString() + '&access_token=' + accessToken, |
146 | + done: function (res) { | ||
147 | + if (res.success) { | ||
148 | + layer.msg("配置成功!", {offset: '15px', icon: 1, time: 1000}, function () { | ||
150 | layer.closeAll(); | 149 | layer.closeAll(); |
151 | reloadalarmtemplateTable(); | 150 | reloadalarmtemplateTable(); |
152 | }); | 151 | }); |
153 | - }else{ | ||
154 | - layer.msg("配置失败,请重试或者与管理员联系!", { offset: '15px' , icon: 7 , time: 1000 }); | 152 | + } else { |
153 | + layer.msg("配置失败,请重试或者与管理员联系!", {offset: '15px', icon: 7, time: 1000}); | ||
155 | } | 154 | } |
156 | } | 155 | } |
157 | }); | 156 | }); |
@@ -169,13 +168,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | @@ -169,13 +168,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | ||
169 | $('#alarmtemplate_unbindRes').unbind('click').on('click', function () { | 168 | $('#alarmtemplate_unbindRes').unbind('click').on('click', function () { |
170 | var tempIds = []; | 169 | var tempIds = []; |
171 | var checks = table.checkStatus('alarmtemplateTable').data; | 170 | var checks = table.checkStatus('alarmtemplateTable').data; |
172 | - if(checks && checks.length > 0){ | ||
173 | - $.each(checks,function (i,obj) { | 171 | + if (checks && checks.length > 0) { |
172 | + $.each(checks, function (i, obj) { | ||
174 | tempIds.push(obj.alarmTempId); | 173 | tempIds.push(obj.alarmTempId); |
175 | }); | 174 | }); |
176 | } | 175 | } |
177 | if (tempIds.length == 0) { | 176 | if (tempIds.length == 0) { |
178 | - layer.msg('请选择数据',{icon: 7,time:2000}); | 177 | + layer.msg('请选择数据', {icon: 7, time: 2000}); |
179 | return; | 178 | return; |
180 | } | 179 | } |
181 | layer.confirm('确认要取消绑定吗?', {icon: 3}, function (index) { | 180 | layer.confirm('确认要取消绑定吗?', {icon: 3}, function (index) { |
@@ -217,18 +216,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | @@ -217,18 +216,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | ||
217 | var alarmtemplateTable = table.render({ | 216 | var alarmtemplateTable = table.render({ |
218 | elem: '#alarmtemplateTable' | 217 | elem: '#alarmtemplateTable' |
219 | , url: domainName + '/api-web/alarmtemplate/page' | 218 | , url: domainName + '/api-web/alarmtemplate/page' |
220 | - , where:{ | ||
221 | - access_token:accessToken, | ||
222 | - alarmTempName:$("#alarmtemplatekw").val(), | ||
223 | - policyId:policyId, | 219 | + , where: { |
220 | + access_token: accessToken, | ||
221 | + alarmTempName: $("#alarmtemplatekw").val(), | ||
222 | + policyId: policyId, | ||
224 | resIdList: resIdList | 223 | resIdList: resIdList |
225 | } | 224 | } |
226 | , height: 'full-200' | 225 | , height: 'full-200' |
227 | , page: { | 226 | , page: { |
228 | layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] | 227 | layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] |
229 | - ,theme: '#1E9FFF'//自定义分页主题颜色 | 228 | + , theme: '#1E9FFF'//自定义分页主题颜色 |
230 | } | 229 | } |
231 | - , end: function(e){ | 230 | + , end: function (e) { |
232 | form.render(); | 231 | form.render(); |
233 | } | 232 | } |
234 | , limit: 20 | 233 | , limit: 20 |
@@ -240,40 +239,46 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | @@ -240,40 +239,46 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | ||
240 | templet: '<div><span data-id="{{d.alarmTempId}}" class="layui-table-link view-alarmtemplate-name">{{d.alarmTempName}}</span></div>' | 239 | templet: '<div><span data-id="{{d.alarmTempId}}" class="layui-table-link view-alarmtemplate-name">{{d.alarmTempName}}</span></div>' |
241 | } | 240 | } |
242 | // , {field: 'tempType', title: '模板类型', align: 'center', sort: true, width:240} | 241 | // , {field: 'tempType', title: '模板类型', align: 'center', sort: true, width:240} |
243 | - , {field: 'alarmTempTotal', title: '绑定告警策略数', align: 'center', sort: true, width:240, | ||
244 | - templet:function (d){ | ||
245 | - if(d.policyTotal != '0'){ | 242 | + , { |
243 | + field: 'alarmTempTotal', title: '绑定告警策略数', align: 'center', sort: true, width: 240, | ||
244 | + templet: function (d) { | ||
245 | + if (d.policyTotal != '0') { | ||
246 | return `<div><span data-id="${d.alarmTempId}" class="layui-table-link view-alarmtemplate-policy-total">${d.policyTotal}</span></div>`; | 246 | return `<div><span data-id="${d.alarmTempId}" class="layui-table-link view-alarmtemplate-policy-total">${d.policyTotal}</span></div>`; |
247 | - }else{ | 247 | + } else { |
248 | return d.policyTotal; | 248 | return d.policyTotal; |
249 | } | 249 | } |
250 | - }} | ||
251 | - , {field: 'alarmTempTotal', title: '绑定资源数', align: 'center', sort: true, width:240, | ||
252 | - templet:function (d){ | ||
253 | - if(d.resTotal != '0'){ | 250 | + } |
251 | + } | ||
252 | + , { | ||
253 | + field: 'alarmTempTotal', title: '绑定资源数', align: 'center', sort: true, width: 240, | ||
254 | + templet: function (d) { | ||
255 | + if (d.resTotal != '0') { | ||
254 | return `<div><span data-id="${d.alarmTempId}" class="layui-table-link view-alarmtemplate-res-total">${d.resTotal}</span></div>`; | 256 | return `<div><span data-id="${d.alarmTempId}" class="layui-table-link view-alarmtemplate-res-total">${d.resTotal}</span></div>`; |
255 | - }else{ | 257 | + } else { |
256 | return d.resTotal; | 258 | return d.resTotal; |
257 | } | 259 | } |
258 | - }} | ||
259 | - , {field: 'syncFlag',title: '同步状态',align: 'center', sort: true,width:200, | ||
260 | - templet: function(d){ | ||
261 | - if(d.syncFlag == 0){ //未同步 | 260 | + } |
261 | + } | ||
262 | + , { | ||
263 | + field: 'syncFlag', title: '同步状态', align: 'center', sort: true, width: 200, | ||
264 | + templet: function (d) { | ||
265 | + if (d.syncFlag == 0) { //未同步 | ||
262 | return `<input type="checkbox" id="${d.alarmTempId}" name="close" lay-skin="switch" lay-filter="switchSyncAlarmTemplate" lay-text="已同步|未同步">`; | 266 | return `<input type="checkbox" id="${d.alarmTempId}" name="close" lay-skin="switch" lay-filter="switchSyncAlarmTemplate" lay-text="已同步|未同步">`; |
263 | - }else{ | 267 | + } else { |
264 | return ' <button type="button" class="layui-btn layui-bg-green layui-btn-radius layui-btn-xs p-0-15">已同步</button>'; | 268 | return ' <button type="button" class="layui-btn layui-bg-green layui-btn-radius layui-btn-xs p-0-15">已同步</button>'; |
265 | } | 269 | } |
266 | } | 270 | } |
267 | } | 271 | } |
268 | - , {title: '操作', align: 'center',width:'10%',fixed: 'right', | 272 | + , { |
273 | + title: '操作', align: 'center', width: '10%', fixed: 'right', | ||
269 | templet: '<div>' + | 274 | templet: '<div>' + |
270 | - '<button data-id="{{d.alarmTempId}}" lay-tips="删除" type="button" class="layui-btn layui-btn-xs layui-btn-normal delete-alarmtemplate-btn"><i class="layui-icon layui-icon-delete"></i></button>'+ | 275 | + '<button data-id="{{d.alarmTempId}}" lay-tips="删除" type="button" class="layui-btn layui-btn-xs layui-btn-normal delete-alarmtemplate-btn"><i class="layui-icon layui-icon-delete"></i></button>' + |
271 | '</div>' | 276 | '</div>' |
272 | } | 277 | } |
273 | ]], | 278 | ]], |
274 | - done:function () { | 279 | + done: function () { |
275 | //点击名称编辑 | 280 | //点击名称编辑 |
276 | - $(".view-alarmtemplate-name").on("click",function () { | 281 | + $(".view-alarmtemplate-name").on("click", function () { |
277 | if ($.inArray('back:alarmtemp:update', checkList) == -1) { | 282 | if ($.inArray('back:alarmtemp:update', checkList) == -1) { |
278 | layer.msg('暂无权限!', {icon: 7, time: 3000}); | 283 | layer.msg('暂无权限!', {icon: 7, time: 3000}); |
279 | return; | 284 | return; |
@@ -282,26 +287,34 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | @@ -282,26 +287,34 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | ||
282 | }); | 287 | }); |
283 | 288 | ||
284 | //查看模板的策略数 | 289 | //查看模板的策略数 |
285 | - $(".view-alarmtemplate-policy-total").on("click",function (){ | 290 | + $(".view-alarmtemplate-policy-total").on("click", function () { |
286 | $('[lay-id="/baseconfig/alarmpolicy/index"]').find('.layui-tab-close').trigger('click'); | 291 | $('[lay-id="/baseconfig/alarmpolicy/index"]').find('.layui-tab-close').trigger('click'); |
287 | var id = $(this).data("id"); | 292 | var id = $(this).data("id"); |
288 | admin.req({ | 293 | admin.req({ |
289 | - url:domainName + '/api-web/alarmPolicy/getbytempId/'+id | ||
290 | - ,done:function (res){ | ||
291 | - if(res.data && res.data.length > 0){ | 294 | + url: domainName + '/api-web/alarmPolicy/getbytempId/' + id |
295 | + , done: function (res) { | ||
296 | + if (res.data && res.data.length > 0) { | ||
292 | var trs = ''; | 297 | var trs = ''; |
293 | - $.each(res.data,function (i,d){ | 298 | + $.each(res.data, function (i, d) { |
294 | var isDefault = ''; | 299 | var isDefault = ''; |
295 | - if(d.policyType == '1'){ //默认 | 300 | + if (d.policyType == '1') { //默认 |
296 | isDefault = '<button type="button" class="layui-btn layui-btn-warm layui-btn-radius layui-btn-xs p-0-15">默认</button>'; | 301 | isDefault = '<button type="button" class="layui-btn layui-btn-warm layui-btn-radius layui-btn-xs p-0-15">默认</button>'; |
297 | - }else{ | 302 | + } else { |
298 | isDefault = '<button type="button" class="layui-btn layui-btn-primary layui-btn-radius layui-btn-xs p-0-15">非默认</button>'; | 303 | isDefault = '<button type="button" class="layui-btn layui-btn-primary layui-btn-radius layui-btn-xs p-0-15">非默认</button>'; |
299 | } | 304 | } |
300 | var kpiIdent = ''; | 305 | var kpiIdent = ''; |
301 | - if(d.kpiIdent == '0'){ kpiIdent = "基本指标";} | ||
302 | - if(d.kpiIdent == '1'){ kpiIdent = "性能指标";} | ||
303 | - if(d.kpiIdent == '2'){ kpiIdent = "状态指标";} | ||
304 | - if(d.kpiIdent == '3'){ kpiIdent = "告警指标";} | 306 | + if (d.kpiIdent == '0') { |
307 | + kpiIdent = "基本指标"; | ||
308 | + } | ||
309 | + if (d.kpiIdent == '1') { | ||
310 | + kpiIdent = "性能指标"; | ||
311 | + } | ||
312 | + if (d.kpiIdent == '2') { | ||
313 | + kpiIdent = "状态指标"; | ||
314 | + } | ||
315 | + if (d.kpiIdent == '3') { | ||
316 | + kpiIdent = "告警指标"; | ||
317 | + } | ||
305 | trs += ` <tr data-id="${d.alarmPolicyId}"> | 318 | trs += ` <tr data-id="${d.alarmPolicyId}"> |
306 | <td><div><span data-id="${d.alarmPolicyId}" class="layui-table-link view-template-alarmpolicy-name">${d.alarmPolicyName}</span></div></td> | 319 | <td><div><span data-id="${d.alarmPolicyId}" class="layui-table-link view-template-alarmpolicy-name">${d.alarmPolicyName}</span></div></td> |
307 | <td>${isDefault}</td> | 320 | <td>${isDefault}</td> |
@@ -322,7 +335,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | @@ -322,7 +335,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | ||
322 | , title: "告警策略" | 335 | , title: "告警策略" |
323 | , shade: 0.8 | 336 | , shade: 0.8 |
324 | , area: ['80%', '90%'] | 337 | , area: ['80%', '90%'] |
325 | - , btn:["关闭"] | 338 | + , btn: ["关闭"] |
326 | , id: 'alarm_policy_by_tempId_index' //设定一个id,防止重复弹出 | 339 | , id: 'alarm_policy_by_tempId_index' //设定一个id,防止重复弹出 |
327 | , content: tb | 340 | , content: tb |
328 | }) | 341 | }) |
@@ -332,7 +345,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | @@ -332,7 +345,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | ||
332 | }); | 345 | }); |
333 | 346 | ||
334 | //查看告警模板的资源数量 | 347 | //查看告警模板的资源数量 |
335 | - $(".view-alarmtemplate-res-total").on("click",function (){ | 348 | + $(".view-alarmtemplate-res-total").on("click", function () { |
336 | var alarmTempId = $(this).data("id"); | 349 | var alarmTempId = $(this).data("id"); |
337 | common.openWin("template/res/reslist", "资源列表", {alarmTempId: alarmTempId}, ["关闭"], function () { | 350 | common.openWin("template/res/reslist", "资源列表", {alarmTempId: alarmTempId}, ["关闭"], function () { |
338 | return true; | 351 | return true; |
@@ -340,13 +353,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | @@ -340,13 +353,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | ||
340 | }); | 353 | }); |
341 | 354 | ||
342 | //设置同步 | 355 | //设置同步 |
343 | - form.on('switch(switchSyncAlarmTemplate)', function(obj){ | 356 | + form.on('switch(switchSyncAlarmTemplate)', function (obj) { |
344 | var alarmtemplateId = obj.elem.id; | 357 | var alarmtemplateId = obj.elem.id; |
345 | syncAlarmTemplate(alarmtemplateId); | 358 | syncAlarmTemplate(alarmtemplateId); |
346 | }); | 359 | }); |
347 | 360 | ||
348 | //删除 | 361 | //删除 |
349 | - $(".delete-alarmtemplate-btn").on("click",function () { | 362 | + $(".delete-alarmtemplate-btn").on("click", function () { |
350 | var id = $(this).data("id"); | 363 | var id = $(this).data("id"); |
351 | deletealarmtemplate(id) | 364 | deletealarmtemplate(id) |
352 | }); | 365 | }); |
@@ -356,26 +369,26 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | @@ -356,26 +369,26 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | ||
356 | //刷新表格 | 369 | //刷新表格 |
357 | function reloadalarmtemplateTable() { | 370 | function reloadalarmtemplateTable() { |
358 | alarmtemplateTable.reload({ | 371 | alarmtemplateTable.reload({ |
359 | - where:{ | ||
360 | - access_token:accessToken, | ||
361 | - policyId:policyId, | ||
362 | - resIdList:resIdList, | ||
363 | - alarmTempName:$("#alarmtemplatekw").val() | 372 | + where: { |
373 | + access_token: accessToken, | ||
374 | + policyId: policyId, | ||
375 | + resIdList: resIdList, | ||
376 | + alarmTempName: $("#alarmtemplatekw").val() | ||
364 | } | 377 | } |
365 | }); | 378 | }); |
366 | } | 379 | } |
367 | 380 | ||
368 | - function syncAlarmTemplate(tempId){ | 381 | + function syncAlarmTemplate(tempId) { |
369 | if (typeof (tempId) != "string") { | 382 | if (typeof (tempId) != "string") { |
370 | var ids = []; | 383 | var ids = []; |
371 | var data = table.checkStatus('alarmtemplateTable').data; | 384 | var data = table.checkStatus('alarmtemplateTable').data; |
372 | - if(data && data.length > 0){ | ||
373 | - $.each(data,function (i,obj) { | 385 | + if (data && data.length > 0) { |
386 | + $.each(data, function (i, obj) { | ||
374 | ids.push(obj.alarmTempId); | 387 | ids.push(obj.alarmTempId); |
375 | }); | 388 | }); |
376 | } | 389 | } |
377 | if (ids.length == 0) { | 390 | if (ids.length == 0) { |
378 | - layer.msg('请选择要同步的数据',{icon: 7,time:2000}); | 391 | + layer.msg('请选择要同步的数据', {icon: 7, time: 2000}); |
379 | return; | 392 | return; |
380 | } | 393 | } |
381 | tempId = ids.toString(); | 394 | tempId = ids.toString(); |
@@ -394,18 +407,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | @@ -394,18 +407,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | ||
394 | }); | 407 | }); |
395 | 408 | ||
396 | admin.req({ | 409 | admin.req({ |
397 | - url:common.domainName + '/api-web/alarmtemplate/sync' | ||
398 | - , data:{ | ||
399 | - ids:tempId | 410 | + url: common.domainName + '/api-web/alarmtemplate/sync' |
411 | + , data: { | ||
412 | + ids: tempId | ||
400 | } | 413 | } |
401 | }).done(function (res) { | 414 | }).done(function (res) { |
402 | layer.close(syncalarmtempload) | 415 | layer.close(syncalarmtempload) |
403 | - if(res.success){ | ||
404 | - layer.msg(res.msg, { offset: '15px' , icon: 1, time: 2000},function (){ | 416 | + if (res.success) { |
417 | + layer.msg(res.msg, {offset: '15px', icon: 1, time: 2000}, function () { | ||
405 | reloadalarmtemplateTable(); | 418 | reloadalarmtemplateTable(); |
406 | }); | 419 | }); |
407 | - }else{ | ||
408 | - layer.msg(res.msg, { offset: '15px' , icon: 7, time: 2000}); | 420 | + } else { |
421 | + layer.msg(res.msg, {offset: '15px', icon: 7, time: 2000}); | ||
409 | } | 422 | } |
410 | 423 | ||
411 | }); | 424 | }); |
@@ -420,13 +433,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | @@ -420,13 +433,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | ||
420 | if (typeof (id) != "string") { | 433 | if (typeof (id) != "string") { |
421 | var ids = []; | 434 | var ids = []; |
422 | var data = table.checkStatus('alarmtemplateTable').data; | 435 | var data = table.checkStatus('alarmtemplateTable').data; |
423 | - if(data && data.length > 0){ | ||
424 | - $.each(data,function (i,obj) { | 436 | + if (data && data.length > 0) { |
437 | + $.each(data, function (i, obj) { | ||
425 | ids.push(obj.alarmTempId); | 438 | ids.push(obj.alarmTempId); |
426 | }); | 439 | }); |
427 | } | 440 | } |
428 | if (ids.length == 0) { | 441 | if (ids.length == 0) { |
429 | - layer.msg('请选择要删除的数据',{icon: 7,time:2000}); | 442 | + layer.msg('请选择要删除的数据', {icon: 7, time: 2000}); |
430 | return; | 443 | return; |
431 | } | 444 | } |
432 | id = ids.toString(); | 445 | id = ids.toString(); |
@@ -437,17 +450,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | @@ -437,17 +450,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | ||
437 | }, function () { | 450 | }, function () { |
438 | admin.req({ | 451 | admin.req({ |
439 | url: common.domainName + '/api-web/alarmtemplate/delete' | 452 | url: common.domainName + '/api-web/alarmtemplate/delete' |
440 | - ,type:"delete" | ||
441 | - ,data:{ids:id} | 453 | + , type: "delete" |
454 | + , data: {ids: id} | ||
442 | }).done(function (res) { | 455 | }).done(function (res) { |
443 | - if(res.success){ | 456 | + if (res.success) { |
444 | layer.msg('删除成功', { | 457 | layer.msg('删除成功', { |
445 | - offset: '15px' , icon: 1 , time: 2000 | 458 | + offset: '15px', icon: 1, time: 2000 |
446 | }, function () { | 459 | }, function () { |
447 | reloadalarmtemplateTable(); | 460 | reloadalarmtemplateTable(); |
448 | }); | 461 | }); |
449 | - }else{ | ||
450 | - layer.msg(res.msg, { offset: '15px' , icon: 7 , time: 2000 }); | 462 | + } else { |
463 | + layer.msg(res.msg, {offset: '15px', icon: 7, time: 2000}); | ||
451 | } | 464 | } |
452 | 465 | ||
453 | }).error(function (error) { | 466 | }).error(function (error) { |
@@ -455,6 +468,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | @@ -455,6 +468,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' | ||
455 | }); | 468 | }); |
456 | }); | 469 | }); |
457 | } | 470 | } |
458 | - return { reloadtemplate: reloadalarmtemplateTable}; | 471 | + |
472 | + return {reloadtemplate: reloadalarmtemplateTable}; | ||
459 | }); | 473 | }); |
460 | }); | 474 | }); |
1 | //告警模板列表,不分页 | 1 | //告警模板列表,不分页 |
2 | -layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function (exports) { | 2 | +layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function (exports) { |
3 | var $ = layui.$; | 3 | var $ = layui.$; |
4 | var form = layui.form; | 4 | var form = layui.form; |
5 | var layer = layui.layer; | 5 | var layer = layui.layer; |
@@ -25,61 +25,66 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -25,61 +25,66 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
25 | var alarmtemplatelistTable = table.render({ | 25 | var alarmtemplatelistTable = table.render({ |
26 | elem: '#alarmtemplatelistTable' | 26 | elem: '#alarmtemplatelistTable' |
27 | , url: domainName + '/api-web/alarmtemplate/list' | 27 | , url: domainName + '/api-web/alarmtemplate/list' |
28 | - , where:{ | ||
29 | - access_token:accessToken, | ||
30 | - alarmTempName:$("#alarmtemplatekw").val(), | ||
31 | - policyId:policyId | 28 | + , where: { |
29 | + access_token: accessToken, | ||
30 | + alarmTempName: $("#alarmtemplatekw").val(), | ||
31 | + policyId: policyId | ||
32 | } | 32 | } |
33 | , height: 'full-310' | 33 | , height: 'full-310' |
34 | , page: false | 34 | , page: false |
35 | - , end: function(e){ | 35 | + , end: function (e) { |
36 | form.render(); | 36 | form.render(); |
37 | } | 37 | } |
38 | , even: true | 38 | , even: true |
39 | , cols: [[ | 39 | , cols: [[ |
40 | {type: 'checkbox'} | 40 | {type: 'checkbox'} |
41 | , {field: 'alarmTempName', title: '模板名称', align: 'center', sort: true} | 41 | , {field: 'alarmTempName', title: '模板名称', align: 'center', sort: true} |
42 | - , {field: 'tempType', title: '模板类型', align: 'center', sort: true, width:240} | ||
43 | - , {field: 'alarmTempTotal', title: '绑定告警策略数', align: 'center', sort: true, width:200, | ||
44 | - templet:function (d){ | ||
45 | - if(d.policyTotal != '0'){ | 42 | + , {field: 'tempType', title: '模板类型', align: 'center', sort: true, width: 240} |
43 | + , { | ||
44 | + field: 'alarmTempTotal', title: '绑定告警策略数', align: 'center', sort: true, width: 200, | ||
45 | + templet: function (d) { | ||
46 | + if (d.policyTotal != '0') { | ||
46 | return `<div><span data-id="${d.alarmTempId}" class="layui-table-link view-alarmtemplatelist-policy-total">${d.policyTotal}</span></div>`; | 47 | return `<div><span data-id="${d.alarmTempId}" class="layui-table-link view-alarmtemplatelist-policy-total">${d.policyTotal}</span></div>`; |
47 | - }else{ | 48 | + } else { |
48 | return d.policyTotal; | 49 | return d.policyTotal; |
49 | } | 50 | } |
50 | - }} | ||
51 | - , {field: 'alarmTempTotal', title: '绑定资源数', align: 'center', sort: true, width:200, | ||
52 | - templet:function (d){ | ||
53 | - if(d.resTotal != '0'){ | 51 | + } |
52 | + } | ||
53 | + , { | ||
54 | + field: 'alarmTempTotal', title: '绑定资源数', align: 'center', sort: true, width: 200, | ||
55 | + templet: function (d) { | ||
56 | + if (d.resTotal != '0') { | ||
54 | return `<div><span data-id="${d.alarmTempId}" class="layui-table-link view-alarmtemplatelist-res-total">${d.resTotal}</span></div>`; | 57 | return `<div><span data-id="${d.alarmTempId}" class="layui-table-link view-alarmtemplatelist-res-total">${d.resTotal}</span></div>`; |
55 | - }else{ | 58 | + } else { |
56 | return d.resTotal; | 59 | return d.resTotal; |
57 | } | 60 | } |
58 | - }} | ||
59 | - , {field: 'syncFlag',title: '同步状态',align: 'center', sort: true,width:120, | ||
60 | - templet: function(d){ | ||
61 | - if(d.syncFlag == 0){ //未同步 | 61 | + } |
62 | + } | ||
63 | + , { | ||
64 | + field: 'syncFlag', title: '同步状态', align: 'center', sort: true, width: 120, | ||
65 | + templet: function (d) { | ||
66 | + if (d.syncFlag == 0) { //未同步 | ||
62 | return `<input type="checkbox" id="${d.alarmTempId}" name="close" lay-skin="switch" lay-filter="switchSyncAlarmTemplatelist" lay-text="已同步|未同步">`; | 67 | return `<input type="checkbox" id="${d.alarmTempId}" name="close" lay-skin="switch" lay-filter="switchSyncAlarmTemplatelist" lay-text="已同步|未同步">`; |
63 | - }else{ | 68 | + } else { |
64 | return ' <button type="button" class="layui-btn layui-bg-green layui-btn-radius layui-btn-xs p-0-15">已同步</button>'; | 69 | return ' <button type="button" class="layui-btn layui-bg-green layui-btn-radius layui-btn-xs p-0-15">已同步</button>'; |
65 | } | 70 | } |
66 | } | 71 | } |
67 | } | 72 | } |
68 | ]], | 73 | ]], |
69 | - done:function () { | 74 | + done: function () { |
70 | //查看模板的策略数 | 75 | //查看模板的策略数 |
71 | - $(".view-alarmtemplatelist-policy-total").on("click",function (){ | 76 | + $(".view-alarmtemplatelist-policy-total").on("click", function () { |
72 | var id = $(this).data("id"); | 77 | var id = $(this).data("id"); |
73 | admin.req({ | 78 | admin.req({ |
74 | - url:domainName + '/api-web/alarmPolicy/getbytempId/'+id | ||
75 | - ,done:function (res){ | ||
76 | - if(res.data && res.data.length > 0){ | 79 | + url: domainName + '/api-web/alarmPolicy/getbytempId/' + id |
80 | + , done: function (res) { | ||
81 | + if (res.data && res.data.length > 0) { | ||
77 | var trs = ''; | 82 | var trs = ''; |
78 | - $.each(res.data,function (i,d){ | 83 | + $.each(res.data, function (i, d) { |
79 | var isDefault = ''; | 84 | var isDefault = ''; |
80 | - if(d.policyType == '1'){ //默认 | 85 | + if (d.policyType == '1') { //默认 |
81 | isDefault = '<button type="button" class="layui-btn layui-btn-warm layui-btn-radius layui-btn-xs p-0-15">默认</button>'; | 86 | isDefault = '<button type="button" class="layui-btn layui-btn-warm layui-btn-radius layui-btn-xs p-0-15">默认</button>'; |
82 | - }else{ | 87 | + } else { |
83 | isDefault = '<button type="button" class="layui-btn layui-btn-primary layui-btn-radius layui-btn-xs p-0-15">非默认</button>'; | 88 | isDefault = '<button type="button" class="layui-btn layui-btn-primary layui-btn-radius layui-btn-xs p-0-15">非默认</button>'; |
84 | } | 89 | } |
85 | trs += ` <tr data-id="${d.alarmPolicyId}"> | 90 | trs += ` <tr data-id="${d.alarmPolicyId}"> |
@@ -111,7 +116,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -111,7 +116,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
111 | }); | 116 | }); |
112 | 117 | ||
113 | //查看告警模板的资源数量 | 118 | //查看告警模板的资源数量 |
114 | - $(".view-alarmtemplatelist-res-total").on("click",function (){ | 119 | + $(".view-alarmtemplatelist-res-total").on("click", function () { |
115 | var alarmTempId = $(this).data("id"); | 120 | var alarmTempId = $(this).data("id"); |
116 | common.openWin("template/res/reslist", "资源列表", {alarmTempId: alarmTempId}, ["确定"], function () { | 121 | common.openWin("template/res/reslist", "资源列表", {alarmTempId: alarmTempId}, ["确定"], function () { |
117 | return true; | 122 | return true; |
@@ -119,20 +124,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -119,20 +124,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
119 | }); | 124 | }); |
120 | 125 | ||
121 | //设置同步 | 126 | //设置同步 |
122 | - form.on('switch(switchSyncAlarmTemplatelist)', function(obj){ | 127 | + form.on('switch(switchSyncAlarmTemplatelist)', function (obj) { |
123 | var alarmtemplateId = obj.elem.id; | 128 | var alarmtemplateId = obj.elem.id; |
124 | admin.req({ | 129 | admin.req({ |
125 | - url:common.domainName + '/api-web/alarmtemplate/sync' | ||
126 | - , data:{ | ||
127 | - ids:alarmtemplateId | 130 | + url: common.domainName + '/api-web/alarmtemplate/sync' |
131 | + , data: { | ||
132 | + ids: alarmtemplateId | ||
128 | } | 133 | } |
129 | }).done(function (res) { | 134 | }).done(function (res) { |
130 | - if(res.success){ | ||
131 | - layer.msg(res.msg, { offset: '15px' , icon: 1, time: 2000},function (){ | 135 | + if (res.success) { |
136 | + layer.msg(res.msg, {offset: '15px', icon: 1, time: 2000}, function () { | ||
132 | reloadalarmtemplateTable(); | 137 | reloadalarmtemplateTable(); |
133 | }); | 138 | }); |
134 | - }else{ | ||
135 | - layer.msg(res.msg, { offset: '15px' , icon: 7, time: 2000}); | 139 | + } else { |
140 | + layer.msg(res.msg, {offset: '15px', icon: 7, time: 2000}); | ||
136 | } | 141 | } |
137 | 142 | ||
138 | }); | 143 | }); |
@@ -141,11 +146,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | @@ -141,11 +146,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function | ||
141 | } | 146 | } |
142 | }); | 147 | }); |
143 | 148 | ||
144 | - function reloadalarmtemplatelistTable(){ | 149 | + function reloadalarmtemplatelistTable() { |
145 | alarmtemplatelistTable.reload({ | 150 | alarmtemplatelistTable.reload({ |
146 | - where:{ | ||
147 | - access_token:accessToken, | ||
148 | - alarmTempName:$("#alarmtemplatelistkw").val(), | 151 | + where: { |
152 | + access_token: accessToken, | ||
153 | + alarmTempName: $("#alarmtemplatelistkw").val(), | ||
149 | } | 154 | } |
150 | }); | 155 | }); |
151 | } | 156 | } |
-
Please register or login to post a comment