diff --git a/src/api/AlertMock.ts b/src/api/AlertMock.ts index f5d004d..74257a0 100644 --- a/src/api/AlertMock.ts +++ b/src/api/AlertMock.ts @@ -63,6 +63,8 @@ export interface Item { drivingInfo: string; submissionInfo: string; alarmStatus: number; + lineId: number; + lineType: string; } /** diff --git a/src/api/AuthApi.ts b/src/api/AuthApi.ts index 3ce2134..3180760 100644 --- a/src/api/AuthApi.ts +++ b/src/api/AuthApi.ts @@ -25,6 +25,7 @@ export interface RoleInfo { id: number; name: string; resList: number[]; + roleConfigStr: string; } /** @@ -77,6 +78,19 @@ export async function getRoleInfo(id: number): Promise { return response.data; } +/** + * 角色配置 + * @param id 角色id + * @param data + */ +export function roleConfig(id: number, data: string) { + return api.post(`${AuthBase}/config/${id}`, data, { + headers: { + 'Content-Type': 'text/plain', + }, + }); +} + interface LinkRole { id: number; roleList: number[]; diff --git a/src/components/SysMenu.vue b/src/components/SysMenu.vue index 9e569ae..0bf85b9 100644 --- a/src/components/SysMenu.vue +++ b/src/components/SysMenu.vue @@ -47,7 +47,7 @@ const userStore = useUserStore(); const list = reactive([ { show: true, - path: getMonitorPath(userStore.roles), + path: getMonitorPath(userStore.roles).monitorPath, label: '监控', icon: 'computer', }, diff --git a/src/components/alarm/alarmInfoDialog.vue b/src/components/alarm/alarmInfoDialog.vue index b40b7e9..378ba67 100644 --- a/src/components/alarm/alarmInfoDialog.vue +++ b/src/components/alarm/alarmInfoDialog.vue @@ -49,11 +49,22 @@ />
- - + +
@@ -88,7 +99,7 @@