diff --git a/js/pages/dataAnalysisOctober/energySavingAnalysis.js b/js/pages/dataAnalysisOctober/energySavingAnalysis.js index 342fd54..b4a2548 100644 --- a/js/pages/dataAnalysisOctober/energySavingAnalysis.js +++ b/js/pages/dataAnalysisOctober/energySavingAnalysis.js @@ -144,7 +144,7 @@ function getElectricAndWaterGrowthRate() { }, function (result) { console.log(result, '水电环比数据'); if (result) { - updateComparisonData(result); + updateComparisonData(result.data); } else if (result && result.data) { updateComparisonData(result.data); } diff --git a/js/pages/dataAnalysisOctober/resourceRateAnalysis.js b/js/pages/dataAnalysisOctober/resourceRateAnalysis.js index 16bb269..41a66f1 100644 --- a/js/pages/dataAnalysisOctober/resourceRateAnalysis.js +++ b/js/pages/dataAnalysisOctober/resourceRateAnalysis.js @@ -780,13 +780,13 @@ function initModalPersonnelListTable() { } }, { - field: 'peopleNum', + field: 'dutyNum', title: '当日到岗人数', width: '15%', align: 'center', templet: function (d) { // 只显示数字,不可点击,优先使用peopleNum,如果没有则使用dutyNum - const count = d.peopleNum || d.dutyNum || 0; + const count = d.dutyNum || 0; return '' + count + ''; } }