hidden_danger_process_progress
This commit is contained in:
@@ -1059,56 +1059,56 @@ const handleHiddenDangerPannelData = (query) => {
|
||||
|
||||
// 获取隐患排查治理处理进度数据
|
||||
getTableList('hidden_danger_process_progress', query).then(res => {
|
||||
if (res.records && res.records.length > 0) {
|
||||
_data2.flag = true
|
||||
_data2.overdue = Number(res.records[0].overdue) / 100 * (_data2.general + _data2.major)
|
||||
_data2.processed = Number(res.records[0].processed) / 100 * (_data2.general + _data2.major)
|
||||
_data2.processing = Number(res.records[0].processing) / 100 * (_data2.general + _data2.major)
|
||||
_data2.pending = Number(res.records[0].pending) / 100 * (_data2.general + _data2.major)
|
||||
// if (res.records && res.records.length > 0) {
|
||||
// _data2.flag = true
|
||||
// _data2.overdue = Number(res.records[0].overdue) / 100 * (_data2.general + _data2.major)
|
||||
// _data2.processed = Number(res.records[0].processed) / 100 * (_data2.general + _data2.major)
|
||||
// _data2.processing = Number(res.records[0].processing) / 100 * (_data2.general + _data2.major)
|
||||
// _data2.pending = Number(res.records[0].pending) / 100 * (_data2.general + _data2.major)
|
||||
|
||||
if (_data.flag) {
|
||||
console.log("请求第三方和系统成功,合并数据", _data, _data2);
|
||||
// 合并数据
|
||||
let generalCnt = _data.general + _data2.general
|
||||
let majorCnt = _data.major + _data2.major
|
||||
mockData.hiddenDangerData.generalCount = generalCnt
|
||||
mockData.hiddenDangerData.severityCount = majorCnt
|
||||
// if (_data.flag) {
|
||||
// console.log("请求第三方和系统成功,合并数据", _data, _data2);
|
||||
// // 合并数据
|
||||
// let generalCnt = _data.general + _data2.general
|
||||
// let majorCnt = _data.major + _data2.major
|
||||
// mockData.hiddenDangerData.generalCount = generalCnt
|
||||
// mockData.hiddenDangerData.severityCount = 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)
|
||||
progressOption.series[0].data = [
|
||||
{ value: overdueCnt || 0, name: '已逾期', itemStyle: { color: '#ef4444' } },
|
||||
{ value: processedCnt || 0, name: '已处理', itemStyle: { color: '#10b981' } },
|
||||
{ value: pendingCnt || 0, name: '待排查', itemStyle: { color: '#eab308' } },
|
||||
{ value: processingCnt || 0, name: '处理中', itemStyle: { color: '#3b82f6' } }
|
||||
]
|
||||
if (progressChart.value != null) {
|
||||
progressChart.value.setOption(progressOption)
|
||||
}
|
||||
} else {
|
||||
//显示三方数据
|
||||
console.log("请求第三方成功,展示数据", _data, _data2);
|
||||
mockData.hiddenDangerData.generalCount = _data2.general
|
||||
mockData.hiddenDangerData.severityCount = _data2.major
|
||||
// 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)
|
||||
// progressOption.series[0].data = [
|
||||
// { value: overdueCnt || 0, name: '已逾期', itemStyle: { color: '#ef4444' } },
|
||||
// { value: processedCnt || 0, name: '已处理', itemStyle: { color: '#10b981' } },
|
||||
// { value: pendingCnt || 0, name: '待排查', itemStyle: { color: '#eab308' } },
|
||||
// { value: processingCnt || 0, name: '处理中', itemStyle: { color: '#3b82f6' } }
|
||||
// ]
|
||||
// if (progressChart.value != null) {
|
||||
// progressChart.value.setOption(progressOption)
|
||||
// }
|
||||
// } else {
|
||||
// //显示三方数据
|
||||
// console.log("请求第三方成功,展示数据", _data, _data2);
|
||||
// mockData.hiddenDangerData.generalCount = _data2.general
|
||||
// mockData.hiddenDangerData.severityCount = _data2.major
|
||||
|
||||
let overdueCnt = res.records[0].overdue
|
||||
let processedCnt = res.records[0].processed
|
||||
let processingCnt = res.records[0].processing
|
||||
let pendingCnt = res.records[0].pending
|
||||
progressOption.series[0].data = [
|
||||
{ value: overdueCnt || 0, name: '已逾期', itemStyle: { color: '#ef4444' } },
|
||||
{ value: processedCnt || 0, name: '已处理', itemStyle: { color: '#10b981' } },
|
||||
{ value: pendingCnt || 0, name: '待排查', itemStyle: { color: '#eab308' } },
|
||||
{ value: processingCnt || 0, name: '处理中', itemStyle: { color: '#3b82f6' } }
|
||||
]
|
||||
if (progressChart.value != null) {
|
||||
progressChart.value.setOption(progressOption)
|
||||
}
|
||||
}
|
||||
}
|
||||
// let overdueCnt = res.records[0].overdue
|
||||
// let processedCnt = res.records[0].processed
|
||||
// let processingCnt = res.records[0].processing
|
||||
// let pendingCnt = res.records[0].pending
|
||||
// progressOption.series[0].data = [
|
||||
// { value: overdueCnt || 0, name: '已逾期', itemStyle: { color: '#ef4444' } },
|
||||
// { value: processedCnt || 0, name: '已处理', itemStyle: { color: '#10b981' } },
|
||||
// { value: pendingCnt || 0, name: '待排查', itemStyle: { color: '#eab308' } },
|
||||
// { value: processingCnt || 0, name: '处理中', itemStyle: { color: '#3b82f6' } }
|
||||
// ]
|
||||
// if (progressChart.value != null) {
|
||||
// progressChart.value.setOption(progressOption)
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
}).catch(error => {
|
||||
console.error('获取隐患排查治理处理进度数据失败:', error)
|
||||
})
|
||||
|
||||
@@ -514,46 +514,46 @@ const handleHiddenDangerPannelData = (query) => {
|
||||
|
||||
// 获取隐患排查治理处理进度数据
|
||||
getTableList('hidden_danger_process_progress', query).then(res => {
|
||||
if (res.records && res.records.length > 0) {
|
||||
_data2.flag = true
|
||||
_data2.overdue = Number(res.records[0].overdue) / 100 * (_data2.general + _data2.major)
|
||||
_data2.processed = Number(res.records[0].processed) / 100 * (_data2.general + _data2.major)
|
||||
_data2.processing = Number(res.records[0].processing) / 100 * (_data2.general + _data2.major)
|
||||
_data2.pending = Number(res.records[0].pending) / 100 * (_data2.general + _data2.major)
|
||||
// if (res.records && res.records.length > 0) {
|
||||
// _data2.flag = true
|
||||
// _data2.overdue = Number(res.records[0].overdue) / 100 * (_data2.general + _data2.major)
|
||||
// _data2.processed = Number(res.records[0].processed) / 100 * (_data2.general + _data2.major)
|
||||
// _data2.processing = Number(res.records[0].processing) / 100 * (_data2.general + _data2.major)
|
||||
// _data2.pending = Number(res.records[0].pending) / 100 * (_data2.general + _data2.major)
|
||||
|
||||
if (_data.flag) {
|
||||
console.log("请求第三方和系统成功,合并数据", _data, _data2);
|
||||
// 合并数据
|
||||
let generalCnt = _data.general + _data2.general
|
||||
let majorCnt = _data.major + _data2.major
|
||||
dashboardData.value.hiddenDangerData.general = generalCnt
|
||||
dashboardData.value.hiddenDangerData.major = majorCnt
|
||||
// if (_data.flag) {
|
||||
// console.log("请求第三方和系统成功,合并数据", _data, _data2);
|
||||
// // 合并数据
|
||||
// let generalCnt = _data.general + _data2.general
|
||||
// let majorCnt = _data.major + _data2.major
|
||||
// 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)
|
||||
dashboardData.value.hiddenDangerData.progress = {
|
||||
overdue: overdueCnt,
|
||||
processed: processedCnt,
|
||||
processing: processingCnt,
|
||||
pending: pendingCnt,
|
||||
}
|
||||
} else {
|
||||
//显示三方数据
|
||||
console.log("请求第三方成功,展示数据", _data, _data2);
|
||||
dashboardData.value.hiddenDangerData.general = _data2.general
|
||||
dashboardData.value.hiddenDangerData.major = _data2.major
|
||||
// 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)
|
||||
// dashboardData.value.hiddenDangerData.progress = {
|
||||
// overdue: overdueCnt,
|
||||
// processed: processedCnt,
|
||||
// processing: processingCnt,
|
||||
// pending: pendingCnt,
|
||||
// }
|
||||
// } else {
|
||||
// //显示三方数据
|
||||
// console.log("请求第三方成功,展示数据", _data, _data2);
|
||||
// dashboardData.value.hiddenDangerData.general = _data2.general
|
||||
// dashboardData.value.hiddenDangerData.major = _data2.major
|
||||
|
||||
dashboardData.value.hiddenDangerData.progress = {
|
||||
overdue: res.records[0].overdue,
|
||||
processed: res.records[0].processed,
|
||||
processing: res.records[0].processing,
|
||||
pending: res.records[0].pending,
|
||||
}
|
||||
}
|
||||
}
|
||||
// dashboardData.value.hiddenDangerData.progress = {
|
||||
// overdue: res.records[0].overdue,
|
||||
// processed: res.records[0].processed,
|
||||
// processing: res.records[0].processing,
|
||||
// pending: res.records[0].pending,
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
}).catch(error => {
|
||||
console.error('获取隐患排查治理处理进度数据失败:', error)
|
||||
})
|
||||
|
||||
@@ -523,46 +523,46 @@ const handleHiddenDangerPannelData = (query) => {
|
||||
|
||||
// 获取隐患排查治理处理进度数据
|
||||
getTableList('hidden_danger_process_progress', query).then(res => {
|
||||
if (res.records && res.records.length > 0) {
|
||||
_data2.flag = true
|
||||
_data2.overdue = Number(res.records[0].overdue) / 100 * (_data2.general + _data2.major)
|
||||
_data2.processed = Number(res.records[0].processed) / 100 * (_data2.general + _data2.major)
|
||||
_data2.processing = Number(res.records[0].processing) / 100 * (_data2.general + _data2.major)
|
||||
_data2.pending = Number(res.records[0].pending) / 100 * (_data2.general + _data2.major)
|
||||
// if (res.records && res.records.length > 0) {
|
||||
// _data2.flag = true
|
||||
// _data2.overdue = Number(res.records[0].overdue) / 100 * (_data2.general + _data2.major)
|
||||
// _data2.processed = Number(res.records[0].processed) / 100 * (_data2.general + _data2.major)
|
||||
// _data2.processing = Number(res.records[0].processing) / 100 * (_data2.general + _data2.major)
|
||||
// _data2.pending = Number(res.records[0].pending) / 100 * (_data2.general + _data2.major)
|
||||
|
||||
if (_data.flag) {
|
||||
console.log("请求第三方和系统成功,合并数据", _data, _data2);
|
||||
// 合并数据
|
||||
let generalCnt = _data.general + _data2.general
|
||||
let majorCnt = _data.major + _data2.major
|
||||
dashboardData.value.hiddenDangerData.general = generalCnt
|
||||
dashboardData.value.hiddenDangerData.major = majorCnt
|
||||
// if (_data.flag) {
|
||||
// console.log("请求第三方和系统成功,合并数据", _data, _data2);
|
||||
// // 合并数据
|
||||
// let generalCnt = _data.general + _data2.general
|
||||
// let majorCnt = _data.major + _data2.major
|
||||
// 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)
|
||||
dashboardData.value.hiddenDangerData.progress = {
|
||||
overdue: overdueCnt,
|
||||
processed: processedCnt,
|
||||
processing: processingCnt,
|
||||
pending: pendingCnt,
|
||||
}
|
||||
} else {
|
||||
//显示三方数据
|
||||
console.log("请求第三方成功,展示数据", _data, _data2);
|
||||
dashboardData.value.hiddenDangerData.general = _data2.general
|
||||
dashboardData.value.hiddenDangerData.major = _data2.major
|
||||
// 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)
|
||||
// dashboardData.value.hiddenDangerData.progress = {
|
||||
// overdue: overdueCnt,
|
||||
// processed: processedCnt,
|
||||
// processing: processingCnt,
|
||||
// pending: pendingCnt,
|
||||
// }
|
||||
// } else {
|
||||
// //显示三方数据
|
||||
// console.log("请求第三方成功,展示数据", _data, _data2);
|
||||
// dashboardData.value.hiddenDangerData.general = _data2.general
|
||||
// dashboardData.value.hiddenDangerData.major = _data2.major
|
||||
|
||||
dashboardData.value.hiddenDangerData.progress = {
|
||||
overdue: res.records[0].overdue,
|
||||
processed: res.records[0].processed,
|
||||
processing: res.records[0].processing,
|
||||
pending: res.records[0].pending,
|
||||
}
|
||||
}
|
||||
}
|
||||
// dashboardData.value.hiddenDangerData.progress = {
|
||||
// overdue: res.records[0].overdue,
|
||||
// processed: res.records[0].processed,
|
||||
// processing: res.records[0].processing,
|
||||
// pending: res.records[0].pending,
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
}).catch(error => {
|
||||
console.error('获取隐患排查治理处理进度数据失败:', error)
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user