This commit is contained in:
parent
962ceebf0b
commit
766bf671e0
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 '<span style="color: #00FEFC;">' + count + '</span>';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue