26645

src/apps/AppEpidemicSituation/ErrorInfo.vue

@@ -9,7 +9,7 @@
         <span>{{info.unusual}}</span>
       </p>
     </div>
-    <div class="info">
+    <div class="info" v-if="list.length">
       <div class="title">异常情况记录</div>
       <div class="error-list">
         <div class="item" v-for="(item, index) in list" :key="index">
@@ -18,7 +18,6 @@
             <!-- <span>网格员: {{item.createUserName}}</span> -->
           </div>
         </div>
-        <AiEmpty v-if="!list.length"></AiEmpty>
       </div>
     </div>
     <div class="bg-line"></div>

src/apps/AppEpidemicSituation/UserInfo.vue

@@ -101,6 +101,27 @@
         </div>
       </div>
     </div>
+    <div class="line-bg"></div>
+    <div class="info" v-if="list.length">
+      <div class="title">异常处理情况</div>
+      <div class="error-list">
+        <div class="item" v-for="(item, index) in list" :key="index">
+          <p>{{item.content}}</p>
+          <div>{{item.createTime}}
+            <!-- <span>网格员: {{item.createUserName}}</span> -->
+          </div>
+        </div>
+      </div>
+      <div class="item-flex" v-if="info.releaseName">
+        <div class="label">异常解除人</div>
+        <div class="value">{{info.releaseName}}</div>
+      </div>
+      <div class="item-flex" v-if="info.releaseName">
+        <div class="label">异常解除时间</div>
+        <div class="value">{{info.releaseTime}}</div>
+      </div>
+      
+    </div>
     <div class="line-bg" style="padding-bottom: 56px;"></div>
     <div class="footer" @click="toError" v-if="info.status != 1">异常情况处理</div>
   </div>
@@ -113,7 +134,8 @@ export default {
   data() {
     return {
       id: '',
-      info: {}
+      info: {},
+      list: []
     }
   },
   computed: { ...mapState(['user']) },
@@ -124,12 +146,20 @@ export default {
     this.$dict.load('epidemicMemberType', 'epidemicRecentTravel', 'epidemicTouchInFourteen', 'epidemicRecentTestResult', 'epidemicRecentHealth').then(() => {
       this.id = option.id
       this.getDetail()
+      this.getList()
     })
     uni.$on('updateDetail', () => {
       this.getDetail()
     })
   },
   methods: {
+    getList() {
+      this.$http.post(`/app/appepidemicunusuallog/list?recordId=${this.id}`).then((res) => {
+        if (res.code == 0) {
+          this.list = res.data.records
+        }
+      })
+    },
     getDetail() {
       this.$http.post(`/app/appepidemicbackhomerecord/queryDetailById?id=${this.id}`).then((res) => {
         if (res.code == 0) {
@@ -254,6 +284,39 @@ export default {
     .item-flex:nth-last-of-type(1){
       border-bottom: 0;
     }
+    .error-list {
+      .item {
+        width: 100%;
+        background: #f4f7fe;
+        border-radius: 8px;
+        padding: 24px 24px 18px 24px;
+        box-sizing: border-box;
+        margin-bottom: 16px;
+        p {
+          font-size: 28px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #343d65;
+          line-height: 40px;
+          word-break: break-all;
+          margin-bottom: 12px;
+        }
+        div {
+          font-size: 24px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #666;
+          line-height: 34px;
+          span {
+            display: inline-block;
+            margin-left: 32px;
+          }
+        }
+      }
+    }
+    .text-p{
+      line-height: 44px;
+      color: #333;
+      padding-bottom: 16px;
+    }
   }
   .line-bg{
     width: 100%;