From c6214e05a34d0967ae11488a2a0b2ffb61f42b91 Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Fri, 21 Feb 2025 13:45:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=99=BA=E8=81=AA=E5=81=A5=E5=BA=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9Etab=E6=8C=89=E9=92=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statistic/doctorStatistic/index.vue | 168 +++++++++++++++++- .../statistic/healthStatistic/index.vue | 41 ++++- .../health/statistic/marStatistic/index.vue | 43 ++++- .../statistic/milkPowderStatistic/index.vue | 3 + .../statistic/temperatureStatistic/index.vue | 44 ++++- 5 files changed, 295 insertions(+), 4 deletions(-) diff --git a/src/pages/health/statistic/doctorStatistic/index.vue b/src/pages/health/statistic/doctorStatistic/index.vue index ceddaeb..bfecb85 100644 --- a/src/pages/health/statistic/doctorStatistic/index.vue +++ b/src/pages/health/statistic/doctorStatistic/index.vue @@ -153,7 +153,14 @@
- +
+ + + + + +
+ @@ -189,6 +196,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { doctor.value = { ...res.data } + resetListData() listData.value = listData.value.concat(res.data.doctorTableList) + secondListData.value = secondListData.value.concat(res.data.hospitalStaticList) + thirdListData.value = thirdListData.value.concat(res.data.departStaticList) + fourListData.value = fourListData.value.concat(res.data.doctorStaticList) + fiveListData.value = fiveListData.value.concat(res.data.doctorCostList) }).catch(() => { }) } @@ -336,6 +498,10 @@ function getDict() { getDoctorAnalysis({...queryParams.value }).then(res => { doctor.value = { ...res.data } listData.value = listData.value.concat(res.data.doctorTableList) + secondListData.value = secondListData.value.concat(res.data.hospitalStaticList) + thirdListData.value = thirdListData.value.concat(res.data.departStaticList) + fourListData.value = fourListData.value.concat(res.data.doctorStaticList) + fiveListData.value = fiveListData.value.concat(res.data.doctorCostList) }).catch(() => { }) diff --git a/src/pages/health/statistic/healthStatistic/index.vue b/src/pages/health/statistic/healthStatistic/index.vue index d0c6597..912d66c 100644 --- a/src/pages/health/statistic/healthStatistic/index.vue +++ b/src/pages/health/statistic/healthStatistic/index.vue @@ -159,7 +159,11 @@
- +
+ + +
+ @@ -203,6 +207,19 @@ + + + + + + + + + + + + { isShow.value = false } }); + function btFirstClick() { + tabShow.value=false + firstType.value="primary" + secondType.value="default" + + } + function btSecondClick() { + secondType.value="primary" + firstType.value="default" + tabShow.value=true + + } function formatMultiLineData(data) { if (data != null) { @@ -316,7 +351,10 @@ function getList() { getRecordAnalysis({...queryParams.value }).then(res => { record.value = { ...res.data } + listData.value=[] + secondListData.value=[] listData.value = listData.value.concat(res.data.recordList) + secondListData.value = secondListData.value.concat(res.data.recordCostList) }).catch(() => { }) } @@ -336,6 +374,7 @@ function getDict() { getRecordAnalysis({...queryParams.value }).then(res => { record.value = { ...res.data } listData.value = listData.value.concat(res.data.recordList) + secondListData.value = secondListData.value.concat(res.data.recordCostList) }).catch(() => { }) diff --git a/src/pages/health/statistic/marStatistic/index.vue b/src/pages/health/statistic/marStatistic/index.vue index 3a41624..a1acd12 100644 --- a/src/pages/health/statistic/marStatistic/index.vue +++ b/src/pages/health/statistic/marStatistic/index.vue @@ -234,7 +234,11 @@
- +
+ + +
+ @@ -258,6 +262,19 @@ + + + + + + + + + + + + { isShow.value = false } }); + function btFirstClick() { + tabShow.value=false + firstType.value="primary" + secondType.value="default" + + } + function btSecondClick() { + secondType.value="primary" + firstType.value="default" + tabShow.value=true + + } function formatMultiLineData(data) { if (data != null) { @@ -371,7 +406,10 @@ function getList() { getMarAnalysis({...queryParams.value }).then(res => { mar.value = { ...res.data } + listData.value=[] + secondListData.value=[] listData.value = listData.value.concat(res.data.marMapList) + secondListData.value = secondListData.value.concat(res.data.marList.slice().reverse()) }).catch(() => { }) } @@ -390,7 +428,10 @@ function getDict() { } getMarAnalysis({...queryParams.value }).then(res => { mar.value = { ...res.data } + listData.value=[] + secondListData.value=[] listData.value = listData.value.concat(res.data.marMapList) + secondListData.value = secondListData.value.concat(res.data.marList.slice().reverse()) }).catch(() => { }) diff --git a/src/pages/health/statistic/milkPowderStatistic/index.vue b/src/pages/health/statistic/milkPowderStatistic/index.vue index 0f563f7..8937cc7 100644 --- a/src/pages/health/statistic/milkPowderStatistic/index.vue +++ b/src/pages/health/statistic/milkPowderStatistic/index.vue @@ -147,6 +147,9 @@
+ +
+
diff --git a/src/pages/health/statistic/temperatureStatistic/index.vue b/src/pages/health/statistic/temperatureStatistic/index.vue index b5051e3..f32a5b0 100644 --- a/src/pages/health/statistic/temperatureStatistic/index.vue +++ b/src/pages/health/statistic/temperatureStatistic/index.vue @@ -137,7 +137,11 @@
- +
+ + +
+ @@ -165,6 +169,19 @@ + + + + + + + + + + + + { } }); + function btFirstClick() { + tabShow.value=false + firstType.value="primary" + secondType.value="default" + + } + function btSecondClick() { + secondType.value="primary" + firstType.value="default" + tabShow.value=true + + } + function formatMultiLineData(data) { if (data != null) { return data.replace(//g, '\n') @@ -278,7 +314,10 @@ function getList() { getTemperatureAnalysis({...queryParams.value }).then(res => { temp.value = { ...res.data } + listData.value=[] + secondListData.value=[] listData.value = listData.value.concat(res.data.tableList) + secondListData.value = secondListData.value.concat(res.data.temperatureList.slice().reverse()) }).catch(() => { }) } @@ -297,7 +336,10 @@ function getDict() { } getTemperatureAnalysis({...queryParams.value }).then(res => { temp.value = { ...res.data } + listData.value=[] + secondListData.value=[] listData.value = listData.value.concat(res.data.tableList) + secondListData.value = secondListData.value.concat(res.data.temperatureList.slice().reverse()) }).catch(() => { })