修改部分bug

This commit is contained in:
Cool 2024-05-06 14:28:58 +08:00
parent f96f5bf6ab
commit b9d306edc5
1 changed files with 57 additions and 43 deletions

View File

@ -4,13 +4,13 @@
<template #extra> <template #extra>
<!-- <a-select v-model:value="college" style="width: 300px" :options="collegeOptions"></a-select> --> <!-- <a-select v-model:value="college" style="width: 300px" :options="collegeOptions"></a-select> -->
<a-cascader v-model:value="collegeMajor" :options="collegeMajorOptions" change-on-select /> <a-cascader v-model:value="collegeMajor" :options="collegeMajorOptions" change-on-select />
<a-button style="margin-left: 10px;" type="primary" @click="query">查询</a-button> <a-button style="margin-left: 10px" type="primary" @click="query">查询</a-button>
</template> </template>
<div> <div>
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :xl="24" :style="{ marginBottom: '24px' }"> <a-col :xl="24" :style="{ marginBottom: '24px' }">
<div class="container"> <div class="container">
<div id="map1" style="width: 100%; height: 400px;"></div> <div id="map1" style="width: 100%; height: 400px"></div>
</div> </div>
</a-col> </a-col>
</a-row> </a-row>
@ -24,14 +24,14 @@ import { defHttp } from '/@/utils/http/axios';
import * as echarts from 'echarts'; import * as echarts from 'echarts';
export default { export default {
name: "Analysis", name: 'Analysis',
data() { data() {
return { return {
Url: { Url: {
getBatch: '/cet/getBatch', getBatch: '/cet/getBatch',
getCollege: '/cet/getCollege', getCollege: '/cet/getCollege',
getRate: '/cet/getRateByAllBatch', getRate: '/cet/getRateByAllBatch',
getCollegeMajor: '/cet/getCollegeMajor' getCollegeMajor: '/cet/getCollegeMajor',
}, },
loading: false, loading: false,
collegeOptions: [], collegeOptions: [],
@ -39,12 +39,12 @@ export default {
batchOptions: [], batchOptions: [],
levelOptions: [ levelOptions: [
{ value: 'cet4', label: '英语四级' }, { value: 'cet4', label: '英语四级' },
{ value: 'cet6', label: '英语六级' } { value: 'cet6', label: '英语六级' },
], ],
level: null, level: null,
college: null, college: null,
batch: null, batch: null,
collegeMajor: null collegeMajor: null,
}; };
}, },
methods: { methods: {
@ -54,41 +54,50 @@ export default {
for (let key in data) { for (let key in data) {
xData.push(key); xData.push(key);
// % // %
yData.push((data[key]).toFixed(1)); yData.push(data[key].toFixed(1));
} }
let myChart = echarts.init(document.getElementById("map1")); let myChart = echarts.init(document.getElementById('map1'));
// //
let option = { let option = {
title: { title: {
text: "学院 / 专业通过率变化", text: '学院 / 专业通过率变化',
}, },
xAxis: { xAxis: {
type: 'category', type: 'category',
data: xData, data: xData,
axisLabel: { axisLabel: {
interval: 0,//x interval: 0, //x
rotate: -10,//30 rotate: -10, //30
} },
}, },
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
axisPointer: { axisPointer: {
type: 'shadow' type: 'shadow',
}, },
formatter: function (params) { formatter: function (params) {
return params[0].name + '<br/>' + return (
params[0].name +
'<br/>' +
'<table>' + '<table>' +
'<tr><td>' + params[0].marker + '</td><td style="font-weight: bold;">' + '&nbsp;&nbsp;&nbsp;&nbsp;' + params[0].value + '%' + '</td></tr>' + '<tr><td>' +
'<tr>' params[0].marker +
+ '</table>'; '</td><td style="font-weight: bold;">' +
} '&nbsp;&nbsp;&nbsp;&nbsp;' +
params[0].value +
'%' +
'</td></tr>' +
'<tr>' +
'</table>'
);
},
}, },
yAxis: { yAxis: {
type: 'value', type: 'value',
name: '通过率', name: '通过率',
axisLabel: { axisLabel: {
formatter: '{value} %' formatter: '{value} %',
} },
}, },
series: [ series: [
{ {
@ -99,16 +108,17 @@ export default {
label: { label: {
show: true, // show: true, //
position: 'top', // position: 'top', //
textStyle: { // textStyle: {
//
color: 'black', color: 'black',
fontSize: 12 fontSize: 12,
}, },
formatter: '{c}%', formatter: '{c}%',
} },
} },
} },
} },
] ],
}; };
// 使 // 使
myChart.setOption(option); myChart.setOption(option);
@ -129,17 +139,17 @@ export default {
async getCollegeMajorData() { async getCollegeMajorData() {
const res = await defHttp.get({ url: this.Url.getCollegeMajor }); const res = await defHttp.get({ url: this.Url.getCollegeMajor });
//map //map
this.collegeMajorOptions = res.collegeMajor.map(item => { this.collegeMajorOptions = res.collegeMajor.map((item) => {
return { return {
value: item.college, value: item.college,
label: item.college, label: item.college,
children: item.major.map(major => { children: item.major.map((major) => {
return { return {
value: major, value: major,
label: major label: major,
} };
}) }),
} };
}); });
this.collegeMajor = this.collegeMajorOptions[0].value; this.collegeMajor = this.collegeMajorOptions[0].value;
console.log(this.collegeMajorOptions); console.log(this.collegeMajorOptions);
@ -147,36 +157,40 @@ export default {
// //
async query() { async query() {
let data = null; let data = null;
console.log(this.collegeMajor, 'collegeMajor');
try { try {
console.log("sb", this.collegeMajor);
//this.collegeMajornull //this.collegeMajornull
if (!this.collegeMajor) { if (!this.collegeMajor) {
this.collegeMajor = ['东语学院']; this.collegeMajor = ['东语学院'];
} }
let major = null;
let college = null;
//this.collegeMajor[1]null //this.collegeMajor[1]null
let major = this.collegeMajor.length > 1 ? this.collegeMajor[1] : ""; college = this.collegeMajor[0];
major=this.collegeMajor.length>1?this.collegeMajor[1]:'';
this.loading = true; this.loading = true;
console.log(college, major,"college,major");
let params = { let params = {
college: this.collegeMajor[0], college: college,
major: major, major: major,
level: 'cet4', level: 'cet4',
} };
data = await defHttp.get({ url: this.Url.getRate, params }); data = await defHttp.get({ url: this.Url.getRate, params });
} finally { } finally {
this.loading = false; this.loading = false;
this.$nextTick(() => { this.$nextTick(() => {
this.dataChart(data); this.dataChart(data);
}) });
}
} }
}, },
},
mounted() { mounted() {
this.getCollegeMajorData(); this.getCollegeMajorData();
this.getBatch(); this.getBatch();
this.query(); // this.query();
} },
};
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>