' + d.level + '
'; + // if (d.level == "一般隐患") { + // color = 'green'; + // } else if (d.level == '较大隐患') { + // color = 'yellow'; + // } else if (d.level == '重大隐患') { + // color = 'red'; + // } + return '存在隐患
'; } }, { diff --git a/js/pages/newDataAnalysis/environDetection.js b/js/pages/newDataAnalysis/environDetection.js index 5f1640a..5cda9d4 100644 --- a/js/pages/newDataAnalysis/environDetection.js +++ b/js/pages/newDataAnalysis/environDetection.js @@ -382,7 +382,7 @@ function getGisOption(gisData) { { name: '标准值', type: 'bar', - data: [25, 50, 0.10], + data: [25, 50, 0.50], itemStyle: { color: '#94a3b8' } diff --git a/js/pages/newDataAnalysis/projectManagement.js b/js/pages/newDataAnalysis/projectManagement.js index 8d900ca..2226454 100644 --- a/js/pages/newDataAnalysis/projectManagement.js +++ b/js/pages/newDataAnalysis/projectManagement.js @@ -483,7 +483,7 @@ function initTable(type, bidCode) { cols: [ [ { - field: "number", + type: "numbers", title: "序号", width: 100, }, diff --git a/js/pages/newDataAnalysis/projectProgress.js b/js/pages/newDataAnalysis/projectProgress.js index 6f0a89c..f1b4db5 100644 --- a/js/pages/newDataAnalysis/projectProgress.js +++ b/js/pages/newDataAnalysis/projectProgress.js @@ -24,8 +24,8 @@ function setCols(type) { }, { field: "actualEndTime", title: "实际完成时间", align: "center" }, { field: "processDiff", title: "进度偏差", align: "center" }, - { field: "completeEffort", title: "已完成工程量", align: "center" }, - { field: "totalEffort", title: "总工程量", align: "center" }, + // { field: "completeEffort", title: "已完成工程量", align: "center" }, + // { field: "totalEffort", title: "总工程量", align: "center" }, { title: "延误因素分析", align: "center", diff --git a/js/pages/newDataAnalysis/workerEfficiencyAnalysis.js b/js/pages/newDataAnalysis/workerEfficiencyAnalysis.js index fe76581..247a49b 100644 --- a/js/pages/newDataAnalysis/workerEfficiencyAnalysis.js +++ b/js/pages/newDataAnalysis/workerEfficiencyAnalysis.js @@ -8,15 +8,6 @@ const tipsArr = [ '定期组织技能培训和考试，并做好施工工具的维护与定期检查工作。', ]; -// let -const inefficiencyArr = [ - { - 'gxName':'', - nameList:['专业技能不足', '工具故障','人员异常','设备维保','环境变化'], - valueList:[{ name: '专业技能不足', value: 4 }, { name: '工具故障', value: 1 }] - - } -]; layui.use(['layer', 'table', 'form'], function () { layer = layui.layer; table = layui.table; @@ -58,22 +49,33 @@ function initTable() { userName: userName, }, cols: [[ - { type: 'numbers', title: '序号', width: '10%' }, // 添加序号列 + { type: 'numbers', title: '序号', width: '6%' }, // 添加序号列 { field: 'userName', title: '班组长', align: 'center', width: '10%' }, { field: 'teamName', title: '班组', align: 'center', width: '15%' }, { - field: 'gxName', title: '工序', align: 'center', width: '20%', + field: 'gxName', title: '工序', align: 'center', width: '35%', + templet: function (d) { + if (d.gxName) { + if (d.gxName.length > 100) { + return '' + d.gxName.substring(0, 100) + '...' + } else { + return '' + d.gxName + '' + } + } else { + return ''; + } + } }, { - field: 'planDay', title: '计划完成天数', align: 'center', width: '10%', + field: 'planDay', title: '计划完成天数', align: 'center', width: '12%', }, { - field: 'actualDay', title: '实际完成天数', align: 'center', width: '10%', + field: 'actualDay', title: '实际完成天数', align: 'center', width: '12%', }, - { - field: 'workStandard', title: '作业内容', align: 'center', width: '15%', + /* { + field: 'workStandard', title: '作业内容', align: 'center', width: '19%', templet: function (d) { if (d.workStandard) { if (d.workStandard.length > 60) { @@ -86,7 +88,7 @@ function initTable() { } } - }, + }, */ { title: '效率评级', align: 'center', width: '10%', templet: function (d) { @@ -399,8 +401,8 @@ function initEchartsOne(obj) { /* 变化趋势 */ function initEchartsTwo(data) { - let nameList = ['专业技能不足', '工具故障','人员异常','设备维保','环境变化']; - let valueList = [{ name: '专业技能不足', value: 4 }, { name: '工具故障', value: 1 }]; + let nameList = ['专业技能不足', '工具故障','设备维保','环境变化']; + let valueList = [{ name: '专业技能不足', value: 4 }, { name: '工具故障', value: 1 },{ name: '设备维保', value: 1 },{ name: '环境变化', value: 1 }]; const option = { grid: { top: 0, diff --git a/pages/newDataAnalysis/environDetection.html b/pages/newDataAnalysis/environDetection.html index 1add1a2..4b54baa 100644 --- a/pages/newDataAnalysis/environDetection.html +++ b/pages/newDataAnalysis/environDetection.html @@ -83,16 +83,9 @@