isoftstone/lc_frontend
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

饼图bug修复

Browse Source
This commit is contained in:
chenlin
2025-12-16 15:03:01 +08:00
parent 5daba69ee5
commit ec7ef87340
3 changed files with 86 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/views/screen/mainScreen.vue
View File

@@ -431,12 +431,17 @@ const handleHiddenDangerPannelData = (query) => {
// 获取隐患排查治理数据
getTableList('risk_status_count', query).then(res => {
if (res.records && res.records.length > 0) {
_data.overdue = _data.overdue + Number(res.records[0].overdueCnt)
_data.processed = _data.processed + Number(res.records[0].processedCnt)
_data.processing = _data.processing + Number(res.records[0].processingCnt)
_data.pending = _data.pending
// 接口返回的已经是百分比，直接使用
const record = res.records[0]
_data.overdue = Number(record.overdueCnt) || 0
_data.processed = Number(record.processedCnt) || 0
_data.processing = Number(record.processingCnt) || 0
_data.pending = 0 // 接口没有返回pending，设为0
_data.flag = true
console.log('risk_status_count 接口返回数据:', record)
console.log('处理后的 _data:', _data)
if (_data2.flag) {
// 合并数据
console.log("请求系统和第三方成功，合并数据", _data, _data2);
@@ -445,30 +450,44 @@ const handleHiddenDangerPannelData = (query) => {
dashboardData.value.hiddenDangerData.general = generalCnt
dashboardData.value.hiddenDangerData.major = majorCnt
let totalCnt = generalCnt + majorCnt
let overdueCnt = ((_data.overdue + _data2.overdue) / totalCnt * 100).toFixed(2)
let processedCnt = ((_data.processed + _data2.processed) / totalCnt * 100).toFixed(2)
let processingCnt = ((_data.processing + _data2.processing) / totalCnt * 100).toFixed(2)
let pendingCnt = ((_data.pending + _data2.pending) / totalCnt * 100).toFixed(2)
// 如果第三方数据也是百分比，需要合并；否则使用系统数据
// 这里假设系统数据是百分比，第三方数据可能是数量或百分比
let overdueCnt, processedCnt, processingCnt, pendingCnt
if (_data2.overdue > 1 || _data2.processed > 1 || _data2.processing > 1) {
// 第三方数据可能是百分比，直接使用系统数据（因为系统数据更准确）
overdueCnt = _data.overdue.toFixed(2)
processedCnt = _data.processed.toFixed(2)
processingCnt = _data.processing.toFixed(2)
pendingCnt = _data.pending.toFixed(2)
} else {
// 第三方数据可能是数量，需要计算百分比
let totalCnt = generalCnt + majorCnt
overdueCnt = totalCnt > 0 ? ((_data.overdue + _data2.overdue) / totalCnt * 100).toFixed(2) : '0.00'
processedCnt = totalCnt > 0 ? ((_data.processed + _data2.processed) / totalCnt * 100).toFixed(2) : '0.00'
processingCnt = totalCnt > 0 ? ((_data.processing + _data2.processing) / totalCnt * 100).toFixed(2) : '0.00'
pendingCnt = totalCnt > 0 ? ((_data.pending + _data2.pending) / totalCnt * 100).toFixed(2) : '0.00'
}
dashboardData.value.hiddenDangerData.progress = {
overdue: overdueCnt,
processed: processedCnt,
processing: processingCnt,
pending: pendingCnt,
}
console.log('合并后的 progress:', dashboardData.value.hiddenDangerData.progress)
} else {
console.log("请求系统成功，展示数据", _data, _data2);
dashboardData.value.hiddenDangerData.general = _data.general
dashboardData.value.hiddenDangerData.major = _data.major
let totalCnt = _data.general + _data.major
// 显示系统数据
// 接口返回的已经是百分比，直接使用
dashboardData.value.hiddenDangerData.progress = {
overdue: (_data.overdue / totalCnt * 100).toFixed(2),
processed: (_data.processed / totalCnt * 100).toFixed(2),
processing: (_data.processing / totalCnt * 100).toFixed(2),
pending: (_data.pending / totalCnt * 100).toFixed(2),
overdue: _data.overdue.toFixed(2),
processed: _data.processed.toFixed(2),
processing: _data.processing.toFixed(2),
pending: _data.pending.toFixed(2),
}
console.log('系统数据 progress:', dashboardData.value.hiddenDangerData.progress)
}
}
})