From 4a1c11dd5e279502fafced57e21b7938147e100e Mon Sep 17 00:00:00 2001 From: xbx <1827135378@qq.com> Date: Wed, 17 Apr 2024 21:44:36 +0800 Subject: [PATCH] 11 --- src/views/cet/cet-ana-1.vue | 3 +++ src/views/dashboard/Analysis/index.vue | 16 +++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/views/cet/cet-ana-1.vue b/src/views/cet/cet-ana-1.vue index d546db6..83e4bce 100644 --- a/src/views/cet/cet-ana-1.vue +++ b/src/views/cet/cet-ana-1.vue @@ -101,6 +101,9 @@ export default { title: { text: "本批次学院通过率排名", }, + + + tooltip: { trigger: 'axis', axisPointer: { diff --git a/src/views/dashboard/Analysis/index.vue b/src/views/dashboard/Analysis/index.vue index 93dd2c2..f3d400e 100644 --- a/src/views/dashboard/Analysis/index.vue +++ b/src/views/dashboard/Analysis/index.vue @@ -57,7 +57,7 @@ export default { key: 'grade', align: 'center', customCell: (_, index) => ({ - rowSpan: index % 2 === 0 ? 2 : 0, + rowSpan: index % 2 === 0 ? 2 : 0,//每两行合并一次grade列的单元格,rowSpan为跨度 }), }, { @@ -170,7 +170,6 @@ export default { result.cet4[grade].forEach(item => { if (index % 2 == 0) { piedata.push({ value: parseFloat(item.gradepassrate - passrate).toFixed(3), name: grade + "时通过" }); - passrate = parseFloat(item.gradepassrate).toFixed(3); } index++ @@ -186,16 +185,15 @@ export default { } console.log("tableData", tableData); - this.dataSourceCet4 = tableData; - this.total = result.total; - this.passNumberBottom = result.passNumber; - this.passRateBottom = (result.passRate * 100).toFixed(1) + '%'; + this.dataSourceCet4 = tableData;//表格数据 + this.total = result.total;//总人数 + this.passNumberBottom = result.passNumber;//通过人数 + this.passRateBottom = (result.passRate * 100).toFixed(1) + '%';//通过率 //内置饼图 - //清空数据 - this.passRatePie =[] + this.passRatePie =[]//清空数据 this.passRatePie.push({ value: result.passRate, name: '已通过' }); this.passRatePie.push({ value: 1 - result.passRate, name: '未通过' }) - piedata.push({ value: (1 - passrate).toFixed(3), name: '未通过' }); + piedata.push({ value: (1 - passrate).toFixed(3), name: '未通过' });//外置饼图 setTimeout(() => { this.drawPieChart(piedata); }, 100);