From 579e29ab9ee8e0b4fcfeb445d60574ced156287f Mon Sep 17 00:00:00 2001 From: ChiyokoYY <525231835@qq.com> Date: Tue, 10 Mar 2020 18:16:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=96=AB=E6=83=85=E7=BD=91=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1-=E6=97=A5=E6=9C=9F=E5=92=8Ctab?= =?UTF-8?q?=E8=AE=B0=E5=BF=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AccumulativeStatistics.vue | 16 +++++++++++++++- src/views/MenuList.vue | 2 ++ src/views/PatientPortrayal.vue | 13 ++++++++++++- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue b/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue index 468eee1..aa8c1d2 100644 --- a/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue +++ b/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue @@ -2,7 +2,7 @@
- 累计数据统计分析(按居住地统计): 截止{{ expiryDate }} + 累计数据统计分析(按报告地统计): 截止{{ expiryDate }} 24时江夏统计数据如下
@@ -221,6 +221,7 @@ import AccuItem from './AccuItem.vue'; components: { AccuItem }, }) export default class DiseaseInfo extends Vue { + private tabType:any; private params = { nowPage: 1, pageSize: 10, @@ -298,6 +299,7 @@ export default class DiseaseInfo extends Vue { this.params.type = tab.name.substr(0, 1); // this.params.status = tab.name.substr(1, 1); this.getList(); + sessionStorage.setItem('tabType', this.params.type) } private mounted() { const fullHeight = @@ -307,7 +309,18 @@ export default class DiseaseInfo extends Vue { 20; this.params.pageSize = Math.floor(fullHeight / 48); // 根据屏幕自适应计算size this.initData(); + if( sessionStorage.getItem('searchDate')!=''){ + this.searchDate = sessionStorage.getItem('searchDate'); + this.getList(); + } + if(sessionStorage.getItem('tabType')!=''){ + this.tabType = sessionStorage.getItem('tabType'); + this.activeIndex = this.tabType; + this.params.type = this.tabType; + this.getList(); + } } + private initData() { this.getTotal(); this.getList(); @@ -347,6 +360,7 @@ export default class DiseaseInfo extends Vue { this.expiryDate = this.$moment(this.searchDate).format('YYYY年MM月DD日'); this.searchDate = this.$moment(this.searchDate).format('YYYY-MM-DD'); this.initData(); + sessionStorage.setItem('searchDate', this.searchDate); } private download() { diff --git a/src/views/MenuList.vue b/src/views/MenuList.vue index 44c3d06..8aef5de 100644 --- a/src/views/MenuList.vue +++ b/src/views/MenuList.vue @@ -102,6 +102,8 @@ export default class MenuList extends Vue { this.currentIndex = index; this.$router.push(this.routeList[index].path); } + sessionStorage.setItem('searchDate', ''); + sessionStorage.setItem('tabType', ''); } } diff --git a/src/views/PatientPortrayal.vue b/src/views/PatientPortrayal.vue index 5c1414e..26340d3 100644 --- a/src/views/PatientPortrayal.vue +++ b/src/views/PatientPortrayal.vue @@ -14,7 +14,7 @@
{{currentSufferData.suffererName}}病情溯源
-
+
Date: Tue, 10 Mar 2020 18:28:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=96=AB=E6=83=85=E7=BD=91=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1-=E6=97=A5=E6=9C=9F=E5=92=8Ctab?= =?UTF-8?q?=E8=AE=B0=E5=BF=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AccumulativeStatistics.vue | 12 ++++++------ src/views/PatientPortrayal.vue | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue b/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue index aa8c1d2..9be6517 100644 --- a/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue +++ b/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue @@ -221,7 +221,7 @@ import AccuItem from './AccuItem.vue'; components: { AccuItem }, }) export default class DiseaseInfo extends Vue { - private tabType:any; + private tabType: any; private params = { nowPage: 1, pageSize: 10, @@ -299,7 +299,7 @@ export default class DiseaseInfo extends Vue { this.params.type = tab.name.substr(0, 1); // this.params.status = tab.name.substr(1, 1); this.getList(); - sessionStorage.setItem('tabType', this.params.type) + sessionStorage.setItem('tabType', this.params.type); } private mounted() { const fullHeight = @@ -309,11 +309,11 @@ export default class DiseaseInfo extends Vue { 20; this.params.pageSize = Math.floor(fullHeight / 48); // 根据屏幕自适应计算size this.initData(); - if( sessionStorage.getItem('searchDate')!=''){ + if ( sessionStorage.getItem('searchDate') != '') { this.searchDate = sessionStorage.getItem('searchDate'); - this.getList(); + this.getList(); } - if(sessionStorage.getItem('tabType')!=''){ + if ( sessionStorage.getItem('tabType') != '') { this.tabType = sessionStorage.getItem('tabType'); this.activeIndex = this.tabType; this.params.type = this.tabType; @@ -360,7 +360,7 @@ export default class DiseaseInfo extends Vue { this.expiryDate = this.$moment(this.searchDate).format('YYYY年MM月DD日'); this.searchDate = this.$moment(this.searchDate).format('YYYY-MM-DD'); this.initData(); - sessionStorage.setItem('searchDate', this.searchDate); + sessionStorage.setItem('searchDate', this.searchDate); } private download() { diff --git a/src/views/PatientPortrayal.vue b/src/views/PatientPortrayal.vue index 26340d3..9565db3 100644 --- a/src/views/PatientPortrayal.vue +++ b/src/views/PatientPortrayal.vue @@ -142,7 +142,7 @@ export default class LayoutHome extends Vue { this.currentSufferData.suffererIdNo = this.sufferData.idNo; this.getContentList(); this.patientPortrayal(); // 开始调本人的溯源接口 - }else if(res.data.code === '-100'){ + } else if (res.data.code === '-100') { this.$message.error('该患者暂时无法进行追溯'); } }); @@ -200,11 +200,11 @@ export default class LayoutHome extends Vue { } }); } - private back(){ - if(this.searchDate){ + private back() { + if (this.searchDate) { sessionStorage.setItem('searchDate', this.searchDate); this.$router.go(-1); - }else{ + } else { this.$router.go(-1); } } -- Gitee From 7321c073943b748ae55d44471867813941284e77 Mon Sep 17 00:00:00 2001 From: ChiyokoYY <525231835@qq.com> Date: Tue, 10 Mar 2020 19:14:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=96=AB=E6=83=85=E7=BD=91=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=BB=9F=E8=AE=A1-=E6=A0=87=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AccumulativeStatistics.vue | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue b/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue index 9be6517..1270730 100644 --- a/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue +++ b/src/components/feature/AccumulativeStatistics/AccumulativeStatistics.vue @@ -2,9 +2,18 @@
- 累计数据统计分析(按报告地统计): 截止{{ expiryDate }} + 累计数据统计分析(按居住地统计): 截止{{ expiryDate }} 24时江夏统计数据如下 +
@@ -63,16 +72,7 @@ >{{ tabData.yesterday }}0时-24时江夏区新增数据如下-->
- 统计日期: - + {{ expiryDate }}新增数据统计如下:
导出