diff --git a/src/project/pingchang/AppCommunityManagement/Statistics.vue b/src/project/pingchang/AppCommunityManagement/Statistics.vue index 7cdf03a4..f8a5a78e 100644 --- a/src/project/pingchang/AppCommunityManagement/Statistics.vue +++ b/src/project/pingchang/AppCommunityManagement/Statistics.vue @@ -11,7 +11,7 @@
- + {{ areaName }} 地区选择 @@ -86,6 +86,7 @@ export default { backVal: 0, pointVal: 0, firstGet: true, //第一次请求 + cropAreaId: '' } }, computed: { ...mapState(['user']) }, @@ -93,11 +94,18 @@ export default { document.title = '排查统计' }, onLoad() { - this.areaId = this.user.areaId - this.areaName = this.user.areaName - this.getData() + this.getCropAreaId() }, methods: { + getCropAreaId() { + this.$http.post(`/app/appdvcpconfig/getCorpArea`).then((res) => { + if (res.code == 0) { + this.areaId = res.data + this.cropAreaId = res.data + this.getData() + } + }) + }, areaSelect(e) { this.areaId = e this.getData() diff --git a/src/project/pingchang/AppHealthReport/AppHealthReport.vue b/src/project/pingchang/AppHealthReport/AppHealthReport.vue index 6e9dd796..25e29099 100644 --- a/src/project/pingchang/AppHealthReport/AppHealthReport.vue +++ b/src/project/pingchang/AppHealthReport/AppHealthReport.vue @@ -99,8 +99,8 @@ export default { }, ], currentTabs: 0, - userList: [], - data: [{name: '123'}], + totalInfo: {}, + data: [], } }, computed: { @@ -110,13 +110,13 @@ export default { onLoad() { this.areaId = this.user.areaId this.areaName = this.user.areaName - // this.getList() - // this.getUserList() + this.getList() + this.getTotal() uni.$on('updateLists', () => { this.current = 1 this.getList() - this.getUserList() + this.getTotal() }) }, onShow() { @@ -125,7 +125,7 @@ export default { methods: { getList() { this.$http - .post('/app/appepidemicreportmember/list', null, { + .post('/app/appepidemicpreventionhealthreportinfo/list', null, { params: { size: this.size, current: this.current, status: this.currentTabs == 1 ? '0' : '', areaId: this.areaId, name: this.keyword }, }) .then((res) => { @@ -142,10 +142,10 @@ export default { }) }, - getUserList() { - this.$http.post(`/app/appepidemicreportmember/statistic?areaId=${this.areaId}`).then((res) => { + getTotal() { + this.$http.post(`/app/appepidemicpreventionhealthreportinfo/listStatistics?areaId=${this.areaId}`).then((res) => { if (res.code == 0) { - this.userList = res.data + // this.userList = res.data } }) }, @@ -159,7 +159,7 @@ export default { areaSelect(e) { this.areaId = e this.getList() - this.getUserList() + this.getTotal() }, change(index) { diff --git a/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue b/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue index cfdc588d..a4366593 100644 --- a/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue +++ b/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue @@ -21,6 +21,7 @@
{{$dict.getLabel('EP_registerPersonType', info.type)}}
+
异常情况记录
@@ -303,5 +304,10 @@ export default { color: #fff; } } + .line-bg{ + width: 100%; + height: 24px; + background-color: #F3F6F9; + } }