From ad6cef570428a0da56dddc8f4deddff2c6434324 Mon Sep 17 00:00:00 2001 From: jsers Date: Tue, 23 May 2023 17:27:00 +0800 Subject: [PATCH] refactor(event): update event page --- src/pages/event/card.tsx | 8 ++++++-- src/pages/event/detail.tsx | 23 +++++++++++++---------- src/pages/event/index.tsx | 15 ++++++++++++++- src/pages/historyEvents/index.tsx | 15 ++++++++++++++- 4 files changed, 47 insertions(+), 14 deletions(-) diff --git a/src/pages/event/card.tsx b/src/pages/event/card.tsx index 404bfe20c..cca9058f2 100644 --- a/src/pages/event/card.tsx +++ b/src/pages/event/card.tsx @@ -85,8 +85,12 @@ function Card(props: Props, ref) { const columns = [ { - title: t('common:datasource.type'), - dataIndex: 'cate', + title: t('prod'), + dataIndex: 'rule_prod', + width: 100, + render: (value) => { + return t(`AlertHisEvents:rule_prod.${value}`); + }, }, { title: t('common:datasource.name'), diff --git a/src/pages/event/detail.tsx b/src/pages/event/detail.tsx index e79e12e18..7770b4cb0 100644 --- a/src/pages/event/detail.tsx +++ b/src/pages/event/detail.tsx @@ -63,16 +63,19 @@ const EventDetailPage: React.FC = () => { label: t('detail.rule_name'), key: 'rule_name', render(content, { rule_id }) { - return ( - - {content} - - ); + if (!_.includes(['firemap', 'northstar'], eventDetail?.rule_prod)) { + return ( + + {content} + + ); + } + return content; }, }, ...(!_.includes(['firemap', 'northstar'], eventDetail?.rule_prod) diff --git a/src/pages/event/index.tsx b/src/pages/event/index.tsx index 6f181383d..0ac500a74 100644 --- a/src/pages/event/index.tsx +++ b/src/pages/event/index.tsx @@ -91,7 +91,7 @@ const Event: React.FC = () => { return {t(`hours.${item.value}`)}; })} - + {(isShow) => { let options = [ { @@ -121,6 +121,19 @@ const Event: React.FC = () => { }, ]; } + if (isShow[3]) { + options = [ + ...options, + { + label: t('AlertHisEvents:rule_prod.firemap'), + value: 'firemap', + }, + { + label: t('AlertHisEvents:rule_prod.northstar'), + value: 'northstar', + }, + ]; + } return ( - + {(isShow) => { let options = [ { @@ -183,6 +183,19 @@ const Event: React.FC = () => { }, ]; } + if (isShow[3]) { + options = [ + ...options, + { + label: t('rule_prod.firemap'), + value: 'firemap', + }, + { + label: t('rule_prod.northstar'), + value: 'northstar', + }, + ]; + } return (