diff --git a/js/pages/newDataAnalysis/engineeringSafetyAnalysis.js b/js/pages/newDataAnalysis/engineeringSafetyAnalysis.js index dfd4ddd..f458ce7 100644 --- a/js/pages/newDataAnalysis/engineeringSafetyAnalysis.js +++ b/js/pages/newDataAnalysis/engineeringSafetyAnalysis.js @@ -35,14 +35,16 @@ function initTable(bidCode,name) { }, cols: [[ { type: 'numbers', title: '序号', width: '10%' }, // 添加序号列 + { field: 'proName', title: '工程名称', align: 'center', width: '10%' }, + { field: 'workLocation', title: '作业地点', align: 'center', width: '10%' }, { field: 'monitoringPointId', title: '监测点编号', align: 'center', width: '10%' }, - { field: 'name', title: '监测点名称', align: 'center', width: '20%' }, - { field: 'temperature', title: '当前温度', align: 'center', width: '10%' }, - { field: 'humidity', title: '当前湿度', align: 'center', width: '10%' }, - { field: 'windSpeed', title: '当前风速', align: 'center', width: '10%' }, - { field: 'gasValue', title: '当前气体值', align: 'center', width: '10%' }, + { field: 'name', title: '监测点名称', align: 'center', width: '10%' }, + { field: 'temperature', title: '当前温度', align: 'center', width: '8%' }, + { field: 'humidity', title: '当前湿度', align: 'center', width: '8%' }, + { field: 'windSpeed', title: '当前风速', align: 'center', width: '8%' }, + { field: 'gasValue', title: '当前气体值', align: 'center', width: '8%' }, { - field: 'rateLevel', title: '最高隐患等级', align: 'center', width: '20%', + field: 'rateLevel', title: '最高隐患等级', align: 'center', width: '10%', templet: function (d) { let color = ''; if (d.level == "一般隐患") { @@ -54,6 +56,14 @@ function initTable(bidCode,name) { } return '
' + d.level + '
'; } + }, + { + title: "操作", + align: "center", + width: '8%', + templet: function (row) { + return ` 分析与改进` + }, } ]], initComplete: function () { @@ -305,3 +315,59 @@ function initEchartsTwo(data) { } myChart2.setOption(riskOption, true) } + +function handlDetails(analysisReason){ + // 分离原因分析和改进措施 + const [reason, measure] = analysisReason.match(/原因分析:(.*)。改进措施:(.*)/).slice(1); + + // 创建一个包含分析原因及改进措施的HTML结构 + const content = ` +