From 012d140c91210ca42286902be02068749e4075b4 Mon Sep 17 00:00:00 2001 From: madewang Date: Wed, 11 Mar 2020 16:34:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AF=B9=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/feature/diseaseInfoServer.ts | 19 ++- .../feature/DataCompare/DataCompare.vue | 124 +++++++++++++++--- .../feature/DiseaseInfoGL/DiseaseList.vue | 9 +- 3 files changed, 131 insertions(+), 21 deletions(-) diff --git a/src/api/feature/diseaseInfoServer.ts b/src/api/feature/diseaseInfoServer.ts index 84451e6..d30ea1c 100644 --- a/src/api/feature/diseaseInfoServer.ts +++ b/src/api/feature/diseaseInfoServer.ts @@ -202,8 +202,8 @@ export class DiseaseInfoServer { } // 隔离点数据对比 - public dataCompare() { - const url = `infectionweb/sufferer/trace/v1`; + public dataCompare(date: any) { + const url = `infection/trace/generate/site/${date}`; return this.rSerivce.serverObj.post(url); } @@ -212,6 +212,21 @@ export class DiseaseInfoServer { const url = `infection/cdc/compareData`; return this.rSerivce.serverObj.post(url); } + // 方舱医院数据对比 + public dataCompareFC(date: any) { + const url = `infection/trace/generate/fangcang/${date}`; + return this.rSerivce.serverObj.post(url); + } + // 定点医院数据对比 + public dataComparePoint(date: any) { + const url = `infection/trace/generate/point/${date}`; + return this.rSerivce.serverObj.post(url); + } + // 发热门诊数据对比 + public dataCompareFever(date: any) { + const url = `infection/trace/generate/fever/${date}`; + return this.rSerivce.serverObj.post(url); + } // 通过身份证号 查询患者画像详情 public getDDHospitalEditDataIdNo(id: any) { diff --git a/src/components/feature/DataCompare/DataCompare.vue b/src/components/feature/DataCompare/DataCompare.vue index f462e46..335565f 100644 --- a/src/components/feature/DataCompare/DataCompare.vue +++ b/src/components/feature/DataCompare/DataCompare.vue @@ -1,17 +1,55 @@ @@ -23,14 +61,21 @@ import { diseaseInfoServer } from '@/api/installServer'; name: 'DiseaseList', }) export default class DiseasDeList extends Vue { - // 数据对比 + // // 当前时间 + // private date: any; + // private created() { + // this.date =  this.$moment().format('YYYY-MM-DD') + // } + + // 隔离点数据对比 private quarantineDataCompare() { - diseaseInfoServer.dataCompare().then((res: any) => { + const date: any = this.$moment().format('YYYY-MM-DD'); + diseaseInfoServer.dataCompare(date).then((res: any) => { try { - if (res.data.status === 200) { - this.$message.success(res.data.data); + if (res.data.code === '200') { + this.$message.success(res.data.msg); } else { - this.$message.error(res.data.data); + this.$message.error(res.data.msg); } } catch (error) { this.$message('系统异常'); @@ -50,6 +95,51 @@ export default class DiseasDeList extends Vue { this.$message('系统异常'); } }); + } + // 方舱医院数据对比 + private dataCompareFC() { + const date: any = this.$moment().format('YYYY-MM-DD'); + diseaseInfoServer.dataCompareFC(date).then((res: any) => { + try { + if (res.data.code === '200') { + this.$message.success(res.data.msg); + } else { + this.$message.error(res.data.msg); + } + } catch (error) { + this.$message('系统异常'); + } + }); + } + // 定点医院数据对比 + private dataComparePoint() { + const date: any = this.$moment().format('YYYY-MM-DD'); + diseaseInfoServer.dataComparePoint(date).then((res: any) => { + try { + if (res.data.code === '200') { + this.$message.success(res.data.msg); + } else { + this.$message.error(res.data.msg); + } + } catch (error) { + this.$message('系统异常'); + } + }); + } + // 发热门诊数据对比 + private dataCompareFever() { + const date: any = this.$moment().format('YYYY-MM-DD'); + diseaseInfoServer.dataCompareFever(date).then((res: any) => { + try { + if (res.data.code === '200') { + this.$message.success(res.data.msg); + } else { + this.$message.error(res.data.msg); + } + } catch (error) { + this.$message('系统异常'); + } + }); } } @@ -59,14 +149,18 @@ export default class DiseasDeList extends Vue { margin: 200px auto; width: 500px; height: 300px; - box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04) + box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04); + overflow: hidden; } diff --git a/src/components/feature/DiseaseInfoGL/DiseaseList.vue b/src/components/feature/DiseaseInfoGL/DiseaseList.vue index 785b41d..5dbaa65 100644 --- a/src/components/feature/DiseaseInfoGL/DiseaseList.vue +++ b/src/components/feature/DiseaseInfoGL/DiseaseList.vue @@ -517,12 +517,13 @@ export default class DiseasDeList extends Vue { } // 数据对比 private dataCompare() { - diseaseInfoServer.dataCompare().then((res: any) => { + const date: any = this.$moment().format('YYYY-MM-DD'); + diseaseInfoServer.dataCompare(date).then((res: any) => { try { - if (res.data.status === 200) { - this.$message.success(res.data.data); + if (res.data.status === '200') { + this.$message.success(res.data.msg); } else { - this.$message.error(res.data.data); + this.$message.error(res.data.msg); } } catch (error) { this.$message('系统异常'); -- Gitee From fbe3d0a28b7e8a42e5fd372f607da5225a2c8c5e Mon Sep 17 00:00:00 2001 From: madewang Date: Wed, 11 Mar 2020 16:49:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AF=B9=E6=AF=94=E7=9A=84=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature/DataCompare/DataCompare.vue | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/src/components/feature/DataCompare/DataCompare.vue b/src/components/feature/DataCompare/DataCompare.vue index 335565f..ebbb6c8 100644 --- a/src/components/feature/DataCompare/DataCompare.vue +++ b/src/components/feature/DataCompare/DataCompare.vue @@ -12,7 +12,7 @@ 隔离点数据对比 @@ -22,7 +22,7 @@ 方舱医院数据对比 @@ -30,7 +30,7 @@ 定点医院数据对比 @@ -40,7 +40,7 @@ 发热门数据对比 @@ -61,15 +61,14 @@ import { diseaseInfoServer } from '@/api/installServer'; name: 'DiseaseList', }) export default class DiseasDeList extends Vue { - // // 当前时间 - // private date: any; - // private created() { - // this.date =  this.$moment().format('YYYY-MM-DD') - // } + // 当前时间 + private date: any; + private created() { + this.date =  this.$moment().format('YYYY-MM-DD'); + } // 隔离点数据对比 - private quarantineDataCompare() { - const date: any = this.$moment().format('YYYY-MM-DD'); + private quarantineDataCompare(date: any) { diseaseInfoServer.dataCompare(date).then((res: any) => { try { if (res.data.code === '200') { @@ -97,8 +96,7 @@ export default class DiseasDeList extends Vue { }); } // 方舱医院数据对比 - private dataCompareFC() { - const date: any = this.$moment().format('YYYY-MM-DD'); + private dataCompareFC(date: any) { diseaseInfoServer.dataCompareFC(date).then((res: any) => { try { if (res.data.code === '200') { @@ -112,8 +110,7 @@ export default class DiseasDeList extends Vue { }); } // 定点医院数据对比 - private dataComparePoint() { - const date: any = this.$moment().format('YYYY-MM-DD'); + private dataComparePoint(date: any) { diseaseInfoServer.dataComparePoint(date).then((res: any) => { try { if (res.data.code === '200') { @@ -127,8 +124,7 @@ export default class DiseasDeList extends Vue { }); } // 发热门诊数据对比 - private dataCompareFever() { - const date: any = this.$moment().format('YYYY-MM-DD'); + private dataCompareFever(date: any) { diseaseInfoServer.dataCompareFever(date).then((res: any) => { try { if (res.data.code === '200') { -- Gitee