diff --git a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html index 0bd0b84..b62ec62 100644 --- a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html +++ b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html @@ -3,14 +3,14 @@ - 仪表盘 + {{ 'menu.dashboard' | i18n }} - 告警通知配置 + {{ 'menu.alert.dispatch' | i18n }} - 帮助  + {{ 'common.button.help' | i18n }}  @@ -18,12 +18,12 @@ - + - - 接收人 - 通知方式 - 配置 - 最新修改时间 - 操作 + {{ 'alert.notice.receiver.people' | i18n }} + {{ 'alert.notice.receiver.type' | i18n }} + {{ 'alert.notice.receiver.setting' | i18n }} + {{ 'common.edit-time' | i18n }} + {{ 'common.edit' | i18n }} @@ -50,11 +50,11 @@ - 短信 + {{ 'alert.notice.type.sms' | i18n }} - 邮件 + {{ 'alert.notice.type.email' | i18n }} @@ -62,19 +62,19 @@ - 微信公众号 + {{ 'alert.notice.type.wechat' | i18n }} - 企业微信机器人 + {{ 'alert.notice.type.wework' | i18n }} - 钉钉机器人 + {{ 'alert.notice.type.ding' | i18n }} - 飞书机器人 + {{ 'alert.notice.type.fei-shu' | i18n }} @@ -88,10 +88,22 @@ {{ (data.gmtUpdate ? data.gmtUpdate : data.gmtCreate) | date: 'YYYY-MM-dd HH:mm:ss' }} - - @@ -99,12 +111,12 @@ - + - - 策略名称 - 接收人 - 转发所有 - 是否启用 - 最新修改时间 - 操作 + {{ 'alert.notice.rule.name' | i18n }} + {{ 'alert.notice.receiver.people' | i18n }} + {{ 'alert.notice.rule.all' | i18n }} + {{ 'alert.notice.rule.enable' | i18n }} + {{ 'common.edit-time' | i18n }} + {{ 'common.edit' | i18n }} @@ -134,26 +146,38 @@ - + {{ 'common.yes' | i18n }} - + {{ 'common.no' | i18n }} - 开启 + {{ 'common.enable' | i18n }} - 关闭 + {{ 'common.disable' | i18n }} {{ (data.gmtUpdate ? data.gmtUpdate : data.gmtCreate) | date: 'YYYY-MM-dd HH:mm:ss' }} - - @@ -166,7 +190,7 @@
- 接收人名称 + {{ 'alert.notice.receiver.people.name' | i18n }} - 通知方式 + {{ 'alert.notice.receiver.type' | i18n }} - - + + - - - - + + + + - 手机号 + {{ 'alert.notice.type.phone' | i18n }} - 邮箱 + {{ 'alert.notice.type.email' | i18n }} - URL地址 + {{ 'alert.notice.type.url' | i18n }} - 微信OPENID + {{ + 'alert.notice.type.wechat-id' | i18n + }} - 企业微信机器人KEY + {{ + 'alert.notice.type.wework-key' | i18n + }} - 机器人ACCESS_TOKEN + {{ + 'alert.notice.type.access-token' | i18n + }} - 飞书机器人KEY + {{ + 'alert.notice.type.fei-shu-key' | i18n + }} @@ -252,7 +284,7 @@ - 策略名称 + {{ 'alert.notice.rule.name' | i18n }} - 转发所有 + {{ 'alert.notice.rule.all' | i18n }} - 接收人 + {{ 'alert.notice.receiver.people' | i18n }} - 是否启用 + {{ 'alert.notice.rule.enable' | i18n }} diff --git a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.ts b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.ts index 0268457..9d4764c 100644 --- a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.ts +++ b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.ts @@ -1,4 +1,6 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, Inject, OnInit } from '@angular/core'; +import { I18NService } from '@core'; +import { ALAIN_I18N_TOKEN } from '@delon/theme'; import { NzModalService } from 'ng-zorro-antd/modal'; import { NzNotificationService } from 'ng-zorro-antd/notification'; import { finalize } from 'rxjs/operators'; @@ -18,7 +20,8 @@ export class AlertNoticeComponent implements OnInit { private notifySvc: NzNotificationService, private noticeReceiverSvc: NoticeReceiverService, private modal: NzModalService, - private noticeRuleSvc: NoticeRuleService + private noticeRuleSvc: NoticeRuleService, + @Inject(ALAIN_I18N_TOKEN) private i18nSvc: I18NService ) {} receivers!: NoticeReceiver[]; @@ -78,9 +81,9 @@ export class AlertNoticeComponent implements OnInit { onDeleteOneNoticeReceiver(receiveId: number) { this.modal.confirm({ - nzTitle: '请确认是否删除!', - nzOkText: '确定', - nzCancelText: '取消', + nzTitle: this.i18nSvc.fanyi('common.confirm.delete'), + nzOkText: this.i18nSvc.fanyi('common.button.ok'), + nzCancelText: this.i18nSvc.fanyi('common.button.cancel'), nzOkDanger: true, nzOkType: 'primary', nzOnOk: () => this.deleteOneNoticeReceiver(receiveId) @@ -98,23 +101,23 @@ export class AlertNoticeComponent implements OnInit { .subscribe( message => { if (message.code === 0) { - this.notifySvc.success('删除成功!', ''); + this.notifySvc.success(this.i18nSvc.fanyi('common.notify.delete-success'), ''); this.loadReceiversTable(); } else { - this.notifySvc.error('删除失败!', message.msg); + this.notifySvc.error(this.i18nSvc.fanyi('common.notify.delete-fail'), message.msg); } }, error => { - this.notifySvc.error('删除失败!', error.msg); + this.notifySvc.error(this.i18nSvc.fanyi('common.notify.delete-fail'), error.msg); } ); } onDeleteOneNoticeRule(ruleId: number) { this.modal.confirm({ - nzTitle: '请确认是否删除!', - nzOkText: '确定', - nzCancelText: '取消', + nzTitle: this.i18nSvc.fanyi('common.confirm.delete'), + nzOkText: this.i18nSvc.fanyi('common.button.ok'), + nzCancelText: this.i18nSvc.fanyi('common.button.cancel'), nzOkDanger: true, nzOkType: 'primary', nzOnOk: () => this.deleteOneNoticeRule(ruleId) @@ -132,14 +135,14 @@ export class AlertNoticeComponent implements OnInit { .subscribe( message => { if (message.code === 0) { - this.notifySvc.success('删除成功!', ''); + this.notifySvc.success(this.i18nSvc.fanyi('common.notify.delete-success'), ''); this.loadRulesTable(); } else { - this.notifySvc.error('删除失败!', message.msg); + this.notifySvc.error(this.i18nSvc.fanyi('common.notify.delete-fail'), message.msg); } }, error => { - this.notifySvc.error('删除失败!', error.msg); + this.notifySvc.error(this.i18nSvc.fanyi('common.notify.delete-fail'), error.msg); } ); } @@ -179,14 +182,14 @@ export class AlertNoticeComponent implements OnInit { message => { if (message.code === 0) { this.isManageReceiverModalVisible = false; - this.notifySvc.success('新增成功!', ''); + this.notifySvc.success(this.i18nSvc.fanyi('common.notify.new-success'), ''); this.loadReceiversTable(); } else { - this.notifySvc.error('新增失败!', message.msg); + this.notifySvc.error(this.i18nSvc.fanyi('common.notify.new-fail'), message.msg); } }, error => { - this.notifySvc.error('新增失败!', error.msg); + this.notifySvc.error(this.i18nSvc.fanyi('common.notify.new-fail'), error.msg); } ); } else { @@ -202,14 +205,14 @@ export class AlertNoticeComponent implements OnInit { message => { if (message.code === 0) { this.isManageReceiverModalVisible = false; - this.notifySvc.success('修改成功!', ''); + this.notifySvc.success(this.i18nSvc.fanyi('common.notify.edit-success'), ''); this.loadReceiversTable(); } else { - this.notifySvc.error('修改失败!', message.msg); + this.notifySvc.error(this.i18nSvc.fanyi('common.notify.edit-fail'), message.msg); } }, error => { - this.notifySvc.error('修改失败!', error.msg); + this.notifySvc.error(this.i18nSvc.fanyi('common.notify.edit-fail'), error.msg); } ); } @@ -310,14 +313,14 @@ export class AlertNoticeComponent implements OnInit { message => { if (message.code === 0) { this.isManageRuleModalVisible = false; - this.notifySvc.success('新增成功!', ''); + this.notifySvc.success(this.i18nSvc.fanyi('common.notify.new-success'), ''); this.loadRulesTable(); } else { - this.notifySvc.error('新增失败!', message.msg); + this.notifySvc.error(this.i18nSvc.fanyi('common.notify.new-fail'), message.msg); } }, error => { - this.notifySvc.error('新增失败!', error.msg); + this.notifySvc.error(this.i18nSvc.fanyi('common.notify.new-fail'), error.msg); } ); } else { @@ -333,14 +336,14 @@ export class AlertNoticeComponent implements OnInit { message => { if (message.code === 0) { this.isManageRuleModalVisible = false; - this.notifySvc.success('修改成功!', ''); + this.notifySvc.success(this.i18nSvc.fanyi('common.notify.edit-success'), ''); this.loadRulesTable(); } else { - this.notifySvc.error('修改失败!', message.msg); + this.notifySvc.error(this.i18nSvc.fanyi('common.notify.edit-fail'), message.msg); } }, error => { - this.notifySvc.error('修改失败!', error.msg); + this.notifySvc.error(this.i18nSvc.fanyi('common.notify.edit-fail'), error.msg); } ); } diff --git a/web-app/src/assets/i18n/en-US.json b/web-app/src/assets/i18n/en-US.json index deda3e2..8e811d0 100644 --- a/web-app/src/assets/i18n/en-US.json +++ b/web-app/src/assets/i18n/en-US.json @@ -113,6 +113,33 @@ "alert.center.confirm.mark-done": "Please confirm whether to mark processed!", "alert.center.confirm.mark-no-batch": "Please confirm whether to mark Pending in batch!", "alert.center.confirm.mark-no": "Please confirm whether to mark Pending!", + "alert.notice.receiver": "Alert Receiver", + "alert.notice.receiver.new": "New Receiver", + "alert.notice.receiver.edit": "Edit Receiver", + "alert.notice.receiver.delete": "Delete Receiver", + "alert.notice.receiver.people": "Receiver", + "alert.notice.receiver.people.name": "Receiver Name", + "alert.notice.receiver.type": "Notice Type", + "alert.notice.receiver.setting": "Setting", + "alert.notice.type.sms": "SMS", + "alert.notice.type.phone": "Phone", + "alert.notice.type.email": "Email", + "alert.notice.type.url": "URL", + "alert.notice.type.wechat": "Open WeChat", + "alert.notice.type.wechat-id": "WeChat OPENID", + "alert.notice.type.wework": "WeWork Robot", + "alert.notice.type.wework-key": "WeWork Robot KEY", + "alert.notice.type.access-token": "Robot ACCESS_TOKEN", + "alert.notice.type.ding": "DingDing Robot", + "alert.notice.type.fei-shu": "FeiShu Robot", + "alert.notice.type.fei-shu-key": "FeiShu Robot KEY", + "alert.notice.rule": "Alert Notice Rule", + "alert.notice.rule.new": "New Notice Rule", + "alert.notice.rule.edit": "Edit Notice Rule", + "alert.notice.rule.delete": "Delete Notice Rule", + "alert.notice.rule.name": "Rule Name", + "alert.notice.rule.all": "Dispatch ALl", + "alert.notice.rule.enable": "Enable", "dashboard.alerts.title": "Recently Alerts List", "dashboard.alerts.enter": "Go Alert Center", "dashboard.alerts.distribute": "The Distribution Of Alerts", @@ -174,6 +201,10 @@ "common.new-time": "Create Time", "common.edit": "Operate", "common.total": "Total", + "common.yes": "Yes", + "common.no": "No", + "common.enable": "Enable", + "common.disable": "Disable", "common.notify.no-select-edit": "No items selected for editing!", "common.notify.one-select-edit": "Only one selection can be edited!", "common.confirm.delete": "Please confirm whether to delete!", @@ -181,6 +212,10 @@ "common.confirm.delete-batch": "Please confirm whether to delete in batches!", "common.notify.delete-success": "Delete Success!", "common.notify.delete-fail": "Delete Failed!", + "common.notify.new-success": "Add Success!", + "common.notify.new-fail": "Add Failed!", + "common.notify.edit-success": "Edit Success!", + "common.notify.edit-fail": "Edit Failed!", "common.notify.no-select-cancel": "No items selected for cancel!", "common.confirm.cancel-batch": "Please confirm whether to cancel monitor in batches!", "common.confirm.cancel": "Please confirm whether to cancel monitor!", diff --git a/web-app/src/assets/i18n/zh-CN.json b/web-app/src/assets/i18n/zh-CN.json index 49ad7c4..5da90a8 100644 --- a/web-app/src/assets/i18n/zh-CN.json +++ b/web-app/src/assets/i18n/zh-CN.json @@ -27,7 +27,7 @@ "alert": { "": "告警", "center": "告警中心", - "setting": "告警配置", + "setting": "告警阈值", "dispatch": "告警通知" }, "extras": { @@ -113,6 +113,33 @@ "alert.center.confirm.mark-done": "请确认是否标记已处理!", "alert.center.confirm.mark-no-batch": "请确认是否批量标记未处理!", "alert.center.confirm.mark-no": "请确认是否标记未处理!", + "alert.notice.receiver": "告警接收人", + "alert.notice.receiver.new": "新增接收人", + "alert.notice.receiver.edit": "编辑接收人", + "alert.notice.receiver.delete": "删除接收人", + "alert.notice.receiver.people": "接收人", + "alert.notice.receiver.people.name": "接收人名称", + "alert.notice.receiver.type": "通知方式", + "alert.notice.receiver.setting": "配置", + "alert.notice.type.sms": "短信", + "alert.notice.type.phone": "手机号", + "alert.notice.type.email": "邮箱", + "alert.notice.type.url": "URL地址", + "alert.notice.type.wechat": "微信公众号", + "alert.notice.type.wechat-id": "微信OPENID", + "alert.notice.type.wework": "企业微信机器人", + "alert.notice.type.wework-key": "企业微信机器人KEY", + "alert.notice.type.access-token": "机器人ACCESS_TOKEN", + "alert.notice.type.ding": "钉钉机器人", + "alert.notice.type.fei-shu": "飞书机器人", + "alert.notice.type.fei-shu-key": "飞书机器人KEY", + "alert.notice.rule": "告警通知策略", + "alert.notice.rule.new": "新增通知策略", + "alert.notice.rule.edit": "编辑通知策略", + "alert.notice.rule.delete": "删除通知策略", + "alert.notice.rule.name": "策略名称", + "alert.notice.rule.all": "转发所有", + "alert.notice.rule.enable": "是否启用", "dashboard.alerts.title": "最近告警列表", "dashboard.alerts.enter": "进入告警中心", "dashboard.alerts.distribute": "告警分布", @@ -174,6 +201,10 @@ "common.new-time": "创建时间", "common.edit": "操作", "common.total": "总量", + "common.yes": "是", + "common.no": "否", + "common.enable": "开启", + "common.disable": "关闭", "common.notify.no-select-edit": "未选中任何待编辑项!", "common.notify.one-select-edit": "只能对一个选中项进行编辑!", "common.confirm.delete": "请确认是否删除!", @@ -181,6 +212,10 @@ "common.confirm.delete-batch": "请确认是否批量删除!", "common.notify.delete-success": "删除成功!", "common.notify.delete-fail": "删除失败!", + "common.notify.new-success": "新增成功!", + "common.notify.new-fail": "新增失败!", + "common.notify.edit-success": "修改成功!", + "common.notify.edit-fail": "修改失败!", "common.notify.mark-success": "标记成功!", "common.notify.mark-fail": "标记失败!", "common.notify.no-select-cancel": "未选中任何待取消项!",