From 125108d5e6e43f5d51b4a4c40affe833722eb64c Mon Sep 17 00:00:00 2001 From: liukewei Date: Thu, 21 Dec 2023 10:03:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=9F=E8=AE=A1=E5=88=86?= =?UTF-8?q?=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/ehs/EhsIndexStatisticsMapper.xml | 6 +++--- ruoyi-ui/src/views/ehs/ehsExamples/index.vue | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml b/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml index c72558a..52d9d03 100644 --- a/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml @@ -168,7 +168,7 @@ SELECT ifnull(d.dict_label,'未知') 'name', count( 1 ) 'value' FROM - ehs_enterprise e + ehs_hidden_danger e LEFT JOIN sys_dict_data d ON e.enterprise_type = d.dict_value AND d.dict_type = 'enterprise_type' @@ -183,7 +183,7 @@ SELECT ifnull(d.dict_label,'未知') 'name', count( 1 ) 'value' FROM - ehs_enterprise e + ehs_hidden_danger e LEFT JOIN sys_dict_data d ON e.economic_type = d.dict_value AND d.dict_type = 'economic_type' @@ -198,7 +198,7 @@ SELECT ifnull(d.dict_label,'未知') 'name', count( 1 ) 'value' FROM - ehs_enterprise e + ehs_hidden_danger e LEFT JOIN sys_dict_data d ON e.enterprise_scale = d.dict_value AND d.dict_type = 'enterprise_scale' diff --git a/ruoyi-ui/src/views/ehs/ehsExamples/index.vue b/ruoyi-ui/src/views/ehs/ehsExamples/index.vue index bdc4940..73718ad 100644 --- a/ruoyi-ui/src/views/ehs/ehsExamples/index.vue +++ b/ruoyi-ui/src/views/ehs/ehsExamples/index.vue @@ -335,7 +335,7 @@ export default { let res = await getTrade(); this.myChart3 = echarts.init(this.$refs.hyly); let option = { - title: { text: "行业领域统计数量" }, + title: { text: "行业领域统计隐患数量" }, tooltip: { trigger: "item", }, @@ -346,7 +346,7 @@ export default { }, series: [ { - name: "行业统计数量", + name: "行业统计隐患数量", type: "pie", radius: "50%", avoidLabelOverlap: false, @@ -380,7 +380,7 @@ export default { let res = await getEconomics(); this.myChart4 = echarts.init(this.$refs.jjClass); let option = { - title: { text: "经济类型统计数量" }, + title: { text: "经济类型统计隐患数量" }, tooltip: { trigger: "item", }, @@ -391,7 +391,7 @@ export default { }, series: [ { - name: "经济类型统计", + name: "经济类型隐患统计", type: "pie", radius: "50%", avoidLabelOverlap: false, @@ -425,7 +425,7 @@ export default { let res = await getScale(); this.myChart5 = echarts.init(this.$refs.scale); let option = { - title: { text: "企业规模统计数量" }, + title: { text: "企业规模统计隐患数量" }, tooltip: { trigger: "item", }, @@ -436,7 +436,7 @@ export default { }, series: [ { - name: "企业规模统计", + name: "企业规模隐患统计", type: "pie", radius: "50%", avoidLabelOverlap: false,