Big-Data-Lab
/
CET-vue-3.0
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

布局调整，更改加载方式

This commit is contained in:
Su 2025-01-20 14:51:17 +08:00
parent f0db8e010d
commit 608a340a2a
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/views/cet/universityDashboard.vue
View File

@ -53,21 +53,21 @@
</div> </div>
<div class="bottom-box"> <div class="bottom-box">
<div class="left-side"> <div class="left-side">
<a-card :loading="loading"> <a-card :loading="loading" :bordered="false">
<div style="width: 100%; height: 350px" id="map2"> </div> <div style="width: 100%; height: 350px" id="map2"> </div>
</a-card> </a-card>
</div> </div>
<div class="right-side"> <div class="right-side">
<!-- <a-row :gutter="12"> --> <!-- <a-row :gutter="12"> -->
<!-- <a-col :xl="16"> --> <!-- <a-col :xl="16"> -->
<a-card> <a-card :loading="map1loading">
<div class="query"> <!-- <div class="query">
<span <span
style="font-size: 15px; margin-right: 10px; display: flex; justify-content: center; align-items: center; font-weight: bold">年级: style="font-size: 15px; margin-right: 10px; display: flex; justify-content: center; align-items: center; font-weight: bold">年级:
</span> </span>
<a-select v-model:value="oneentrydate" style="width: 200px" :options="entrydateOptions" /> <a-select v-model:value="oneentrydate" style="width: 200px" :options="entrydateOptions" />
<a-button style="margin-left: 10px" type="primary" @click="allQuery">查询</a-button> <a-button style="margin-left: 10px" type="primary" @click="allQuery">查询</a-button>
</div> </div> -->
<div id="map1" style="width: 100%; height: 350px"></div> <div id="map1" style="width: 100%; height: 350px"></div>
</a-card> </a-card>
<!-- </a-col> --> <!-- </a-col> -->
@ -207,22 +207,21 @@ export default {
this.getEntrydateAndCollegeData(); this.getEntrydateAndCollegeData();
this.getCollegeMajorData(); this.getCollegeMajorData();
this.query(); this.query();
this.allQuery(); // this.allQuery();
this.getCollegeOptions(); this.getCollegeOptions();
this.getEntrydate(); this.getEntrydate();
}, },
methods: { methods: {
allQuery() { allQuery() {
console.log('查询===========');
this.map1loading = true; this.map1loading = true;
console.log('查询===========ddddddddddd');
let college = ['全校']; let college = ['全校'];
let query = 'tab1'; let query = 'tab1';
if (this.oneentrydate == null) { if (this.oneentrydate == null) {
this.oneentrydate = '2017'; this.oneentrydate = '2017';
} }
this.queryChart(query, college, [this.oneentrydate]); this.queryChart(query, college, [this.entrydate]);
this.majorPassRate(); this.majorPassRate();
this.gradePassRate(); this.gradePassRate();
}, },
@ -589,7 +588,6 @@ export default {
// 查询数据 // 查询数据
async queryChart(query, college, entrydate) { async queryChart(query, college, entrydate) {
console.log('dddddddddddddddddddddddd'); console.log('dddddddddddddddddddddddd');
this.visible = false; this.visible = false;
let result = null; let result = null;
// console.log(this.college, this.entrydate); // console.log(this.college, this.entrydate);
@ -606,7 +604,7 @@ export default {
// console.log(this.college, this.entrydate) // console.log(this.college, this.entrydate)
let params = { let params = {
college: college, college: college,
entrydate: entrydate, entrydate: [String(entrydate[0])],
level: 'cet4', level: 'cet4',
}; };
let url = query == 'tab1' ? this.Url.getAllRate : this.Url.getCollegeRate; let url = query == 'tab1' ? this.Url.getAllRate : this.Url.getCollegeRate;
@ -618,10 +616,9 @@ export default {
// }); // });
console.log('data', result.data); console.log('data', result.data);
} finally { } finally {
this.map1loading = false; this.map1loading=false;
this.$nextTick(() => { this.$nextTick(() => {
console.log('调用=============='); console.log('调用==============');
this.dataChart(result.data, query); this.dataChart(result.data, query);
}); });
} }
@ -665,6 +662,7 @@ export default {
// 查询数据 // 查询数据
async query() { async query() {
try { try {
this.allQuery();
//如果this.collegeMajor[1]不存在则设为null //如果this.collegeMajor[1]不存在则设为null
let major = this.collegeMajor.length > 1 ? this.collegeMajor[1] : ''; let major = this.collegeMajor.length > 1 ? this.collegeMajor[1] : '';
this.topCollege = this.collegeMajor[0]; this.topCollege = this.collegeMajor[0];
@ -952,6 +950,7 @@ export default {
.bottom-box { .bottom-box {
display: flex; display: flex;
column-gap: 10px; column-gap: 10px;
padding: 0 5px;
.left-side { .left-side {
// margin-top: 41px; // margin-top: 41px;