From 8019a9cdd86c98de6d4560d905cf722425c4cbad Mon Sep 17 00:00:00 2001
From: madewang <dw15027070948@163.com>
Date: Wed, 11 Mar 2020 18:20:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=B9=E6=AF=94?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=97=B4=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/feature/diseaseInfoServer.ts          |  5 ++
 .../feature/DataCompare/DataCompare.vue       | 57 +++++++++++++++++--
 2 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/src/api/feature/diseaseInfoServer.ts b/src/api/feature/diseaseInfoServer.ts
index d30ea1c..2c2f43e 100644
--- a/src/api/feature/diseaseInfoServer.ts
+++ b/src/api/feature/diseaseInfoServer.ts
@@ -227,6 +227,11 @@ export class DiseaseInfoServer {
     const url = `infection/trace/generate/fever/${date}`;
     return this.rSerivce.serverObj.post(url);
   }
+  // 更新患者位置
+  public updatePatientLocation(date: any) {
+    const url = `infection/adress/latest/list?prevDate=${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 ebbb6c8..689313a 100644
--- a/src/components/feature/DataCompare/DataCompare.vue
+++ b/src/components/feature/DataCompare/DataCompare.vue
@@ -1,5 +1,19 @@
 <template>
   <div class="dataCompare">
+    <el-row>
+      <el-col :offset="4">
+        选择日期：
+      <el-date-picker
+        v-model="date"
+        type="date"
+        placeholder="选择日期"
+        size="small"
+        format="yyyy 年 MM 月 dd 日"
+        value-format= "yyyy-MM-dd"
+        :picker-options="pickerOptions"
+      ></el-date-picker>
+      </el-col>
+    </el-row>
     <el-row type="flex" justify="center">
       <el-col :span="8">
         <el-button
@@ -46,7 +60,12 @@
         >
       </el-col>
       <el-col :span="8">
-
+        <el-button
+          type="primary"
+          @click="updatePatientLocation(date)"
+          size="medium"
+          >更新患者位置</el-button
+        >
       </el-col>
     </el-row>
         
@@ -61,12 +80,26 @@ import { diseaseInfoServer } from '@/api/installServer';
   name: 'DiseaseList',
 })
 export default class DiseasDeList extends Vue {
-  // 当前时间
-  private date: any;
+  // 选择的时间 默认前一天
+  private date: any = '';
+  // 禁用明天开始的日期
+  private pickerOptions: object = (() => {
+   return {
+     disabledDate: (time: any) => {
+       return this.$moment(time).isAfter(
+         this.$moment(),
+          'day',
+       );
+     },
+   };
+ })();
   private created() {
-    this.date =  this.$moment().format('YYYY-MM-DD');
+    this.date =  this.$moment(this.$moment().subtract(1, 'days')).format('YYYY-MM-DD');
   }
 
+// private refreshTabList() {
+//   console.log(this.date)
+// }
   // 隔离点数据对比
   private quarantineDataCompare(date: any) {
     diseaseInfoServer.dataCompare(date).then((res: any) => {
@@ -136,6 +169,20 @@ export default class DiseasDeList extends Vue {
         this.$message('系统异常');
       }
     });
+  }
+      // 更新患者位置
+  private updatePatientLocation(date: any) {
+    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('系统异常');
+      }
+    });
   }
 }
 </script>
@@ -155,7 +202,7 @@ export default class DiseasDeList extends Vue {
     height: 50px;
   }
   .el-row {
-      margin-top: 40px;
+      margin-top: 25px;
   }
 }
 </style>
-- 
Gitee


From bbb3b0596a5b7c6a57c604df13b18f9b91f132c5 Mon Sep 17 00:00:00 2001
From: madewang <dw15027070948@163.com>
Date: Wed, 11 Mar 2020 18:24:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=B9=E6=AF=94?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=97=B4=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/feature/DataCompare/DataCompare.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/feature/DataCompare/DataCompare.vue b/src/components/feature/DataCompare/DataCompare.vue
index 689313a..ae69113 100644
--- a/src/components/feature/DataCompare/DataCompare.vue
+++ b/src/components/feature/DataCompare/DataCompare.vue
@@ -172,7 +172,7 @@ export default class DiseasDeList extends Vue {
   }
       // 更新患者位置
   private updatePatientLocation(date: any) {
-    diseaseInfoServer.dataCompareFever(date).then((res: any) => {
+    diseaseInfoServer.updatePatientLocation(date).then((res: any) => {
       try {
         if (res.data.code === '200') {
           this.$message.success(res.data.msg);
-- 
Gitee