bug

project/pingchang/apps/AppBayonetRegistration/components/List.vue

@@ -12,8 +12,8 @@
           <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['居家监测'] || 0 }}</h2>
         </div>
         <div class="statistics-top__item">
           <span>居家隔离</span>

project/pingchang/apps/AppCommunityManagement/components/Detail.vue

@@ -15,7 +15,9 @@
               <!-- <ai-info-item label="对象类型" :value="dict.getLabel('EP_registerInfoType', info.infoType)"></ai-info-item> -->
               <ai-info-item label="身份证" :value="info.idNumber"></ai-info-item>
               <ai-info-item label="手机号" :value="info.phone"></ai-info-item>
-              <ai-info-item label="所属地区" :value="info.areaName" isLine></ai-info-item>
+              <ai-info-item label="抵平时间" :value="info.createTime"></ai-info-item>
+              <ai-info-item label="所属地区" :value="info.areaName"></ai-info-item>
+              <ai-info-item label="目的地详址" :value="info.arriveAddress"></ai-info-item>
               <ai-info-item label="居家状态" :value="dict.getLabel('EP_homeStatus2', info.homeStatus)"></ai-info-item>
               <ai-info-item label="隔离时间" :value="info.quarantineBeginTime ? info.quarantineBeginTime.split(' ')[0] + ' - ' + info.quarantineEndTime.split(' ')[0] : ''"></ai-info-item>
               <ai-info-item label="隔离策略 " :value="dict.getLabel('EP_quarantineStrategy', info.quarantineStrategy)"></ai-info-item>

project/pingchang/apps/AppCommunityManagement/components/List.vue

@@ -88,12 +88,13 @@
           { prop: 'name',  label: '管理对象', align: 'left' },
           { prop: 'phone', label: '手机号', align: 'center' },
           { prop: 'idNumber',  label: '身份证号', align: 'center' },
-          { prop: 'createTime', label: '排查时间', align: 'center' },
+          { prop: 'createTime', label: '抵平时间', align: 'center' },
           { prop: 'areaName',  label: '所属地区', align: 'center' },
+          { prop: 'arriveAddress',  label: '目的地详址', align: 'center' },
           { prop: 'status', label: '管理状态', align: 'center', formart: v => this.dict.getLabel('EP_CM_status', v) },
+          { prop: 'controllerUserName',  label: '管控人', align: 'center' },
           { prop: 'nucleicAcidSamplingCount',  label: '核酸状态', align: 'center', formart: v => v > 0 ? `核酸采集${v}次` : '待采' },
           // { prop: 'infoType', label: '对象来源', align: 'center', formart: v => this.dict.getLabel('EP_registerInfoType', v) },
-          { prop: 'controllerUserName',  label: '管控人', align: 'center' }
         ],
         tableData: []
       }

project/pingchang/apps/AppCommunityManagement/components/Statistics.vue

@@ -79,7 +79,7 @@
           <ai-empty v-if="false" style="height: 148px;"></ai-empty>
         </template>
       </ai-card>
-      <ai-card title="返乡数据统计">
+      <ai-card title="返乡数据统计" v-if="false">
         <template #right>
         </template>
         <template #content>
@@ -137,7 +137,7 @@
       this.loading = true
       this.$nextTick(() => {
         this.chart1 = echarts.init(document.querySelector('.chart1'))
-        this.chart2 = echarts.init(document.querySelector('.chart2'))
+        // this.chart2 = echarts.init(document.querySelector('.chart2'))
         window.addEventListener('resize', this.onResize)
         this.getInfo()
       })
@@ -210,7 +210,7 @@
         this.instance.post(`/app/appepidemicpreventioncommunitymanagement/statistics?areaId=${this.areaId}&beginTime=${this.beginTime || ''}&endTime=${this.endTime || ''}`).then(res => {
           if (res.code == 0) {
             this.initChart1(res.data.trend)
-            this.initChart2(res.data.sourceMap)
+            // this.initChart2(res.data.sourceMap)
             this.info = res.data.numberMap
             this.loading = false
           } else {