diff --git a/ruoyi-system/src/main/resources/mapper/ehs/EhsHiddenDangerMapper.xml b/ruoyi-system/src/main/resources/mapper/ehs/EhsHiddenDangerMapper.xml
index a9376a4..9d9d0e6 100644
--- a/ruoyi-system/src/main/resources/mapper/ehs/EhsHiddenDangerMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/ehs/EhsHiddenDangerMapper.xml
@@ -71,6 +71,8 @@ FROM ehs_hidden_danger h LEFT JOIN sys_dept d ON h.dept_id = d.dept_id
and FIND_IN_SET( #{assistDept}, assist_dept )
and area_id = #{areaId}
and is_Towns = #{isTowns}
+ and enterprise_scale = #{enterpriseScale}
+ and economic_type = #{economicType}
and DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT( h.check_time, '%Y-%m')
and (h.STATUS = 0 or h.STATUS = 5 ) AND DATEDIFF(h.rectify_term_time ,ifnull(h.rectify_time,CURDATE()) )>3 AND DATEDIFF(h.rectify_term_time ,ifnull(h.rectify_time,CURDATE()) ) <= 7
and (h.STATUS = 0 or h.STATUS = 5 ) AND DATEDIFF(h.rectify_term_time ,ifnull(h.rectify_time,CURDATE()) )>=0 AND DATEDIFF(h.rectify_term_time ,ifnull(h.rectify_time,CURDATE()) ) < 3
diff --git a/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml b/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml
index 3192620..9ac10e3 100644
--- a/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml
@@ -176,7 +176,8 @@ SELECT
resultType="map">
SELECT
ifnull(d.dict_label,'未知') 'name',
- count( 1 ) 'value'
+ SUM(IFNULL(e.hd_count,0)) 'value',
+ enterprise_type 'enterpriseType'
FROM
ehs_hidden_danger e
LEFT JOIN sys_dict_data d ON e.enterprise_type = d.dict_value
@@ -191,7 +192,8 @@ SELECT
resultType="map">
SELECT
ifnull(d.dict_label,'未知') 'name',
- count( 1 ) 'value'
+ SUM(IFNULL(e.hd_count,0)) 'value',
+ economic_type 'economicType'
FROM
ehs_hidden_danger e
LEFT JOIN sys_dict_data d ON e.economic_type = d.dict_value
@@ -206,7 +208,8 @@ SELECT
resultType="map">
SELECT
ifnull(d.dict_label,'未知') 'name',
- count( 1 ) 'value'
+ SUM(IFNULL(e.hd_count,0)) 'value',
+ enterprise_scale 'enterpriseScale'
FROM
ehs_hidden_danger e
LEFT JOIN sys_dict_data d ON e.enterprise_scale = d.dict_value
@@ -236,7 +239,8 @@ SELECT
resultType="map">
SELECT
ifnull(d.dict_label,'未知') 'name',
- SUM(IFNULL(e.hd_count,0)) 'value'
+ SUM(IFNULL(e.hd_count,0)) 'value',
+ e.status
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/ehsExamples/index.vue b/ruoyi-ui/src/views/ehs/ehsExamples/index.vue
index 01a2347..fe8d08c 100644
--- a/ruoyi-ui/src/views/ehs/ehsExamples/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsExamples/index.vue
@@ -1,6 +1,7 @@
+
@@ -189,9 +190,10 @@ import {
getDangerList,
} from "@/api/ehs/ehsExamples";
import indexHD from "./indexHD";
+import indexDanger from "./indexDanger"
export default {
name: "dap",
- components: { indexHD},
+ components: { indexHD, indexDanger},
data() {
return {
activeName: "tj1", //tab默认显示
@@ -341,6 +343,12 @@ export default {
option && this.myChart2.setOption(option);
// myChart.resize();
+ this.myChart2.on('click', (params) => {
+ const a = res.data.find((e) => {
+ return params.name == e.name;
+ })
+ this.$refs.indexDangerRef.openDialog1(a.status);
+ });
},
async hylyinit() {
let res = await getTrade();
@@ -386,6 +394,12 @@ export default {
};
option && this.myChart3.setOption(option);
// myChart.resize();
+ this.myChart3.on('click', (params) => {
+ const a = res.data.find((e)=>{
+ return params.name == e.name;
+ })
+ this.$refs.indexDangerRef.openDialog4(a.enterpriseType);
+ });
},
async jjClassInit() {
let res = await getEconomics();
@@ -431,6 +445,12 @@ export default {
};
option && this.myChart4.setOption(option);
// myChart.resize();
+ this.myChart4.on('click', (params) => {
+ const a = res.data.find((e) => {
+ return params.name == e.name;
+ });
+ this.$refs.indexDangerRef.openDialog3(a.economicType);
+ });
},
async scaleInit() {
let res = await getScale();
@@ -478,6 +498,12 @@ export default {
// window.onresize = function() {
// this.myChart5.resize();
// };
+ this.myChart5.on('click', (params) => {
+ const a = res.data.find((e) => {
+ return params.name == e.name;
+ });
+ this.$refs.indexDangerRef.openDialog2(a.enterpriseScale);
+ });
},
},
diff --git a/ruoyi-ui/src/views/ehs/ehsExamples/indexDanger.vue b/ruoyi-ui/src/views/ehs/ehsExamples/indexDanger.vue
new file mode 100644
index 0000000..df6b3c3
--- /dev/null
+++ b/ruoyi-ui/src/views/ehs/ehsExamples/indexDanger.vue
@@ -0,0 +1,423 @@
+
+
+
+
+
+
+
+
+ {{scope.row.enterpriseName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ (scope.row.enterpriseStatus !=null && scope.row.enterpriseStatus != "") ? statusOptions[scope.row.enterpriseStatus].label:""}}
+
+
+
+
+
+
+ {{ parseTime(scope.row.checkTime, '{y}-{m}-{d}') }}
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.rectifyTermTime, '{y}-{m}-{d}') }}
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.rectifyTime, '{y}-{m}-{d}') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{(scope.row.assistDept=='' ||scope.row.assistDept==null)?"无协办单位": "显示协办单位" }}
+
+
+
+
+
+
+
+
+
+
+