From b337d74e32801878cbdad71c8f50b1a873727118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Wed, 12 Jan 2022 16:37:23 +0800
Subject: [PATCH] 26634

---
 src/apps/AppEpidemicSituation/ErrorDetail.vue | 53 +++++++++++++++++--
 1 file changed, 49 insertions(+), 4 deletions(-)

diff --git a/src/apps/AppEpidemicSituation/ErrorDetail.vue b/src/apps/AppEpidemicSituation/ErrorDetail.vue
index de01823c..81d80bf4 100644
--- a/src/apps/AppEpidemicSituation/ErrorDetail.vue
+++ b/src/apps/AppEpidemicSituation/ErrorDetail.vue
@@ -9,11 +9,56 @@
       <p class="mar-b8" style="color: #333">{{ userList.idNumber && userList.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1********$2') }}</p>
       <p>异常情况：</p>
       <div v-if="datas.length">
-        <p style="color: #ff4466" v-for="(item, index) in datas" :key="index" v-if="item.health != 0">
+        <div v-for="(item, index) in datas" :key="index" style="color: #ff4466">
+          <span style="color: #666" v-if="item.status == 0">{{ item.checkTime && item.checkTime.substring(0, 10) }}:</span>
+
+          <div v-if="item.temperature * 1 > 37.3">
+            <span>当前体温</span>
+
+            <span style="margin-left: 10px">{{ item.temperature }}℃</span>
+          </div>
+
+          <div v-if="item.touchInFourteen * 1 !== 0">
+            <span>14天内是否接触新冠确诊或疑似患者</span>
+
+            <span style="margin-left: 10px">
+              {{ $dict.getLabel('epidemicTouchInFourteen', item.touchInFourteen) }}
+            </span>
+          </div>
+
+          <div v-if="item.health !== '0'">
+            <span>当前健康状况</span>
+
+            <span style="margin-left: 10px" v-for="(item, index) in item.health" :key="index">
+              <!-- :style="item != 0 ? 'color:#FF4466;' : ''" -->
+              <span v-if="index > 0"> ; </span>
+              <span>
+                {{ $dict.getLabel('epidemicRecentHealth', item) }}
+              </span>
+            </span>
+          </div>
+
+          <div v-if="item.checkResult != 0">
+            <span>核酸检测结果</span>
+
+            <span style="margin-left: 10px">
+              {{ $dict.getLabel('epidemicRecentTestResult', item.checkResult) }}
+            </span>
+          </div>
+
+          <div v-if="item.healthCode == 2 || item.healthCode == 3 || item.healthCode == 4">
+            <span>健康码</span>
+
+            <span style="margin-left: 10px">
+              {{ $dict.getLabel('epidemicHealthCode', item.healthCode) }}
+            </span>
+          </div>
+        </div>
+        <!-- <div style="color: #ff4466" v-for="(item, index) in datas" :key="index" v-if="item.health != 0">
           <span v-for="(items, index) in item.health" :key="index" :style="item != 0 ? 'color:#FF4466;' : ''">
             {{ $dict.getLabel('epidemicRecentHealth', items) }}
           </span>
-        </p>
+        </div> -->
       </div>
 
       <p style="color: #333" v-else>暂无异常情况</p>
@@ -74,7 +119,7 @@ export default {
   },
   onLoad(o) {
     console.log(o)
-    this.$dict.load('epidemicMemberType', 'epidemicRecentTravel', 'epidemicTouchInFourteen', 'epidemicRecentTestResult', 'epidemicRecentHealth').then(() => {
+    this.$dict.load('epidemicMemberType', 'epidemicRecentTravel', 'epidemicTouchInFourteen', 'epidemicRecentTestResult', 'epidemicRecentHealth', 'epidemicHealthCode').then(() => {
       if (o) {
         this.id = o.id
         this.getUser()
@@ -108,7 +153,7 @@ export default {
     getErrThing() {
       this.$loading()
       this.$http
-        .post(`/app/appepidemichealthreport/list?memberId=${this.id}&status=0`)
+        .post(`/app/appepidemichealthreport/list?memberId=${this.id}`)
         .then((res) => {
           if (res.code == 0) {
             this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records