diff --git a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/data.json b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/data.json index 08adbd7..94484d7 100644 --- a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/data.json +++ b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/data.json @@ -1,24 +1,24 @@ { "dimensions": [ "alarmLevel", - "count" + "alarm_count" ], "source": [ { "alarmLevel": "分类一", - "count": 94 + "alarm_count": 94 }, { "alarmLevel": "分类3", - "count": 4 + "alarm_count": 4 }, { "alarmLevel": "分类2", - "count": 30 + "alarm_count": 30 }, { "alarmLevel": "分类4", - "count": 40 + "alarm_count": 40 } ] } \ No newline at end of file diff --git a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/index.vue b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/index.vue index e549faa..b40f867 100644 --- a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/index.vue +++ b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/index.vue @@ -182,8 +182,8 @@ const fetchAlarmData = async ({ startTime, endTime }: { startTime: string; endTi const defaultNoData = { dimensions: props.chartConfig.option.dataset.dimensions, source: [{ - [props.chartConfig.option.dataset.dimensions[0]]: "测试数据", - [props.chartConfig.option.dataset.dimensions[1]]: 10 + [props.chartConfig.option.dataset.dimensions[0]]: "无数据", + [props.chartConfig.option.dataset.dimensions[1]]: 0 }], }; try { diff --git a/src/packages/components/Charts/HazardousChemicalsSpace/PieCenterHaz/index.vue b/src/packages/components/Charts/HazardousChemicalsSpace/PieCenterHaz/index.vue index 2816d1d..5f05e4d 100644 --- a/src/packages/components/Charts/HazardousChemicalsSpace/PieCenterHaz/index.vue +++ b/src/packages/components/Charts/HazardousChemicalsSpace/PieCenterHaz/index.vue @@ -236,23 +236,23 @@ function generateTimeRange(period: string): { startTime: string; endTime: string // 异步获取报警数据 async function fetchAlarmData({ startTime, endTime }: { startTime: string; endTime: string }) { try { - const res:any = await axiosInstance.get( - `/awjt/getAlarmdataRecord`, + const res: any = await axiosInstance.get( + `/awjt/space/getNumberByAlarmLevel`, { params: { startTime, endTime }, // 请求参数 responseType: 'json', - baseURL:'' + baseURL: '' } ); - if ( res) { + if (res.state === true && res.value) { console.log("API 响应数据:", res); // 转换为图表需要的数据结构 return { dimensions: ['name', 'value'], - source: res.map((item: any) => ({ + source: res.value.map((item: any) => ({ name: item.alarmLevel, - value: item.alarmNun + value: item.alarm_count })) }; } else {