饼图bug修复
This commit is contained in:
@@ -95,7 +95,10 @@ const visitorCount = ref<number>(0)
|
||||
// 总体概览-各园区统计
|
||||
const parkStatistics = ref<any>()
|
||||
// 危险作业/安全考核/安全、保密培训
|
||||
const riskStatistics = ref<any>()
|
||||
const riskStatistics = ref<Record<TabType, any[]>>({
|
||||
安全类: [],
|
||||
工程类: []
|
||||
})
|
||||
const dangerDetail = ref<any>()
|
||||
// 动画相关的状态
|
||||
const isAnimating = ref<boolean>(false)
|
||||
@@ -595,6 +598,24 @@ const handleRiskTabChange = async (tab: TabType) => {
|
||||
})
|
||||
])
|
||||
|
||||
// 处理接口返回的数据结构:可能是数组或对象
|
||||
const getRecords = (response: any): any[] => {
|
||||
if (Array.isArray(response)) {
|
||||
return response
|
||||
} else if (response && Array.isArray(response.records)) {
|
||||
return response.records
|
||||
} else if (response && response.data && Array.isArray(response.data)) {
|
||||
return response.data
|
||||
}
|
||||
return []
|
||||
}
|
||||
|
||||
const maintenanceRecords = getRecords(maintenanceResponse)
|
||||
const inspectionRecords = getRecords(inspectionResponse)
|
||||
|
||||
console.log('维保任务数据:', maintenanceResponse, '提取的records:', maintenanceRecords)
|
||||
console.log('巡检任务数据:', inspectionResponse, '提取的records:', inspectionRecords)
|
||||
|
||||
// 周期映射
|
||||
const cycleMap: Record<string, string> = {
|
||||
'day': '每日',
|
||||
@@ -637,8 +658,8 @@ const handleRiskTabChange = async (tab: TabType) => {
|
||||
}
|
||||
|
||||
// 转换维保和巡检数据
|
||||
const maintenanceCharts = convertToChartData(maintenanceResponse.records || [], '维保类')
|
||||
const inspectionCharts = convertToChartData(inspectionResponse.records || [], '巡检类')
|
||||
const maintenanceCharts = convertToChartData(maintenanceRecords, '维保类')
|
||||
const inspectionCharts = convertToChartData(inspectionRecords, '巡检类')
|
||||
|
||||
// 合并为6个图表:先维保(3个),后巡检(3个)
|
||||
const allCharts = [...maintenanceCharts, ...inspectionCharts]
|
||||
@@ -647,6 +668,7 @@ const handleRiskTabChange = async (tab: TabType) => {
|
||||
riskStatistics.value[tab] = allCharts
|
||||
|
||||
console.log('更新后的riskStatistics:', riskStatistics.value)
|
||||
console.log('当前tab的图表数据:', allCharts)
|
||||
} catch (error) {
|
||||
console.error('获取风险统计数据失败:', error)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user