Skip to content

Commit d184a44

Browse files
committed
🚧 Resolve known issues
1 parent 70e4ceb commit d184a44

File tree

5 files changed

+34
-11
lines changed

5 files changed

+34
-11
lines changed

src/components/index.jsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ export const ComponentsContent = (props) => {
6363
fetchTenantList(res.data.userid)
6464
}
6565
} catch (error) {
66+
window.localStorage.removeItem('Authorization');
67+
navigate('/login');
6668
console.error(error)
6769
}
6870
}

src/pages/event/currentEvent.jsx

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,10 @@ export const AlertCurrentEvent = (props) => {
8484
key: "status",
8585
render: (text) => {
8686
const statusMap = {
87-
0: { color: 'green', text: '未知'},
87+
0: { color: 'black', text: '未知'},
8888
1: { color: 'red', text: '告警中' },
8989
2: { color: 'grey', text: '静默中' },
90+
3: { color: 'orange', text: '待恢复' },
9091
};
9192
const status = statusMap[text];
9293
return status ? <Tag color={status.color}>{status.text}</Tag> : '-';
@@ -253,7 +254,21 @@ export const AlertCurrentEvent = (props) => {
253254
<Tag color="processing" key={key}>{`${key}: ${value}`}</Tag>
254255
))}
255256
<h4>事件状态:</h4>
256-
<p>{<Tag color={selectedEvent.status === 1 ? 'red' : 'grey'}>{selectedEvent.status === 1 ? '告警中' : '静默中'}</Tag>}</p>
257+
<p>{
258+
<Tag
259+
color={
260+
selectedEvent.status === 1 ? 'red' :
261+
selectedEvent.status === 2 ? 'gray' :
262+
selectedEvent.status === 3 ? 'orange' : 'black'
263+
}>
264+
{
265+
selectedEvent.status === 1 ? '告警中' :
266+
selectedEvent.status === 2 ? '静默中' :
267+
selectedEvent.status === 3 ? '待恢复' : '未知'
268+
}
269+
</Tag>
270+
}
271+
</p>
257272
<h4>触发时值:</h4>
258273
<p>{selectedEvent.metric["value"]}</p>
259274
<h4>事件详情:</h4>

src/pages/faultCenter/index.jsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,11 @@ export const FaultCenter = () => {
217217
style={styles.value(item.currentAlertNumber > 0 ? '#ff7373' : '#93fa8f')}>{item.currentAlertNumber ? item.currentAlertNumber : 0} </span>
218218
<span style={styles.label}> 待处理</span>
219219
</div>
220+
<div>
221+
<span
222+
style={styles.value( 'orange')}>{item.currentRecoverNumber ? item.currentRecoverNumber : 0} </span>
223+
<span style={styles.label}> 待恢复</span>
224+
</div>
220225
<div>
221226
<span
222227
style={styles.value('#878383')}>{item.currentMuteNumber ? item.currentMuteNumber : 0} </span>

src/pages/settings/index.jsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ export const SystemSettings = () => {
3232
try {
3333
const res = await getSystemSetting();
3434
form.setFieldsValue({
35-
alarmConfig: {
36-
groupWait: res.data.alarmConfig.groupWait,
37-
groupInterval: res.data.alarmConfig.groupInterval,
38-
recoverWait: res.data.alarmConfig.recoverWait,
39-
},
4035
emailConfig: {
4136
serverAddress: res.data.emailConfig.serverAddress,
4237
port: res.data.emailConfig.port,

src/utils/http.jsx

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* 网络请求配置
33
*/
44
import axios from 'axios';
5+
import {message} from "antd";
56
const protocol = window.location.protocol;
67
const curUrl = window.location.hostname
78
const port = window.location.port;
@@ -42,11 +43,16 @@ axios.interceptors.response.use(
4243
return response;
4344
},
4445
(error) => {
45-
if (error?.response?.status === 401) {
46-
window.localStorage.removeItem('Authorization');
47-
window.history.replaceState(null, '', '/login');
48-
window.location.reload();
46+
switch (error?.response?.status){
47+
case 401:
48+
window.localStorage.removeItem('Authorization');
49+
window.history.replaceState(null, '', '/login');
50+
// window.location.reload();
51+
case 403:
52+
message.error("无权限访问!")
53+
window.history.replaceState(null, '', '/');
4954
}
55+
5056
return Promise.reject(error);
5157
}
5258
);

0 commit comments

Comments
 (0)