Commit 60350d6c0033e41dc08ef9870a974a8bd0b6e007
1 parent
419183ab
fix(front): fix report form config creator to createUserName
Showing
2 changed files
with
4 additions
and
8 deletions
@@ -54,7 +54,9 @@ const staticMenus: Menu[] = []; | @@ -54,7 +54,9 @@ const staticMenus: Menu[] = []; | ||
54 | async function getAsyncMenus() { | 54 | async function getAsyncMenus() { |
55 | const permissionStore = usePermissionStore(); | 55 | const permissionStore = usePermissionStore(); |
56 | if (isBackMode()) { | 56 | if (isBackMode()) { |
57 | - return permissionStore.getBackMenuList.filter((item) => !item.meta?.hideMenu && !item.hideMenu); | 57 | + return permissionStore.getBackMenuList.filter( |
58 | + (item) => !item.meta?.hideMenu && !item.hideMenu && item.meta?.menuType != '2' | ||
59 | + ); | ||
58 | } | 60 | } |
59 | if (isRouteMappingMode()) { | 61 | if (isRouteMappingMode()) { |
60 | return permissionStore.getFrontMenuList.filter((item) => !item.hideMenu); | 62 | return permissionStore.getFrontMenuList.filter((item) => !item.hideMenu); |
@@ -13,8 +13,6 @@ import { | @@ -13,8 +13,6 @@ import { | ||
13 | getPacketIntervalByValue, | 13 | getPacketIntervalByValue, |
14 | intervalOption, | 14 | intervalOption, |
15 | } from '../../device/localtion/cpns/TimePeriodForm/helper'; | 15 | } from '../../device/localtion/cpns/TimePeriodForm/helper'; |
16 | -import { USER_INFO_KEY } from '/@/enums/cacheEnum'; | ||
17 | -import { getAuthCache } from '/@/utils/auth'; | ||
18 | 16 | ||
19 | export enum QueryWay { | 17 | export enum QueryWay { |
20 | LATEST = 'latest', | 18 | LATEST = 'latest', |
@@ -75,12 +73,8 @@ export const columns: BasicColumn[] = [ | @@ -75,12 +73,8 @@ export const columns: BasicColumn[] = [ | ||
75 | }, | 73 | }, |
76 | { | 74 | { |
77 | title: '创建人', | 75 | title: '创建人', |
78 | - dataIndex: 'creator', | 76 | + dataIndex: 'createUserName', |
79 | width: 180, | 77 | width: 180, |
80 | - format: (_text: string, record: Recordable) => { | ||
81 | - const userInfo: any = getAuthCache(USER_INFO_KEY); | ||
82 | - if (record.creator == userInfo.userId) return userInfo.realName || userInfo.username; | ||
83 | - }, | ||
84 | }, | 78 | }, |
85 | { | 79 | { |
86 | title: '创建日期', | 80 | title: '创建日期', |