diff --git a/project/pingchang/apps/AppBayonetRegistration/components/List.vue b/project/pingchang/apps/AppBayonetRegistration/components/List.vue
index ed05da88..750dd70f 100644
--- a/project/pingchang/apps/AppBayonetRegistration/components/List.vue
+++ b/project/pingchang/apps/AppBayonetRegistration/components/List.vue
@@ -12,8 +12,8 @@
居家隔离
diff --git a/project/pingchang/apps/AppCommunityManagement/components/Detail.vue b/project/pingchang/apps/AppCommunityManagement/components/Detail.vue
index 42ca186c..e774a689 100644
--- a/project/pingchang/apps/AppCommunityManagement/components/Detail.vue
+++ b/project/pingchang/apps/AppCommunityManagement/components/Detail.vue
@@ -15,7 +15,9 @@
-
+
+
+
diff --git a/project/pingchang/apps/AppCommunityManagement/components/List.vue b/project/pingchang/apps/AppCommunityManagement/components/List.vue
index 1fa8080e..1b87f830 100644
--- a/project/pingchang/apps/AppCommunityManagement/components/List.vue
+++ b/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: []
}
diff --git a/project/pingchang/apps/AppCommunityManagement/components/Statistics.vue b/project/pingchang/apps/AppCommunityManagement/components/Statistics.vue
index cffe811b..6ef6c32e 100644
--- a/project/pingchang/apps/AppCommunityManagement/components/Statistics.vue
+++ b/project/pingchang/apps/AppCommunityManagement/components/Statistics.vue
@@ -79,7 +79,7 @@
-
+
@@ -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 {