From aedcf388e85ac7a01c9cc9d17de425c9f27c957f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=AE=81?= <18339727226@163.com>
Date: Mon, 1 Jul 2024 14:34:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AD=A6=E5=8E=86=E5=B1=82?=
=?UTF-8?q?=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/index.ts | 6 -----
src/api/modules/test.ts | 5 ++++
src/stores/data/data.ts | 21 +++++++++--------
src/views/index/index.vue | 34 ++++++++++++++++++++++------
src/views/index/right-bottom-two.vue | 12 ++++------
5 files changed, 48 insertions(+), 30 deletions(-)
diff --git a/src/api/index.ts b/src/api/index.ts
index 5653dff..98a5be4 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1,10 +1,4 @@
-/*
- * @Author: daidai
- * @Date: 2021-12-23 11:18:37
- * @LastEditTime: 2024-03-28 16:07:20
- * @FilePath: \web-pc-svn\src\api\modules\index.js
- */
import {GETNOBASE} from "./api";
export * from "./modules/index"
diff --git a/src/api/modules/test.ts b/src/api/modules/test.ts
index cc3405a..b5067c7 100644
--- a/src/api/modules/test.ts
+++ b/src/api/modules/test.ts
@@ -12,3 +12,8 @@ export const WeekPay = (param: any = {}) => {
export const StatisticsReportedRanking = (param: any = {}) => {
return GET("api/TeacherManagement/StatisticsReportedRanking", param);
};
+
+// 学历层次查询
+export const GetBatch = (param: any = {}) => {
+ return GET("api/BasicDataMaintenance/GetBatch", param);
+};
diff --git a/src/stores/data/data.ts b/src/stores/data/data.ts
index 229b6fa..b59c7c4 100644
--- a/src/stores/data/data.ts
+++ b/src/stores/data/data.ts
@@ -1,11 +1,4 @@
-/*
- * @Author: 张宁 18339727226@163.com
- * @Date: 2024-05-27 08:45:53
- * @LastEditors: 张宁 18339727226@163.com
- * @LastEditTime: 2024-06-04 09:34:13
- * @FilePath: \welcome-system-screen\src\stores\time\time.ts
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
+
import { ref } from "vue";
import { defineStore } from "pinia";
// import { storeToRefs } from 'pinia';
@@ -85,6 +78,14 @@ export const useDataStore = defineStore("data", () => {
totalPay.value = data;
};
+
+
+ // 学历层次
+ const batchData = ref();
+ const setBatchData = (data: any) => {
+ batchData.value = data;
+ };
+
return {
allData,
degreeDto,
@@ -111,6 +112,8 @@ export const useDataStore = defineStore("data", () => {
forecastRate,
totalRate,
totalPay,
- setTotalPay
+ setTotalPay,
+ batchData,
+ setBatchData
};
});
diff --git a/src/views/index/index.vue b/src/views/index/index.vue
index 24772aa..9ada905 100644
--- a/src/views/index/index.vue
+++ b/src/views/index/index.vue
@@ -16,10 +16,10 @@ const timeStore = useTimeStore();
const { nowTitle, years, months, days } = storeToRefs(timeStore);
-import { AdminPCIndex, WeekPay, StatisticsReportedRanking } from "@/api";
+import { AdminPCIndex, WeekPay, StatisticsReportedRanking, GetBatch } from "@/api";
import { useDataStore } from "@/stores/index";
const dataStore = useDataStore();
-const { allData, rankingDto, collageId, professionRank } = storeToRefs(dataStore)
+const { allData, rankingDto, collageId, professionRank, batchData } = storeToRefs(dataStore)
const rightCenterRef: any = ref(null)
@@ -63,7 +63,7 @@ const dealMapData = (data: any) => {
}
})
tableData.value?.sort((a: any, b: any) => {
- return b.reported - a.reported
+ return b.reported - a.reported
})
tableData.value?.forEach((item: any, index: any) => {
item.sort = index + 1
@@ -134,6 +134,17 @@ const getAdminPCIndex = () => {
});
})
};
+const batchs = ref()
+// 获取学历层次
+const getBatch = () => {
+ GetBatch().then((res: any) => {
+ if (res.succeed) {
+ batchs.value = res.data.item1
+ dataStore.setBatchData(res.data.item1)
+ }
+
+ })
+}
// 缴费人数-- 本科 专科 专升本
/* const payData = () => {
@@ -178,11 +189,16 @@ const getAdminPCIndex = () => {
const payData = () => {
let params: any = {
"CandidateCategory": 0,
- "EducationalLevel": 3,
+ // "EducationalLevel": 3,
+ "Id": batchs.value[0].id,
"Year": years.value,
"Month": months.value || void 0,
"Day": days.value || void 0,
}
+ // for (let i = 0; i < batchs.value.length; i++) {
+ // let id = batchs.value[i].id;
+
+ // }
WeekPay(params).then((res: any) => {
const bk = res.data.todayPayDto.batchTodayPays?.find((item: any) => item.name === "统招本科");
const zk = res.data.todayPayDto.batchTodayPays?.find((item: any) => item.name === "统招专科");
@@ -210,9 +226,13 @@ const clearTimer = () => {
}
onMounted(() => {
+ getBatch();
getAdminPCIndex();
- payData();
- startTimer()
+ setTimeout(() => {
+ payData();
+ startTimer()
+ },100)
+
});
@@ -243,7 +263,7 @@ onMounted(() => {
-
+
diff --git a/src/views/index/right-bottom-two.vue b/src/views/index/right-bottom-two.vue
index 45bdd04..9ee7e9d 100644
--- a/src/views/index/right-bottom-two.vue
+++ b/src/views/index/right-bottom-two.vue
@@ -1,11 +1,4 @@
-
+