From 0708525435b121da30ec61070db1af697644625d Mon Sep 17 00:00:00 2001
From: xbx <1827135378@qq.com>
Date: Fri, 31 May 2024 16:12:34 +0800
Subject: [PATCH] =?UTF-8?q?ui=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/cet/cet-ana-1.vue | 8 ++++----
src/views/cet/cet-ana-2.vue | 25 ++++++++++++++++++------
src/views/cet/cet-ana-3.vue | 4 ++--
src/views/cet/cet-ana-college.vue | 4 ++--
src/views/cet/cet-ana-major.vue | 4 ++--
src/views/sys/login/TokenLoginPage.vue | 3 ++-
src/views/system/loginmini/MiniLogin.vue | 8 +++++---
7 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/src/views/cet/cet-ana-1.vue b/src/views/cet/cet-ana-1.vue
index 52304f4..bdd274e 100644
--- a/src/views/cet/cet-ana-1.vue
+++ b/src/views/cet/cet-ana-1.vue
@@ -2,7 +2,7 @@
-
+
查询
-
+
@@ -477,7 +477,7 @@ export default {
// 指定图表的配置项和数据
let option = {
title: {
- text: '本批次学院通过率排名',
+ text: '本批次学院四级通过率排名',
},
legend: {},
tooltip: {
@@ -675,7 +675,7 @@ export default {
// const college1 = this.college;
let option = {
title: {
- text: '本年级学院通过率排名',
+ text: '本年级学院四级通过率排名',
},
tooltip: {
trigger: 'axis',
diff --git a/src/views/cet/cet-ana-2.vue b/src/views/cet/cet-ana-2.vue
index fd555e1..4b33473 100644
--- a/src/views/cet/cet-ana-2.vue
+++ b/src/views/cet/cet-ana-2.vue
@@ -10,6 +10,15 @@
+
+
学院 / 专业四级通过率变化
+
+ 该数据为
+ {{ topCollege}}
+ / {{ topMajor}}
+ 的四级通过率变化趋势
+
+
@@ -45,6 +54,8 @@ export default {
college: null,
batch: null,
collegeMajor: null,
+ topCollege: null,//顶部解释行
+ topMajor: null,//顶部解释行
};
},
methods: {
@@ -60,7 +71,7 @@ export default {
// 指定图表的配置项和数据
let option = {
title: {
- text: '学院 / 专业通过率变化',
+ // text: '学院 / 专业四级通过率变化',
},
xAxis: {
type: 'category',
@@ -158,7 +169,7 @@ export default {
let data = null;
console.log(this.collegeMajor, 'collegeMajor');
try {
-
+
//如果this.collegeMajor为null则先赋个值
if (!this.collegeMajor) {
this.collegeMajor = ['东语学院', '日语'];
@@ -167,9 +178,11 @@ export default {
let college = null;
//如果this.collegeMajor[1]不存在则设为null
college = this.collegeMajor[0];
- major=this.collegeMajor.length>1?this.collegeMajor[1]:'';
+ major = this.collegeMajor.length > 1 ? this.collegeMajor[1] : '';
+ this.topCollege = college;
+ this.topMajor = major;
this.loading = true;
- console.log(college, major,"college,major");
+ console.log(college, major, "college,major");
let params = {
college: college,
major: major,
@@ -194,7 +207,7 @@ export default {