From 28b9d164c8a36b1d5f3184e42cfc0d31cf94d717 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Sat, 2 Apr 2022 09:50:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0=E6=A0=B8=E7=AE=97=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/epidemic/antiInfo.vue |   6 +-
 src/views/modules/shequ/cpts/people-more.vue | 119 +++++++++++++++++++
 2 files changed, 123 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue
index b7c209cf..4378dd86 100644
--- a/src/views/modules/base/epidemic/antiInfo.vue
+++ b/src/views/modules/base/epidemic/antiInfo.vue
@@ -434,7 +434,7 @@
                 </el-table-column>
               </el-table>
             </el-tab-pane>
-            <!-- <el-tab-pane label="行程信息" name="third">
+            <el-tab-pane label="行程信息" name="third">
               <el-table class="table"
                   :data="tripList"
                   border
@@ -451,6 +451,7 @@
                                 header-align="center"
                                 align="center"
                                 label="来自地区"
+                                show-overflow-tooltip
                                 min-width="100">
                 </el-table-column>
                 <el-table-column prop="arrivalTime"
@@ -475,10 +476,11 @@
                                 header-align="center"
                                 align="center"
                                 label="备注"
+                                show-overflow-tooltip
                                 width="120">
                 </el-table-column>
               </el-table>
-            </el-tab-pane> -->
+            </el-tab-pane>
           </el-tabs>
         </div>
       </div>
diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue
index f7c47e98..c2d9a6d1 100644
--- a/src/views/modules/shequ/cpts/people-more.vue
+++ b/src/views/modules/shequ/cpts/people-more.vue
@@ -136,6 +136,87 @@
               </div>
             </div>
           </div>
+          <div v-if="group.tableName == 'ic_hs'" style="margin-top:10px; padding: 0 20px;">
+            <el-table class="table"
+                  :data="natList"
+                  border
+                  height="400"
+                  :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                  style="width: 100%">
+                <el-table-column label="序号"
+                                header-align="center"
+                                align="center"
+                                type="index"
+                                width="50"></el-table-column>
+
+                <el-table-column prop="testTime"
+                                header-align="center"
+                                align="center"
+                                label="检测时间"
+                                width="150">
+                </el-table-column>
+                <el-table-column prop="address"
+                                header-align="center"
+                                align="center"
+                                label="检测机构"
+                                show-overflow-tooltip
+                                min-width="180">
+                </el-table-column>
+                <el-table-column prop="result"
+                                header-align="center"
+                                align="center"
+                                label="检测结果"
+                                width="240">
+                </el-table-column>
+              </el-table>
+          </div>
+          <div v-if="group.tableName == 'ic_xc'" style="margin-top:10px; padding: 0 20px;">
+            <el-table class="table"
+                  :data="tripList"
+                  border
+                  height="400"
+                  :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                  style="width: 100%">
+                <el-table-column label="序号"
+                                header-align="center"
+                                align="center"
+                                type="index"
+                                width="50"></el-table-column>
+
+                <el-table-column prop="fromRegion"
+                                header-align="center"
+                                align="center"
+                                label="来自地区"
+                                show-overflow-tooltip
+                                min-width="100">
+                </el-table-column>
+                <el-table-column prop="arrivalTime"
+                                header-align="center"
+                                align="center"
+                                label="来到本地时间"
+                                width="140">
+                </el-table-column>
+                <el-table-column prop="leaveTime"
+                                header-align="center"
+                                align="center"
+                                label="离开本地时间"
+                                width="140">
+                </el-table-column>
+                <el-table-column prop="noticeTime"
+                                header-align="center"
+                                align="center"
+                                label="最近一次通知时间"
+                                width="140">
+                </el-table-column>
+                <el-table-column prop="remark"
+                                header-align="center"
+                                align="center"
+                                label="备注"
+                                show-overflow-tooltip
+                                width="120">
+                </el-table-column>
+              </el-table>
+          </div>
           <div class="list" v-else>
             <div
               class="item"
@@ -210,6 +291,8 @@ export default {
       louList: [],
       danyuanList: [],
       homeList: [],
+      natList: [], // 核酸检测
+      tripList: [], // 行程信息
     };
   },
 
@@ -315,6 +398,7 @@ export default {
     async getApiData() {
       await this.getField();
       await this.getInfo();
+      this.getDetailList()
       this.getXiaoquList();
       this.getLouList();
       this.getDanyuanList();
@@ -364,6 +448,7 @@ export default {
       });
 
       if (code === 0) {
+        
         this.groupList = data.groupList;
         this.fieldList = (function (arr) {
           let col = [];
@@ -429,6 +514,22 @@ export default {
             }
           });
         });
+        const arr = [{
+          groupId: "hs123",
+          itemList: [],
+          label: "核酸检测信息",
+          sort: 998,
+          supportAdd: false,
+          tableName: "ic_hs",
+        }, {
+          groupId: "hs124",
+          itemList: [],
+          label: "行程信息",
+          sort: 999,
+          supportAdd: false,
+          tableName: "ic_xc",
+        }]
+        this.groupList = [...this.groupList, ...arr]
       } else {
         this.$message.error(msg);
       }
@@ -500,6 +601,24 @@ export default {
         this.$message.error(msg);
       }
     },
+    async getDetailList () {
+
+      const url = "/epmetuser/epidemicPrevention/info"
+      let params = {
+        id: this.userId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        const { vaccineList, natList, tripList } = data
+        this.vaccineList = vaccineList
+        this.natList = natList
+        this.tripList = tripList
+      } else {
+        this.$message.error(msg)
+      }
+    },
   },
 };
 </script>

From e12336c496789b6efdcbd4b8d998dc61e6a23ae4 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Sat, 2 Apr 2022 13:34:48 +0800
Subject: [PATCH 2/2] dd

---
 src/views/modules/base/epidemic/antiInfo.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue
index 4378dd86..365c6ecf 100644
--- a/src/views/modules/base/epidemic/antiInfo.vue
+++ b/src/views/modules/base/epidemic/antiInfo.vue
@@ -185,7 +185,7 @@
                          header-align="center"
                          align="center"
                          label="姓名"
-                         width="100">
+                         width="120">
         </el-table-column>
         <el-table-column prop="gridName"
                          header-align="center"
@@ -199,13 +199,13 @@
                          align="center"
                          label="所属房屋"
                          show-overflow-tooltip
-                         width="240">
+                         min-width="180">
         </el-table-column>
         <el-table-column prop="mobile"
                          header-align="center"
                          align="center"
                          label="手机号"
-                         width="110">
+                         width="180">
         </el-table-column>
         <el-table-column prop="idCard"
                          header-align="center"