diff --git a/web-app/src/app/layout/basic/widgets/clear-storage.component.ts b/web-app/src/app/layout/basic/widgets/clear-storage.component.ts
index 05296ba..2204ff8 100644
--- a/web-app/src/app/layout/basic/widgets/clear-storage.component.ts
+++ b/web-app/src/app/layout/basic/widgets/clear-storage.component.ts
@@ -19,10 +19,10 @@ export class HeaderClearStorageComponent {
@HostListener('click')
_click(): void {
this.modalSrv.confirm({
- nzTitle: 'Make sure clear all local storage?',
+ nzTitle: '请确认是否清理缓存?',
nzOnOk: () => {
localStorage.clear();
- this.messageSrv.success('Clear Finished!');
+ this.messageSrv.success('清理成功!');
}
});
}
diff --git a/web-app/src/app/layout/basic/widgets/notify.component.ts b/web-app/src/app/layout/basic/widgets/notify.component.ts
index 2f0b979..f17f986 100644
--- a/web-app/src/app/layout/basic/widgets/notify.component.ts
+++ b/web-app/src/app/layout/basic/widgets/notify.component.ts
@@ -23,25 +23,11 @@ import { NzMessageService } from 'ng-zorro-antd/message';
export class HeaderNotifyComponent {
data: NoticeItem[] = [
{
- title: '通知',
+ title: '告警通知',
list: [],
- emptyText: '你已查看所有通知',
+ emptyText: '暂无告警通知',
emptyImage: 'https://gw.alipayobjects.com/zos/rmsportal/wAhyIChODzsoKIOBHcBk.svg',
- clearText: '清空通知'
- },
- {
- title: '消息',
- list: [],
- emptyText: '您已读完所有消息',
- emptyImage: 'https://gw.alipayobjects.com/zos/rmsportal/sAuJeJzSKbUmHfBQRzmZ.svg',
- clearText: '清空消息'
- },
- {
- title: '待办',
- list: [],
- emptyText: '你已完成所有待办',
- emptyImage: 'https://gw.alipayobjects.com/zos/rmsportal/HsIsxMZiWKrNUavQUXqx.svg',
- clearText: '清空待办'
+ clearText: '清空告警'
}
];
count = 5;
@@ -87,94 +73,38 @@ export class HeaderNotifyComponent {
{
id: '000000001',
avatar: 'https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png',
- title: '你收到了 14 份新周报',
+ title: '监控-MYSQL_192.135.34.2-发出2级告警',
datetime: add(now, { days: 10 }),
- type: '通知'
+ type: '告警通知'
},
{
id: '000000002',
- avatar: 'https://gw.alipayobjects.com/zos/rmsportal/OKJXDXrmkNshAMvwtvhu.png',
- title: '你推荐的 曲妮妮 已通过第三轮面试',
+ avatar: 'https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png',
+ title: '监控-MYSQL_192.135.44.2-发出1级告警',
datetime: add(now, { days: -3 }),
- type: '通知'
+ type: '告警通知'
},
{
id: '000000003',
- avatar: 'https://gw.alipayobjects.com/zos/rmsportal/kISTdvpyTAhtGxpovNWd.png',
- title: '这种模板可以区分多种通知类型',
+ avatar: 'https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png',
+ title: '监控-WEBSITE_www.baidu.com-发出4级告警',
datetime: add(now, { months: -3 }),
read: true,
- type: '通知'
+ type: '告警通知'
},
{
id: '000000004',
avatar: 'https://gw.alipayobjects.com/zos/rmsportal/GvqBnKhFgObvnSGkDsje.png',
- title: '左侧图标用于区分不同的类型',
+ title: '监控-REDIS_192.34.55.3-发出4级告警',
datetime: add(now, { years: -1 }),
- type: '通知'
+ type: '告警通知'
},
{
id: '000000005',
avatar: 'https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png',
- title: '内容不要超过两行字，超出时自动截断',
- datetime: '2017-08-07',
- type: '通知'
- },
- {
- id: '000000006',
- avatar: 'https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg',
- title: '曲丽丽 评论了你',
- description: '描述信息描述信息描述信息',
- datetime: '2017-08-07',
- type: '消息'
- },
- {
- id: '000000007',
- avatar: 'https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg',
- title: '朱偏右 回复了你',
- description: '这种模板用于提醒谁与你发生了互动，左侧放『谁』的头像',
- datetime: '2017-08-07',
- type: '消息'
- },
- {
- id: '000000008',
- avatar: 'https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg',
- title: '标题',
- description: '这种模板用于提醒谁与你发生了互动，左侧放『谁』的头像',
- datetime: '2017-08-07',
- type: '消息'
- },
- {
- id: '000000009',
- title: '任务名称',
- description: '任务需要在 2017-01-12 20:00 前启动',
- extra: '未开始',
- status: 'todo',
- type: '待办'
- },
- {
- id: '000000010',
- title: '第三方紧急代码变更',
- description: '冠霖提交于 2017-01-06，需在 2017-01-07 前完成代码变更任务',
- extra: '马上到期',
- status: 'urgent',
- type: '待办'
- },
- {
- id: '000000011',
- title: '信息安全考试',
- description: '指派竹尔于 2017-01-09 前完成更新并发布',
- extra: '已耗时 8 天',
- status: 'doing',
- type: '待办'
- },
- {
- id: '000000012',
- title: 'ABCD 版本发布',
- description: '冠霖提交于 2017-01-06，需在 2017-01-07 前完成代码变更任务',
- extra: '进行中',
- status: 'processing',
- type: '待办'
+ title: '监控-REDIS_192.34.55.6-发出4级告警',
+ datetime: '2020-08-07',
+ type: '告警通知'
}
]);
@@ -184,7 +114,13 @@ export class HeaderNotifyComponent {
}
clear(type: string): void {
- this.msg.success(`清空了 ${type}`);
+ this.loading = true;
+ setTimeout(() => {
+ this.data = this.updateNoticeData([]);
+ this.loading = false;
+ this.cdr.detectChanges();
+ }, 500);
+ this.msg.success(`已清空 ${type}`);
}
select(res: NoticeIconSelect): void {
diff --git a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html
index 57b9243..607fd97 100644
--- a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html
+++ b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html
@@ -6,13 +6,13 @@
-
+
监控列表
-
+
修改 {{monitor.app}} 监控
diff --git a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts
index 1b96e8c..31cac2a 100644
--- a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts
+++ b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts
@@ -105,12 +105,12 @@ export class MonitorEditComponent implements OnInit {
"params": this.params
};
this.isSpinning = true;
- this.monitorSvc.newMonitor(addMonitor)
+ this.monitorSvc.editMonitor(addMonitor)
.subscribe(message => {
this.isSpinning = false;
if (message.code === 0) {
this.notifySvc.success("修改监控成功", "");
- this.router.navigateByUrl("/monitors")
+ this.router.navigateByUrl(`/monitors?app=${this.monitor.app}`)
} else {
this.notifySvc.error("修改监控失败", message.msg);
}},
diff --git a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html
index 107d785..ab62c6c 100644
--- a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html
+++ b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html
@@ -6,7 +6,7 @@
-
+
监控列表
diff --git a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts
index f6e1db7..95c805c 100644
--- a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts
+++ b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts
@@ -81,7 +81,7 @@ export class MonitorNewComponent implements OnInit {
this.isSpinning = false;
if (message.code === 0) {
this.notifySvc.success("新增监控成功", "");
- this.router.navigateByUrl("/monitors")
+ this.router.navigateByUrl(`/monitors?app=${this.monitor.app}`)
} else {
this.notifySvc.error("新增监控失败", message.msg);
}},
diff --git a/web-app/src/assets/tmp/app-data.json b/web-app/src/assets/tmp/app-data.json
index fbba51f..7b05de1 100644
--- a/web-app/src/assets/tmp/app-data.json
+++ b/web-app/src/assets/tmp/app-data.json
@@ -34,6 +34,11 @@
"i18n": "menu.monitor.service",
"icon": "anticon-cloud",
"children": [
+ {
+ "text": "website",
+ "link": "/monitors?app=website",
+ "i18n": "monitor.app.website"
+ },
{
"text": "api",
"link": "/monitors?app=api",
diff --git a/web-app/src/assets/tmp/i18n/zh-CN.json b/web-app/src/assets/tmp/i18n/zh-CN.json
index 4bd9596..5bbd90f 100644
--- a/web-app/src/assets/tmp/i18n/zh-CN.json
+++ b/web-app/src/assets/tmp/i18n/zh-CN.json
@@ -28,6 +28,7 @@
},
"app": {
"": "监控类型",
+ "website": "网站监测",
"api": "HTTP API",
"http": "HTTP API",
"ping": "PING连通性",