From e52c9baa34aebdd03f3563256aa6b933a0b80241 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 30 Mar 2022 14:16:00 +0800
Subject: [PATCH] dd

---
 src/views/modules/base/epidemic/antiInfo.vue | 12 +++----
 src/views/modules/base/epidemic/travel.vue   | 36 ++++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue
index cc3cc13d..b7c209cf 100644
--- a/src/views/modules/base/epidemic/antiInfo.vue
+++ b/src/views/modules/base/epidemic/antiInfo.vue
@@ -135,8 +135,8 @@
           </el-form-item>
 
           <el-form-item label="疫苗接种针次"
-                        prop="vaccinateCount">
-            <el-input v-model="searchForm.vaccinateCount"
+                        prop="vaccineCount">
+            <el-input v-model="searchForm.vaccineCount"
                       size="small"
                       class="list_item_width_1"
                       clearable
@@ -145,8 +145,8 @@
 
           </el-form-item>
           <el-form-item label="核酸检测次数"
-                        prop="testCount">
-            <el-input v-model="searchForm.testCount"
+                        prop="natCount">
+            <el-input v-model="searchForm.natCount"
                       size="small"
                       class="list_item_width_1"
                       clearable
@@ -522,8 +522,8 @@ export default {
         name: '',
         mobile: '',
         idCard: '',
-        vaccinateCount: '',
-        testCount: ''
+        vaccineCount: '',
+        natCount: ''
       },
       formDetail: {
         	name: '',
diff --git a/src/views/modules/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue
index be486046..4dd9211f 100644
--- a/src/views/modules/base/epidemic/travel.vue
+++ b/src/views/modules/base/epidemic/travel.vue
@@ -121,7 +121,7 @@
                          type="index"
                          width="50"></el-table-column>
 
-        <el-table-column prop="personInCharge"
+        <el-table-column prop="name"
                          header-align="center"
                          align="center"
                          label="姓名"
@@ -133,52 +133,52 @@
                          label="手机号"
                          width="120">
         </el-table-column>
-        <el-table-column prop="gridNames"
+        <el-table-column prop="idCard"
                          header-align="center"
                          align="center"
                          label="身份证"
                          width="180">
         </el-table-column>
-        <el-table-column prop="gridNames"
+        <el-table-column prop="detailAddress"
                          header-align="center"
                          align="center"
                          label="现居地"
                          show-overflow-tooltip
                          min-width="160">
         </el-table-column>
-        <el-table-column prop="gridNames"
+        <el-table-column prop="sourceAddress"
                          header-align="center"
                          align="center"
                          label="来自地区"
                          show-overflow-tooltip
                          min-width="160">
         </el-table-column>
-        <el-table-column prop="gridNames"
+        <el-table-column prop="arriveDate"
                          header-align="center"
                          align="center"
                          label="来到本地时间"
                          width="160">
         </el-table-column>
-        <el-table-column prop="time"
+        <el-table-column prop="leaveDate"
                          header-align="center"
                          align="center"
                          label="离开本地时间"
                          width="160">
         </el-table-column>
-        <el-table-column prop="ninePlaceNames"
+        <el-table-column prop="latestNoticeTime"
                          header-align="center"
                          align="center"
                          label="最近一次通知时间"
                          width="160">
         </el-table-column>
-        <el-table-column prop="ninePlaceNames"
+        <el-table-column prop="remark"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="备注"
                          min-width="120">
         </el-table-column>
-        <el-table-column prop="gridNames"
+        <el-table-column prop="heSuanCheck"
                          header-align="center"
                          align="center"
                          label="核酸检测关注名单"
@@ -252,7 +252,7 @@ export default {
     return {
       loading: false,
       total: 0,
-      pageSize: 10,
+      pageSize: 20,
       pageNo: 0,
       tableLoading: false,
       sHeight: 0,
@@ -306,7 +306,7 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
-      const url = "/gov/org/placepatrolteam/getlist"
+      const url = "/epmetuser/tripreport/page"
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
       let params = {
         pageSize: this.pageSize,
@@ -320,13 +320,13 @@ export default {
         this.total = data.total
         this.tableData = data.list
 
-        this.tableData.forEach(item => {
-          if (item.time) {
-            let timeArray = item.time.split(' ')
-            item.time = timeArray[0]
-          }
+        // this.tableData.forEach(item => {
+        //   if (item.time) {
+        //     let timeArray = item.time.split(' ')
+        //     item.time = timeArray[0]
+        //   }
 
-        });
+        // });
       } else {
         this.$message.error(msg)
       }
@@ -430,7 +430,7 @@ export default {
       this.formData.startDate = ''
       this.formData.endDate = ''
       this.timeRange = []
-      this.pageSize = 10
+      this.pageSize = 20
       this.pageNo = 1
       this.loadTable()
     },