From 6f5f17ecfad17e58e25bd614126771124d95c275 Mon Sep 17 00:00:00 2001 From: liuye Date: Mon, 10 Oct 2022 10:23:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E5=9B=BE=E7=89=87=20?= =?UTF-8?q?=E6=94=BE=E5=BC=80=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppCheckpointRegistration.vue | 2 +- .../pingchang/AppCommunityManagement/Add.vue | 10 +- .../AppCommunityManagement/Detail.vue | 4 +- .../AppReturnHomeReporting.vue | 330 +++++++--- .../AppReturnHomeReporting/ErrorInfo.vue | 172 +++--- .../AppReturnHomeReporting/RiskContent.vue | 581 ++++++++++++++++++ .../AppReturnHomeReporting/UserInfo.vue | 273 +++++--- .../components/img/status0.png | Bin 0 -> 28531 bytes .../components/img/status1.png | Bin 0 -> 29016 bytes .../components/img/status2.png | Bin 0 -> 28916 bytes .../components/img/status3.png | Bin 0 -> 29166 bytes .../components/img/status4.png | Bin 0 -> 29020 bytes .../components/img/status5.png | Bin 0 -> 32043 bytes .../components/img/status6.png | Bin 0 -> 28192 bytes 14 files changed, 1127 insertions(+), 245 deletions(-) create mode 100644 src/project/pingchang/AppReturnHomeReporting/RiskContent.vue create mode 100644 src/project/pingchang/AppReturnHomeReporting/components/img/status0.png create mode 100644 src/project/pingchang/AppReturnHomeReporting/components/img/status1.png create mode 100644 src/project/pingchang/AppReturnHomeReporting/components/img/status2.png create mode 100644 src/project/pingchang/AppReturnHomeReporting/components/img/status3.png create mode 100644 src/project/pingchang/AppReturnHomeReporting/components/img/status4.png create mode 100644 src/project/pingchang/AppReturnHomeReporting/components/img/status5.png create mode 100644 src/project/pingchang/AppReturnHomeReporting/components/img/status6.png diff --git a/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue b/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue index 2ccac925..92287fc4 100644 --- a/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue +++ b/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue @@ -172,7 +172,7 @@ export default { }) }, getTotal() { - this.$http.post(`/app/appepidemicpreventionregisterinfo/listStatistics?areaId=${this.areaId}`).then((res) => { + this.$http.post(`/app/appepidemicpreventionregisterinfo/listStatistics?areaId=${this.areaId}&infoType=0`).then((res) => { if (res.code == 0) { this.totalInfo = res.data } diff --git a/src/project/pingchang/AppCommunityManagement/Add.vue b/src/project/pingchang/AppCommunityManagement/Add.vue index 036de2fa..9f666509 100644 --- a/src/project/pingchang/AppCommunityManagement/Add.vue +++ b/src/project/pingchang/AppCommunityManagement/Add.vue @@ -101,7 +101,7 @@ - +
解除管理
@@ -181,9 +181,9 @@ export default { if( !this.form.fileList.length) { return this.$u.toast('请上传图片') } - // if(status == 1 && !this.form.proveFileList.length) { - // return this.$u.toast('请上传核酸阴性证明图片') - // } + if(status == 1 && !this.form.proveFileList.length) { + return this.$u.toast('请上传核酸阴性证明图片') + } this.$confirm(status == 2 ? '确认解除管理该记录' : '确认保存该记录').then(() => { this.confirmSubmit(status) diff --git a/src/project/pingchang/AppCommunityManagement/Detail.vue b/src/project/pingchang/AppCommunityManagement/Detail.vue index 3ed3f450..dda71122 100644 --- a/src/project/pingchang/AppCommunityManagement/Detail.vue +++ b/src/project/pingchang/AppCommunityManagement/Detail.vue @@ -59,14 +59,14 @@
- +
diff --git a/src/project/pingchang/AppReturnHomeReporting/AppReturnHomeReporting.vue b/src/project/pingchang/AppReturnHomeReporting/AppReturnHomeReporting.vue index 43534573..0040148e 100644 --- a/src/project/pingchang/AppReturnHomeReporting/AppReturnHomeReporting.vue +++ b/src/project/pingchang/AppReturnHomeReporting/AppReturnHomeReporting.vue @@ -3,48 +3,60 @@
-

{{totalInfo.total}}

+

{{totalInfo['登记人数']}}

返乡人员

-

{{totalInfo.today}}

+

{{totalInfo['今日新增返乡']}}

今日返乡

-

{{totalInfo.todayUnusual}}

-

今日异常

+

{{totalInfo['今日风险人数']}}

+

今日风险

-

{{totalInfo.release}}

-

异常处理

+

{{totalInfo['风险处理']}}

+

风险处理

+
+
返乡人员
+
风险人员
+
- + {{ areaName }} 请选择
- -
-
-
返乡人员
-
异常人员
+
-
-
-

{{item.name}}有异常

-

{{item.idNumber}}

-

{{item.startAreaName}}

-

{{item.arriveAreaName}}

-

{{item.arriveTime}}

+
+
+
+

{{item.name}} +
{{ $dict.getLabel('EP_riskLevel', item.riskLevel) }}
+

+

+ {{item.idNumber}} + +

+

{{item.startAreaName}}

+

{{item.arriveAreaName}}

+

{{item.arriveTime}}

+ +
+
+
处置人：{{item.handleUserName}}
+
+
@@ -56,29 +68,111 @@ export default { appName: '返乡报备', data() { return { + cropAreaId: '', areaId: '', areaName: '', tabIndex: 0, current: 1, + pages: 2, list: [], - name: '', - totalInfo: {} + totalInfo: {}, + keyword: '', + gatewayId: '', + gatewayName: '', + showGateSelect: false, + gateList: [], + statusImgList: [ + require('./components/img/status0.png'), + require('./components/img/status1.png'), + require('./components/img/status2.png'), + require('./components/img/status3.png'), + require('./components/img/status4.png'), + require('./components/img/status5.png'), + require('./components/img/status6.png'), + ], + options: [ + { + text: '删除', + style: { + backgroundColor: '#dd524d' + } + } + ] } }, computed: { ...mapState(['user']) }, created() { - this.areaId = this.user.areaId - this.areaName = this.user.areaName + // this.areaId = this.user.areaId + // this.areaName = this.user.areaName + this.getCropAreaId() + this.$dict.load(['EP_handleType', 'EP_riskLevel']).then(() => { + this.getList() + this.getTotal() + }) }, onShow() { document.title = '返乡报备' - this.getList() - this.getTotal() uni.$on('updateList', () => { this.getListInit() }) }, methods: { + getCropAreaId() { + this.$http.post(`/app/appdvcpconfig/getCorpArea`).then((res) => { + if (res.code == 0) { + this.areaId = res.data + this.cropAreaId = res.data + } + }) + }, + getListInit() { + this.current = 1 + this.list = [] + this.getList() + }, + getList() { + this.$http.post(`/app/appepidemicpreventionregisterinfo/list?infoType=1¤t=${this.current}&size=10&listType=${this.tabIndex}&gatewayId=${this.gatewayId}&name=${this.keyword}&arriveAreaId=${this.areaId}`) + .then((res) => { + if (res.code == 0) { + + this.list = this.current > 1 ? [...this.list, ...res.data.records.map(v => { + return { + ...v, + show: false, + idNumber: v.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2") + } + })] : res.data.records.map(v => { + return { + ...v, + show: false, + idNumber: v.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2") + } + }) + this.pages = res.data.pages + } + }) + }, + del(id) { + this.$confirm(`确认删除该数据`).then(() => { + this.$http.post(`/app/appepidemicpreventionregisterinfo/delete?id=${id}`).then((res) => { + if (res.code == 0) { + this.$u.toast('删除成功') + this.getListInit() + }else { + this.$u.toast(res.msg) + } + }).catch((err) => { + this.$u.toast(err) + }) + }) + }, + getTotal() { + this.$http.post(`/app/appepidemicpreventionregisterinfo/listStatistics?areaId=${this.areaId}&infoType=1`).then((res) => { + if (res.code == 0) { + this.totalInfo = res.data + } + }) + }, areaSelect(e) { this.areaId =e this.$nextTick(() => { @@ -90,36 +184,12 @@ export default { this.tabIndex = index this.getListInit() }, - getListInit() { - this.current = 1 - this.list = [] - this.getList() - }, - getList() { - var status = '' - if(this.tabIndex == 1) { - status = 0 - } - this.$http.post(`/app/appepidemicbackhomerecord/list?current=${this.current}&size=10&status=${status}&name=${this.name}&arriveAreaId=${this.areaId}`) - .then((res) => { - if (res.code == 0) { - res.data.records.map((item) => { - item.idNumber = item.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2") - }) - this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records - } - }) - }, - getTotal() { - this.$http.post(`/app/appepidemicbackhomerecord/statistic?areaId=${this.areaId}`).then((res) => { - if (res.code == 0) { - this.totalInfo = res.data - } - }) - }, toUser(row) { uni.navigateTo({url: `./UserInfo?id=${row.id}`}) - } + }, + onClick(index) { + this.del(this.list[index].id) + }, }, onReachBottom() { this.current ++ @@ -200,47 +270,115 @@ export default { } } } - .user-list{ - background-color: #f5f5f5; - .item{ - padding: 32px 64px 24px; - background-color: #fff; - margin-bottom: 8px; - .name{ - font-size: 36px; - font-family: PingFangSC-Medium, PingFang SC; + .top-search { + padding: 20px 32px; + background-color: #fff; + } + .top-select { + display: flex; + padding: 28px 0; + background-color: #fff; + .item { + flex: 1; + padding: 0 8px; + text-align: center; + span { + display: inline-block; + font-family: PingFangSC-Medium; font-weight: 500; - color: #333; - line-height: 50px; - margin-bottom: 8px; - .status{ - float: right; + font-size: 28px; + color: #666; + line-height: 40px; + } + } + } + .user-list{ + background-color: #F3F6F9; + padding: 32px 32px 0; + .item{ + background-color: #fff; + border-radius: 16px; + margin-bottom: 24px; + .top { + padding: 32px 32px 24px; + position: relative; + .status-img{ + width: 200px; + height: 200px; + position: absolute; + bottom: 0; + right: 0; + } + .name{ + font-size: 36px; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #333; + line-height: 50px; + margin-bottom: 8px; + .status{ + float: right; + font-size: 28px; + font-family: PingFangSC-Regular, PingFang SC; + line-height: 40px; + } + .status0 { + color: #00D25D; + } + .status1 { + color: #FF6300; + } + .status2 { + color: #f46; + } + } + p{ + width: calc(100% - 200px); font-size: 28px; font-family: PingFangSC-Regular, PingFang SC; - color: #FF4466; + color: #333; line-height: 40px; + margin-bottom: 8px; + img{ + width: 32px; + height: 32px; + margin-right: 18px; + vertical-align: top; + } + } + .idnumber-flex { + width: 100%; + display: flex; + justify-content: space-between; + .del-btn { + display: inline-block; + padding: 8px; + } + } + .start-name{ + display: inline-block; + width: calc(100% - 50px); + } + .color-999{ + margin-bottom: 24px; + color: #999; } } - p{ - font-size: 28px; - font-family: PingFangSC-Regular, PingFang SC; - color: #333; - line-height: 40px; - margin-bottom: 8px; - img{ - width: 32px; - height: 32px; - margin-right: 18px; - vertical-align: top; + .bottom { + border-top: 2px solid #D8DDE6; + padding: 32px; + .text { + line-height: 40px; + font-family: PingFangSC-Regular; + font-size: 28px; + color: #666; + letter-spacing: 0.58px; + } + span { + display: inline-block; + color: #3975C6; + margin-right: 32px; } - } - .start-name{ - display: inline-block; - width: calc(100% - 50px); - } - .color-999{ - margin-bottom: 24px; - color: #999; } } } @@ -259,5 +397,23 @@ export default { } } } + .gateway-name { + max-width: calc(100% - 48px); + word-break: break-all; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + font-family: PingFangSC-Medium; + font-weight: 500; + font-size: 28px; + color: #666; + line-height: 40px; + } + .gateway-type { + display: flex; + justify-content: center; + } } diff --git a/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue b/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue index c094efe0..950df7bf 100644 --- a/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue +++ b/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue @@ -1,18 +1,30 @@