From d44fe14926b4d7b23e480ad11322280a75a44d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=AE=81?= <18339727226@163.com> Date: Tue, 2 Jul 2024 15:19:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E4=BA=BA=E6=95=B0=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/header.vue | 10 +++--- src/views/index/index.vue | 56 +++++++++++++++++++------------- src/views/index/right-center.vue | 38 ++++++++++++---------- 3 files changed, 60 insertions(+), 44 deletions(-) diff --git a/src/views/header.vue b/src/views/header.vue index 80e610c..1c13438 100644 --- a/src/views/header.vue +++ b/src/views/header.vue @@ -52,19 +52,19 @@ const getAdminPCIndex = (params: any) => { const payData = () => { let params: any = { "CandidateCategory":0, - "EducationalLevel": 3, + // "EducationalLevel": 3, "Year": myDate.value.year || void 0, "Month": myDate.value.month || void 0, "Day": myDate.value.day || void 0, } 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 === "统招专科"); - const zsb = res.data.todayPayDto.batchTodayPays?.find((item:any) => item.name === "统招专升本"); + const bk = res.data.batchTodayPays?.find((item:any) => item.name === "统招本科"); + const zk = res.data.batchTodayPays?.find((item:any) => item.name === "统招专科"); + const zsb = res.data.batchTodayPays?.find((item:any) => item.name === "统招专升本"); dataStore.setBkPay(bk) dataStore.setZkPay(zk) dataStore.setZsbPay(zsb) - dataStore.setTotalPay(res.data.todayPayDto?.payNum) + dataStore.setTotalPay(res.data?.payNum) }) } diff --git a/src/views/index/index.vue b/src/views/index/index.vue index 9ada905..00b66c4 100644 --- a/src/views/index/index.vue +++ b/src/views/index/index.vue @@ -92,7 +92,10 @@ const findDegree = (degreesDto: any, degree: string) => { const rbtwoRef: any = ref(null) const getProfession = () => { let params = { - "id": collageId.value + "Id": collageId.value, + "Year": years.value, + "Month": months.value || null, + "Day": days.value || null } StatisticsReportedRanking(params).then(res => { dataStore.setProfessionRank(res.data) @@ -134,9 +137,23 @@ const getAdminPCIndex = () => { }); }) }; + +watch(years,()=>{ + console.log('years.value',years.value); + payData() +}) +watch(months,()=>{ + console.log('months.value',months.value); + payData() +}) +watch(days,()=>{ + console.log('days.value',days.value); + payData() +}) + const batchs = ref() // 获取学历层次 -const getBatch = () => { +/* const getBatch = () => { GetBatch().then((res: any) => { if (res.succeed) { batchs.value = res.data.item1 @@ -144,7 +161,7 @@ const getBatch = () => { } }) -} +} */ // 缴费人数-- 本科 专科 专升本 /* const payData = () => { @@ -187,26 +204,21 @@ const getBatch = () => { 缴费人数---根据批次去区分 */ const payData = () => { - let params: any = { - "CandidateCategory": 0, - // "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 === "统招专科"); - const zsb = res.data.todayPayDto.batchTodayPays?.find((item: any) => item.name === "统招专升本"); + let payParams: any = { + "CandidateCategory": 0, + "Id": null, + "Year": years.value, + "Month": months.value || null, + "Day": days.value || null, +} + WeekPay(payParams).then((res: any) => { + const bk = res.data.batchTodayPays?.find((item: any) => item.name === "统招本科"); + const zk = res.data.batchTodayPays?.find((item: any) => item.name === "统招专科"); + const zsb = res.data.batchTodayPays?.find((item: any) => item.name === "统招专升本"); dataStore.setBkPay(bk) dataStore.setZkPay(zk) dataStore.setZsbPay(zsb) - dataStore.setTotalPay(res.data.todayPayDto?.payNum) + dataStore.setTotalPay(res.data?.payNum) setTimeout(() => { if (rightCenterRef) { rightCenterRef.value.getData() @@ -226,12 +238,12 @@ const clearTimer = () => { } onMounted(() => { - getBatch(); + // getBatch(); getAdminPCIndex(); setTimeout(() => { payData(); startTimer() - },100) + }, 100) }); diff --git a/src/views/index/right-center.vue b/src/views/index/right-center.vue index 3fcf995..f466233 100644 --- a/src/views/index/right-center.vue +++ b/src/views/index/right-center.vue @@ -6,12 +6,12 @@ const timeStore = useTimeStore() const { nowTitle } = storeToRefs(timeStore) const dataStore = useDataStore() -const { bkPay, zkPay, zsbPay,totalPay } = storeToRefs(dataStore) +const { bkPay, zkPay, zsbPay, totalPay } = storeToRefs(dataStore) const activeTab = ref(0); const tabs = ref([ { title: '本科', value: 0, dateList: ['05-30', '05-31', '06-01', '06-02', '06-03', "06-04"], numList: [0, 0, 0, 0, 0, 0] }, - { title: '专科', value: 0, dateList: ['05-30', '05-31', '06-01', '06-02', '06-03', "06-04"], numList: [0, 0, 0,0, 0, 0] }, - { title: '专升本', value: 0, dateList: ['05-30', '05-31', '06-01', '06-02', '06-03', "06-04"], numList: [0, 0, 0,0, 0, 0] }, + { title: '专科', value: 0, dateList: ['05-30', '05-31', '06-01', '06-02', '06-03', "06-04"], numList: [0, 0, 0, 0, 0, 0] }, + { title: '专升本', value: 0, dateList: ['05-30', '05-31', '06-01', '06-02', '06-03', "06-04"], numList: [0, 0, 0, 0, 0, 0] }, ]); const changeTab = (index: number) => { @@ -24,18 +24,18 @@ const option = ref({}); // 这里拿不到pinia的值 因为子组件比父组件先渲染 // 暴露出去 让父组件调用 来赋值------待修改 const getData = () => { - // console.log('bkPay.value',bkPay.value); - let dateList = ['05-30', '05-31', '06-01', '06-02', '06-03', "06-04"] - let numList = [0, 0, 0, 0, 0, 0] - // tabs.value[0].dateList = bkPay.value?.statistics - // tabs.value[1].dateList = zkPay.value?.statistics - // tabs.value[2].dateList = zsbPay.value?.statistics + console.log('bkPay.value===>',bkPay.value); + // let dateList = ['05-30', '05-31', '06-01', '06-02', '06-03', "06-04"] + // let numList = [0, 0, 0, 0, 0, 0] + tabs.value[0].dateList = Object.keys(bkPay.value?.statistics) + tabs.value[1].dateList = Object.keys(zkPay.value?.statistics) + tabs.value[2].dateList = Object.keys(zsbPay.value?.statistics) - // tabs.value[0].numList = bkPay.value?.statistics - // tabs.value[1].numList = zkPay.value?.statistics - // tabs.value[2].numList = zsbPay.value?.statistics - - setOption(dateList, numList) + tabs.value[0].numList = Object.values(bkPay.value?.statistics) + tabs.value[1].numList = Object.values(zkPay.value?.statistics) + tabs.value[2].numList = Object.values(zsbPay.value?.statistics) + + setOption(tabs.value[0].dateList, tabs.value[0].numList) }; const setOption = async (xData: any[], yData: any[]) => { option.value = { @@ -85,6 +85,10 @@ const setOption = async (xData: any[], yData: any[]) => { axisLabel: { color: "#fff", // 轴标文字颜色 fontWeight: "500", + formatter: function (value: any) { + // 如果value是整数，则直接返回，否则返回四舍五入后的整数 + return value % 1 === 0 ? value : ''; + } }, }, tooltip: { @@ -98,7 +102,7 @@ const setOption = async (xData: any[], yData: any[]) => { grid: { //布局 show: false, - left: "10px", + left: "15px", right: "30px", bottom: "10px", top: "30px", @@ -176,7 +180,7 @@ const setOption = async (xData: any[], yData: any[]) => { }; }; -defineExpose({getData}) +defineExpose({ getData })