projects/mescc/zhp #57

Merged
juzi merged 3 commits from projects/mescc/zhp into projects/mescc/develop 2024-06-21 16:19:02 +08:00
Showing only changes of commit c7205e32a3 - Show all commits

View File

@ -107,6 +107,7 @@ export default {
return { return {
otherProps: [], otherProps: [],
title: '', title: '',
currentMenu:'邯郸',
listQuery: { listQuery: {
start: undefined, start: undefined,
end: undefined, end: undefined,
@ -547,15 +548,16 @@ export default {
}) })
}) })
}) })
if (res.data[0].list.length != 0) {
this.chartMsg.xData.push(res.data[0].list[0].reportTimep + '目标') this.chartMsg.xData.push(res.data[0].list[0].reportTimep + '目标')
if (this.listQuery.date === 0 || this.listQuery.date === 1 || this.listQuery.date === 2) { if (this.listQuery.date === 0 || this.listQuery.date === 1 || this.listQuery.date === 2) {
this.otherProps.push({ this.otherProps.push({
label: res.data[0].list[0].reportTimep + '目标', label: res.data[0].list[0].reportTimep + '目标',
prop: 'dayData' prop: 'dayData'
}) })
dataArr[0]['dayData'] = res.data[0].chipTarget dataArr[0]['dayData'] = res.data[0].list[0].chipTarget
dataArr[1]['dayData'] = res.data[0].standTarget dataArr[1]['dayData'] = res.data[0].list[0].standTarget
dataArr[2]['dayData'] = res.data[0].conversionEfficiencyTarget dataArr[2]['dayData'] = res.data[0].list[0].conversionEfficiencyTarget
} }
if (this.listQuery.date === 2 || this.listQuery.date === 3) { if (this.listQuery.date === 2 || this.listQuery.date === 3) {
this.otherProps.push({ this.otherProps.push({
@ -656,6 +658,10 @@ export default {
}) })
} }
} }
} else {
this.chartMsgYearTarget.series[0].data = []
this.chartMsgYearTarget.series[1].data = []
}
// for (let i in dataArr[3]) { // for (let i in dataArr[3]) {
// this.chartMsg.series[3].name = dataArr[3]['item'] // this.chartMsg.series[3].name = dataArr[3]['item']
// if (i.search('value') === 0) { // if (i.search('value') === 0) {
@ -665,7 +671,7 @@ export default {
// }) // })
// } // }
// } // }
this.tableData = dataArr this.tableData =res.data[0].list.length !== 0? dataArr : []
}, },
_setTableHeight() { _setTableHeight() {
this.tableH = this.tableHeight(137) / 2 - 70; this.tableH = this.tableHeight(137) / 2 - 70;