From 9b25a8fa0efc3e9b8f1e506f07dc1e20a85f0e72 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 10 Oct 2022 17:10:15 +0800
Subject: [PATCH] bug

---
 packages/bigscreen/dv/AppMonitorMapDv.vue     | 11 +++
 .../components/List.vue                       |  3 +-
 .../apps/AppHomeReport/components/Detail.vue  | 32 ++++----
 .../apps/AppHomeReport/components/List.vue    | 75 ++++++++++---------
 4 files changed, 69 insertions(+), 52 deletions(-)

diff --git a/packages/bigscreen/dv/AppMonitorMapDv.vue b/packages/bigscreen/dv/AppMonitorMapDv.vue
index 88ae3115..668b3787 100644
--- a/packages/bigscreen/dv/AppMonitorMapDv.vue
+++ b/packages/bigscreen/dv/AppMonitorMapDv.vue
@@ -800,6 +800,9 @@ export default {
     box-sizing: border-box;
     font-size: 14px;
     color: #FFFFFF;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
     text-shadow: 0 2px 4px rgba(0,0,0,0.50);
 
     &.mark0 {
@@ -820,6 +823,14 @@ export default {
       box-shadow: 0 4px 4px 0 #000000, inset 0 0 8px 4px #C312CA;
     }
 
+    .mark-contaienr {
+      width: 56px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      text-align: center;
+    }
+
     // &.mark1::after {
     //   position: absolute;
     //   z-index: -1;
diff --git a/project/pingchang/apps/AppBayonetRegistration/components/List.vue b/project/pingchang/apps/AppBayonetRegistration/components/List.vue
index 148bbe6b..ed05da88 100644
--- a/project/pingchang/apps/AppBayonetRegistration/components/List.vue
+++ b/project/pingchang/apps/AppBayonetRegistration/components/List.vue
@@ -226,7 +226,8 @@
       getTotalInfo () {
         this.instance.post(`/app/appepidemicpreventionregisterinfo/listStatistics`, null, {
           params: {
-            areaId: this.search.arriveAreaId
+            areaId: this.search.arriveAreaId,
+            infoType: 0
           }
         }).then(res => {
           if (res.code == 0) {
diff --git a/project/pingchang/apps/AppHomeReport/components/Detail.vue b/project/pingchang/apps/AppHomeReport/components/Detail.vue
index d2f755f8..adb3251e 100644
--- a/project/pingchang/apps/AppHomeReport/components/Detail.vue
+++ b/project/pingchang/apps/AppHomeReport/components/Detail.vue
@@ -17,7 +17,6 @@
               <ai-info-item label="手机号码" :value="info.phone"></ai-info-item>
               <ai-info-item label="人员类别" :value="dict.getLabel('EP_registerPersonType', info.type)"></ai-info-item>
               <ai-info-item label="是否从事高危行业" :value="dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries)"></ai-info-item>
-              <ai-info-item label="登记卡口" isLine :value="info.gatewayName"></ai-info-item>
             </ai-wrapper>
           </template>
         </ai-card>
@@ -57,18 +56,6 @@
             </ai-wrapper>
           </template>
         </ai-card>
-        <ai-card title="同行情况">
-          <template #content>
-            <ai-table
-              :isShowPagination="false"
-              tableSize="small"
-              border
-              :tableData="info.companionList"
-              :col-configs="colConfigs"
-              @getList="() => {}">
-            </ai-table>
-          </template>
-        </ai-card>
       </div>
       <div v-show="currIndex === 1">
         <ai-card title="风险处置">
@@ -86,7 +73,19 @@
             </ai-wrapper>
           </template>
         </ai-card>
-        <ai-card title="处理意见">
+        <ai-card title="风险处理意见">
+          <template #content>
+            <ai-table
+              :isShowPagination="false"
+              tableSize="small"
+              border
+              :tableData="info.riskDisposalList"
+              :col-configs="colConfigs"
+              @getList="() => {}">
+            </ai-table>
+          </template>
+        </ai-card>
+        <ai-card title="社区初排">
           <template #content>
             <ai-wrapper
               style="margin-bottom: 20px;"
@@ -143,8 +142,9 @@
         isLoading: false,
         tableData: [],
         colConfigs: [
-          {prop: 'name', label: '姓名', align: 'center' },
-          {prop: 'phone', label: '手机号', align: 'center'}
+          {prop: 'remarks', label: '异常记录', align: 'center' },
+          {prop: 'createTime', label: '创建时间', align: 'center'},
+          {prop: 'createUserName', label: '记录人', align: 'center' }
         ],
         tabList: ['基本信息', '风险处置']
       }
diff --git a/project/pingchang/apps/AppHomeReport/components/List.vue b/project/pingchang/apps/AppHomeReport/components/List.vue
index 9fc6279e..505e4783 100644
--- a/project/pingchang/apps/AppHomeReport/components/List.vue
+++ b/project/pingchang/apps/AppHomeReport/components/List.vue
@@ -1,6 +1,6 @@
 <template>
   <ai-list class="list">
-    <ai-title slot="title" title="返乡报备" isShowBottomBorder :instance="instance" :hideLevel="0" :disabledLevel="disabledLevel" isShowArea v-model="search.arriveAreaId" @change="changeArea"></ai-title>
+    <ai-title slot="title" title="返乡报备" isShowBottomBorder :instance="instance" v-if="search.arriveAreaId" isShowArea v-model="search.arriveAreaId" @change="changeArea"></ai-title>
     <template slot="content">
       <div class="statistics-top">
         <div class="statistics-top__item">
@@ -8,16 +8,20 @@
           <h2 style="color: #2266FF;">{{ info['登记人数'] }}</h2>
         </div>
         <div class="statistics-top__item">
-          <span>今日登记</span>
-          <h2 style="color: #22AA99;">{{ info['今日登记'] }}</h2>
+          <span>今日新增返乡</span>
+          <h2 style="color: #22AA99;">{{ info['今日新增返乡'] }}</h2>
         </div>
         <div class="statistics-top__item">
-          <span>原路返回</span>
-          <h2 style="color: #F8B425">{{ info['原路返回'] }}</h2>
+          <span>风险人数</span>
+          <h2 style="color: #F8B425">{{ info['风险人数'] }}</h2>
         </div>
         <div class="statistics-top__item">
-          <span>居家隔离</span>
-          <h2 style="color: red">{{ info['居家隔离'] }}</h2>
+          <span>今日风险人数</span>
+          <h2 style="color: red">{{ info['今日风险人数'] }}</h2>
+        </div>
+        <div class="statistics-top__item">
+          <span>风险处理</span>
+          <h2 style="color: red">{{ info['风险处理'] }}</h2>
         </div>
       </div>
       <div class="content">
@@ -26,8 +30,15 @@
             <ai-select
               v-model="search.gatewayId"
               clearable
-              placeholder="请选择卡口"
-              :selectList="dictList"
+              placeholder="请选择风险状态"
+              :selectList="dict.getDict('EP_registerInfoType')"
+              @change="search.current = 1, getList()">
+            </ai-select>
+            <ai-select
+              v-model="search.gatewayId"
+              clearable
+              placeholder="请选择数据来源"
+              :selectList="dict.getDict('EP_registerInfoType')"
               @change="search.current = 1, getList()">
             </ai-select>
             <el-date-picker
@@ -108,26 +119,29 @@
           queryEndTime: '',
           infoType: 1
         },
-        dictList: [],
         info: {},
         colConfigs: [
           { prop: 'name', label: '姓名' },
           { prop: 'phone', align: 'center', label: '手机号码' },
-          { prop: 'arriveAreaName', align: 'center', label: '返乡地区' },
+          { prop: 'startTime', align: 'center', label: '出发时间' },
+          { prop: 'startAreaName', align: 'center', label: '出发地区' },
           {
             prop: 'arriveTime',
             align: 'center',
             label: '抵平时间'
           },
-          { prop: 'companionCount', align: 'center', label: '同行人数' },
+          {
+            prop: 'arriveAreaName',
+            align: 'center',
+            label: '到达地区'
+          },
+          { prop: 'companionCount', align: 'center', label: '数据来源' },
           {
             prop: 'riskLevel',
             align: 'center',
-            label: '风险等级',
+            label: '风险状态',
             formart: v => this.dict.getLabel('EP_riskLevel', v)
-          },
-          { prop: 'gatewayName', align: 'center', label: '登记卡口' },
-          { prop: 'handleType', align: 'center', label: '处理意见', formart: v => this.dict.getLabel('EP_handleType', v) }
+          }
         ],
         ids: [],
         tableData: [],
@@ -143,30 +157,20 @@
 
     created () {
       this.disabledLevel = this.user.info.areaList.length - 1
-      this.search.arriveAreaId = this.user.info.areaId
       this.loading = true
 
-      this.getTotalInfo()
-      this.getDictList()
-      this.dict.load(['EP_riskLevel', 'EP_handleType', 'modeType']).then(() => {
-        this.getList()
+      this.instance.post(`/app/appdvcpconfig/getCorpArea`).then(res => {
+        if (res.code == 0) {
+          this.search.arriveAreaId = res.data
+          this.getTotalInfo()
+          this.dict.load(['EP_riskLevel', 'EP_handleType', 'modeType']).then(() => {
+            this.getList()
+          })
+        }
       })
     },
 
     methods: {
-      getDictList () {
-        this.instance.post(`/app/appepidemicpreventiongateway/list?size=10000`).then(res => {
-          if (res.code == 0) {
-            this.dictList = res.data.records.map(v => {
-              return {
-                dictName: v.name,
-                dictValue: v.id
-              }
-            })
-          }
-        })
-      },
-
       getList () {
         this.instance.post(`/app/appepidemicpreventionregisterinfo/list`, null, {
           params: {
@@ -222,7 +226,8 @@
       getTotalInfo () {
         this.instance.post(`/app/appepidemicpreventionregisterinfo/listStatistics`, null, {
           params: {
-            areaId: this.search.arriveAreaId
+            areaId: this.search.arriveAreaId,
+            infoType: 1
           }
         }).then(res => {
           if (res.code == 0) {