|
|
@ -288,14 +288,30 @@ export default { |
|
|
|
accelerationZ: "Z轴加速度", |
|
|
|
precipitation: "降雨量", |
|
|
|
} |
|
|
|
res.data.forEach(e => { |
|
|
|
cdata.push((moment(e.measureTime).format('YYYY-MM-DD'))) |
|
|
|
if (title === '') { |
|
|
|
title = enum_title[e.data[0].type] |
|
|
|
|
|
|
|
// 排序 |
|
|
|
res.data.sort((a, b) => new Date(a.measureTime) - new Date(b.measureTime)); |
|
|
|
// 处理返回的数据 |
|
|
|
if (res.data.length > 0) { |
|
|
|
res.data.forEach(e => { |
|
|
|
cdata.push(moment(e.measureTime).format('YYYY-MM-DD HH:mm')); |
|
|
|
if (title === '') { |
|
|
|
title = enum_title[e.data[0].type]; |
|
|
|
} |
|
|
|
cseries1.push(e.data[0].value); |
|
|
|
cseries2.push(e.data[0].cum); |
|
|
|
}); |
|
|
|
} else { |
|
|
|
// 如果数据为空,生成时间段内的日期 |
|
|
|
const startDate = moment(this.dateRange[0]); |
|
|
|
const endDate = moment(this.dateRange[1]); |
|
|
|
for (let m = moment(startDate); m.diff(endDate, 'days') <= 0; m.add(1, 'days')) { |
|
|
|
cdata.push(m.format('YYYY-MM-DD HH:mm')); |
|
|
|
cseries1.push(0); |
|
|
|
cseries2.push(0); |
|
|
|
} |
|
|
|
cseries1.push(e.data[0].value) |
|
|
|
cseries2.push(e.data[0].cum) |
|
|
|
}); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
chartOption.xAxis.data = cdata; |
|
|
|
chartOption.series[0].name = title + '日计'; |
|
|
@ -303,17 +319,15 @@ export default { |
|
|
|
|
|
|
|
chartOption.series[0].data = cseries1; |
|
|
|
chartOption.series[1].data = cseries2; |
|
|
|
// 假设 chartOption 已经初始化 |
|
|
|
|
|
|
|
chartOption.tooltip = { |
|
|
|
trigger: 'axis', |
|
|
|
axisPointer: { |
|
|
|
type: 'cross' |
|
|
|
}, |
|
|
|
formatter: function (params) { |
|
|
|
console.log('Params:', params); // 调试信息 |
|
|
|
let tooltipText = `<div><b>${params[0].name}</b></div>`; // 显示日期 |
|
|
|
params.forEach(function (item) { |
|
|
|
console.log('Item:', item); // 调试信息 |
|
|
|
if (item.seriesName === (title + '日计')) { |
|
|
|
tooltipText += `<div>${item.seriesName}: ${item.value}</div>`; |
|
|
|
} else if (item.seriesName === (title + '累计')) { |
|
|
|