From bd9b42d6c60988ea219425416ca08f36af43dffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=AE=81?= <18339727226@163.com> Date: Mon, 24 Jun 2024 11:21:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=AD=A6=E5=8E=86=E5=B1=82?= =?UTF-8?q?=E6=AC=A1=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/zheke/center_top0.png | Bin 0 -> 11104 bytes src/components/chart/chart.vue | 18 +++-- src/components/chart/pieChart.vue | 6 +- src/stores/data/data.ts | 110 +++++++++++++++++---------- src/views/header.vue | 45 ++++++++--- src/views/index/center-top.vue | 42 +++++----- src/views/index/index.vue | 27 ++++++- src/views/index/right-center.vue | 13 +++- 8 files changed, 180 insertions(+), 81 deletions(-) create mode 100644 src/assets/img/zheke/center_top0.png diff --git a/src/assets/img/zheke/center_top0.png b/src/assets/img/zheke/center_top0.png new file mode 100644 index 0000000000000000000000000000000000000000..9ba374470412f597127caacbeea1d39967f67be6 GIT binary patch literal 11104 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 literal 0 HcmV?d00001 diff --git a/src/components/chart/chart.vue b/src/components/chart/chart.vue index 528371f..d14da2a 100644 --- a/src/components/chart/chart.vue +++ b/src/components/chart/chart.vue @@ -29,13 +29,20 @@ const resize = () => { const init = (max: any, value: any) => { chartMax.value = max ? max : 0; chartValues.value = value ? value : 0; + // chartMax.value = 50 + // chartValues.value = 5 chartRate.value = 0 + if (chartMax && chartValues) { chartRate.value = (chartValues.value / chartMax.value * 100).toFixed(1) } if (chartRate.value === "100.0") { chartRate.value = "100"; // 如果百分比等于100，则更新为整数形式 } + if (isNaN(chartRate.value)) { + chartRate.value = "0"; + } + console.log('打印', chartValues.value, chartMax.value); let option = { title: { @@ -111,18 +118,19 @@ const init = (max: any, value: any) => { }, { type: 'bar', - data: [{ name: "预报到填写总数", value: chartMax.value }], - startAngle: 0, + // data: [{ name: "预报到填写总数", value: chartMax.value }], + data: { name: "预报到填写总数", value: chartMax.value }, z: 1, + // silent: true, coordinateSystem: 'polar', barMaxWidth: 35, roundCap: 1, color: '#00214d', barGap: '-100%', }, - { + /* { type: 'bar', - data: [{ name: "预报到填写总数", value: chartMax.value }], + data: [1], z: 0, silent: true, coordinateSystem: 'polar', @@ -130,7 +138,7 @@ const init = (max: any, value: any) => { roundCap: true, color: '#00214d', barGap: '-100%', - }, + }, */ ], } myChart.value.setOption(option); diff --git a/src/components/chart/pieChart.vue b/src/components/chart/pieChart.vue index f4decde..1ea164c 100644 --- a/src/components/chart/pieChart.vue +++ b/src/components/chart/pieChart.vue @@ -102,7 +102,7 @@ const init=(max, value) =>{ } ]) }, - { + /* { type: 'bar', data: [{ name: "新生总人数", value: chartMax.value }], startAngle: 0, @@ -112,12 +112,12 @@ const init=(max, value) =>{ roundCap: 1, color: '#00214d', barGap: '-100%', - }, + }, */ { type: 'bar', data: [{ name: "新生总人数", value: chartMax.value }], z: 0, - silent: true, + // silent: true, coordinateSystem: 'polar', barMaxWidth: 35, roundCap: true, diff --git a/src/stores/data/data.ts b/src/stores/data/data.ts index ca9adf5..3003643 100644 --- a/src/stores/data/data.ts +++ b/src/stores/data/data.ts @@ -11,72 +11,104 @@ import { defineStore } from "pinia"; // import { storeToRefs } from 'pinia'; export const useDataStore = defineStore("data", () => { - const allData:Ref = ref({ + const allData: Ref = ref({ degreeDto: [], - forecast:{}, - forecastFill:{}, - nationStudent:[], - payDto:{}, - provinceDto:[], - rankingDto:[], - sexDto:{}, - today:{}, - totalDto:{} + forecast: {}, + forecastFill: {}, + nationStudent: [], + payDto: {}, + provinceDto: [], + rankingDto: [], + sexDto: {}, + today: {}, + totalDto: {}, }); - const degreeDto=computed(() => allData.value.degreeDto); - const forecast=computed(() => allData.value.forecast); - const forecastFill=computed(() => allData.value.forecastFill); - const nationStudent=computed(() => allData.value.nationStudent); - const payDto=computed(() => allData.value.payDto); - const provinceDto=computed(() => allData.value.provinceDto); - const rankingDto=computed(() => allData.value.rankingDto); - const sexDto=computed(()=> allData.value.sexDto); - const today=computed(() => allData.value.today); - const totalDto=computed(() => allData.value.totalDto); + const degreeDto = computed(() => allData.value.degreeDto); + const forecast = computed(() => allData.value.forecast); + const forecastFill = computed(() => allData.value.forecastFill); + const nationStudent = computed(() => allData.value.nationStudent); + const payDto = computed(() => allData.value.payDto); + const provinceDto = computed(() => allData.value.provinceDto); + const rankingDto = computed(() => allData.value.rankingDto); + const sexDto = computed(() => allData.value.sexDto); + const today = computed(() => allData.value.today); + const totalDto = computed(() => allData.value.totalDto); // 当日预报到报到率 const forecastRate = computed(() => { - forecast.value.reported / forecast.value.total - }); + forecast.value.reported / forecast.value.total; + }); // 当日预报到总人数报到率 const totalRate = computed(() => { - totalDto.value.reportNumber / totalDto.value.totalNumber + totalDto.value.reportNumber / totalDto.value.totalNumber; }); // 选中的学院id - const collageId = ref() + const collageId = ref(); // 切换选中的学院 - const setCollageId = (data:any)=>{ - collageId.value = data - } + const setCollageId = (data: any) => { + collageId.value = data; + }; // 学院对应的专业报到人数 - const professionRank = ref() - const setProfessionRank = (data:any) => { + const professionRank = ref(); + const setProfessionRank = (data: any) => { professionRank.value = data; }; - const setData = (data:any) => { + const setData = (data: any) => { allData.value = data; }; // 本科缴费人数 - const bkPay= ref() - const setBkPay = (data:any) => { - console.log('data',data); - + const bkPay = ref(); + const setBkPay = (data: any) => { + console.log("data", data); + bkPay.value = data; }; // 专科缴费人数 - const zkPay= ref() - const setZkPay = (data:any) => { + const zkPay = ref(); + const setZkPay = (data: any) => { zkPay.value = data; }; // 专升本缴费人数 - const zsbPay= ref() - const setZsbPay = (data:any) => { + const zsbPay = ref(); + const setZsbPay = (data: any) => { zsbPay.value = data; }; + // 缴费总人数 + const totalPay = ref(); + const setTotalPay = (data: any) => { + totalPay.value = data; + }; - return { allData,degreeDto,forecast,forecastFill,nationStudent,payDto,provinceDto,rankingDto,sexDto,today,totalDto,setData,bkPay,zkPay,zsbPay,setBkPay,setZkPay,setZsbPay,setCollageId,collageId,professionRank,setProfessionRank,forecastRate,totalRate}; + return { + allData, + degreeDto, + forecast, + forecastFill, + nationStudent, + payDto, + provinceDto, + rankingDto, + sexDto, + today, + totalDto, + setData, + bkPay, + zkPay, + zsbPay, + setBkPay, + setZkPay, + setZsbPay, + setCollageId, + collageId, + professionRank, + setProfessionRank, + forecastRate, + totalRate, + totalPay, + setTotalPay + }; }); diff --git a/src/views/header.vue b/src/views/header.vue index 5bc22f7..0c0e063 100644 --- a/src/views/header.vue +++ b/src/views/header.vue @@ -1,19 +1,22 @@ @@ -21,7 +13,7 @@ const { today, forecastRate,totalRate } = storeToRefs(dataStore)
- +
{{ computDate }}迎新人数
@@ -29,23 +21,35 @@ const { today, forecastRate,totalRate } = storeToRefs(dataStore)
-
-
{{ computDate }}预报到人数
-
{{ today.forecastStuden ?? '0' }}
-
-
-
{{ computDate }}预报到报到率
-
{{ forecastRate ?? '0' }}%
+
+
+ +
+
+
{{ computDate }}预报到人数
+
{{ today.forecastStuden ?? '0' }}
+
-
预报到总人数报到率
-
{{totalRate ?? '0'}}%
+
{{ computDate }}预报到报到率
+
{{ forecastRate ?? '0' }}%
+ + +
diff --git a/src/views/index/index.vue b/src/views/index/index.vue index 5a89c0c..ee6e0c0 100644 --- a/src/views/index/index.vue +++ b/src/views/index/index.vue @@ -120,7 +120,7 @@ const getAdminPCIndex = () => { }; // 缴费人数-- 本科 专科 专升本 -const payData = () => { +/* const payData = () => { let params: any = [{ "EducationalLevel": 3, "Year": years.value, @@ -155,6 +155,31 @@ const payData = () => { } }); +} */ +/* + 缴费人数---根据批次去区分 +*/ +const payData = () => { + let params: any = { + "EducationalLevel": 3, + "Year": years.value, + "Month": months.value || void 0, + "Day": days.value || 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 === "统招专升本"); + dataStore.setBkPay(bk) + dataStore.setZkPay(zk) + dataStore.setZsbPay(zsb) + dataStore.setTotalPay(res.data.todayPayDto.batchTodayPays?.payNum) + setTimeout(() => { + if (rightCenterRef) { + rightCenterRef.value.getData() + } + }); + }) } const timer: any = ref(null) const startTimer = () => { diff --git a/src/views/index/right-center.vue b/src/views/index/right-center.vue index 5210cc3..3fcf995 100644 --- a/src/views/index/right-center.vue +++ b/src/views/index/right-center.vue @@ -6,7 +6,7 @@ const timeStore = useTimeStore() const { nowTitle } = storeToRefs(timeStore) const dataStore = useDataStore() -const { bkPay, zkPay, zsbPay } = 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] }, @@ -183,13 +183,18 @@ defineExpose({getData})

{{ nowTitle }}缴费总人数

-

{{ bkPay?.todayPayDto?.payNum }}

+ +

{{ totalPay??'0' }}

{{ tab.title }}

-

{{ bkPay?.todayPayDto?.bkPayNum }}

+ +

{{ bkPay?.num }}

+

{{ zkPay?.num }}

+

{{ zsbPay?.num }}

+