diff --git a/src/views/faultManage/active-alarm/index.vue b/src/views/faultManage/active-alarm/index.vue index 910713d4..7c23e444 100644 --- a/src/views/faultManage/active-alarm/index.vue +++ b/src/views/faultManage/active-alarm/index.vue @@ -612,13 +612,17 @@ function fnShowSet() { } // key替换中文title -function mapKeysWithReduce(data: any, titleMapping: any) { - return data.map((item:any) => { - return Object.keys(item).reduce((newItem:any, key:any) => { +// key替换中文title +function mapKeysWithReduce(data: any[], titleMapping: Record) { + return data.map((item: any) => { + if (typeof item !== 'object' || item === null) { + return item; + } + return Object.keys(item).reduce((newItem: Record, key: string) => { const title = titleMapping[key] || key; newItem[title] = item[key]; return newItem; - }); + }, {}); }); } diff --git a/src/views/faultManage/history-alarm/index.vue b/src/views/faultManage/history-alarm/index.vue index d4c58eec..ec745df8 100644 --- a/src/views/faultManage/history-alarm/index.vue +++ b/src/views/faultManage/history-alarm/index.vue @@ -427,13 +427,17 @@ function fnCancelConfirm() { } // key替换中文title -function mapKeysWithReduce(data: any, titleMapping: any) { - return data.map((item:any) => { - return Object.keys(item).reduce((newItem:any, key:any) => { +// key替换中文title +function mapKeysWithReduce(data: any[], titleMapping: Record) { + return data.map((item: any) => { + if (typeof item !== 'object' || item === null) { + return item; + } + return Object.keys(item).reduce((newItem: Record, key: string) => { const title = titleMapping[key] || key; newItem[title] = item[key]; return newItem; - }); + }, {}); }); }