diff --git a/js/pages/dataAnalysisOctober/overallEfficiency.js b/js/pages/dataAnalysisOctober/overallEfficiency.js index 836f04e..29195d5 100644 --- a/js/pages/dataAnalysisOctober/overallEfficiency.js +++ b/js/pages/dataAnalysisOctober/overallEfficiency.js @@ -91,7 +91,12 @@ function initData(startTime, endTime) { $("#planProgress").text(data[key]); break; case "进度偏差": - $("#delayProgress").text(data[key]); + var delayProgress = Number(data[key]); + if(delayProgress > 0){ + $("#delayProgress").text("超前" + delayProgress); + }else{ + $("#delayProgress").text("滞后" + Math.abs(delayProgress)); + } break; case "计划成本": diff --git a/js/pages/dataAnalysisOctober/projectManagement.js b/js/pages/dataAnalysisOctober/projectManagement.js index 5ea07e9..bd70c41 100644 --- a/js/pages/dataAnalysisOctober/projectManagement.js +++ b/js/pages/dataAnalysisOctober/projectManagement.js @@ -480,10 +480,11 @@ function initProjectRisk(projectRisk) { } function initCivilEngineering(date) { - const xLabel = date.map((item) => item.day); - const expenditureData = date.map((item) => item.tjplanNum); - const incomeData = date.map((item) => item.tjexeNum); + const xLabel = date.day; + const expenditureData = date.tjplanNum; + const incomeData = date.tjexeNum; const leftChart = echarts.init(document.getElementById("civilEngineering")); + const option = { title: { text: "土建专业", @@ -713,9 +714,9 @@ function initCivilEngineering(date) { } function initElectrical(data) { - const xLabel = data.map((item) => item.day); - const expenditureData = data.map((item) => item.dqplanNum); - const incomeData = data.map((item) => item.dqexeNum); + const xLabel = data.day; + const expenditureData = data.dqplanNum; + const incomeData = data.dqexeNum; const leftChart = echarts.init(document.getElementById("electrical")); const option = { title: {