diff --git a/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml b/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml index 8499f6f..3192620 100644 --- a/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml @@ -236,7 +236,7 @@ SELECT resultType="map"> SELECT ifnull(d.dict_label,'未知') 'name', - count( 1 ) 'value' + SUM(IFNULL(e.hd_count,0)) 'value' FROM ehs_hidden_danger e LEFT JOIN sys_dict_data d ON e.status = d.dict_value diff --git a/ruoyi-ui/src/views/ehs/ehsRisk/index.vue b/ruoyi-ui/src/views/ehs/ehsRisk/index.vue index 69d8f3f..ee5e849 100644 --- a/ruoyi-ui/src/views/ehs/ehsRisk/index.vue +++ b/ruoyi-ui/src/views/ehs/ehsRisk/index.vue @@ -237,7 +237,7 @@ - +