Compare commits

..

No commits in common. "295f9cb304932ab19eaac8fe310de1b9c5a90b92" and "535042b67be77134737743f6936b8c7640ff4aba" have entirely different histories.

View File

@ -225,6 +225,7 @@ const redirectToResearchEvaluation2 = async () => {
username: result.data.username, username: result.data.username,
permission: '1' permission: '1'
})) }))
return
window.location.href = 'http://82.156.236.221:10004/admin/manage' window.location.href = 'http://82.156.236.221:10004/admin/manage'
} else { } else {
console.error('代理登录失败:', result.error); console.error('代理登录失败:', result.error);
@ -480,7 +481,11 @@ const updateFundingChart = () => {
fundingChart.setOption({ fundingChart.setOption({
legend: { legend: {
selected: {} selected: {
'博士': fundingLegendStatus.value[0],
'硕士': fundingLegendStatus.value[1],
'学士': fundingLegendStatus.value[2]
}
} }
}) })
} }
@ -492,7 +497,11 @@ const updateOutputChart = () => {
outputChart.setOption({ outputChart.setOption({
legend: { legend: {
selected: {} selected: {
'博士': outputLegendStatus.value[0],
'硕士': outputLegendStatus.value[1],
'学士': outputLegendStatus.value[1]
}
} }
}) })
} }
@ -746,9 +755,9 @@ const fetchPaperData = async () => {
// //
outputData.value = { outputData.value = {
months: monthNames, months: monthNames,
doctor: data.data.time.map(item => item[2]).reverse(), // reverse() doctor: data.data.time.map(item => item[0]).reverse(), // reverse()
master: data.data.time.map(item => item[1]).reverse(), // reverse() master: data.data.time.map(item => item[1]).reverse(), // reverse()
bachelor: data.data.time.map(item => item[0]).reverse() // reverse() bachelor: data.data.time.map(item => item[2]).reverse() // reverse()
}; };
updateOutputChart(); updateOutputChart();
@ -1083,9 +1092,9 @@ const initCharts = () => {
data: ['博士', '硕士', '学士'], data: ['博士', '硕士', '学士'],
textStyle: { color: '#fff' }, textStyle: { color: '#fff' },
selected: { selected: {
'博士': outputLegendStatus.value[2], '博士': outputLegendStatus.value[0],
'硕士': outputLegendStatus.value[1], '硕士': outputLegendStatus.value[1],
'学士': outputLegendStatus.value[0], '学士': outputLegendStatus.value[1],
} }
}, },
grid: { left: '3%', right: '12%', bottom: '3%', containLabel: true }, grid: { left: '3%', right: '12%', bottom: '3%', containLabel: true },
@ -1204,9 +1213,9 @@ const initCharts = () => {
textStyle: { color: '#fff' }, textStyle: { color: '#fff' },
data: ['博士', '硕士', '学士'], data: ['博士', '硕士', '学士'],
selected: { selected: {
'博士': fundingLegendStatus.value[2], '博士': fundingLegendStatus.value[0],
'硕士': fundingLegendStatus.value[1], '硕士': fundingLegendStatus.value[1],
'学士': fundingLegendStatus.value[0] '学士': fundingLegendStatus.value[2]
} }
}, },
series: [ series: [