From ea35ab1ee21e708b4cecf47d0af80632fae3b550 Mon Sep 17 00:00:00 2001 From: liuye Date: Tue, 11 Oct 2022 17:34:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppHealthReport/AppHealthReport.vue | 95 ++-- .../pingchang/AppHealthReport/Content.vue | 482 ------------------ .../pingchang/AppHealthReport/Detail.vue | 462 ++++++++--------- .../pingchang/AppHealthReport/ErrorInfo.vue | 323 ++++++++++++ .../pingchang/AppHealthReport/UserList.vue | 204 ++++++++ .../AppReturnHomeReporting/ErrorInfo.vue | 4 +- .../AppReturnHomeReporting/UserInfo.vue | 2 - 7 files changed, 796 insertions(+), 776 deletions(-) delete mode 100644 src/project/pingchang/AppHealthReport/Content.vue create mode 100644 src/project/pingchang/AppHealthReport/ErrorInfo.vue create mode 100644 src/project/pingchang/AppHealthReport/UserList.vue diff --git a/src/project/pingchang/AppHealthReport/AppHealthReport.vue b/src/project/pingchang/AppHealthReport/AppHealthReport.vue index 25e29099..f2869ec1 100644 --- a/src/project/pingchang/AppHealthReport/AppHealthReport.vue +++ b/src/project/pingchang/AppHealthReport/AppHealthReport.vue @@ -3,20 +3,16 @@
-

{{ userList.today }}

+

{{ totalInfo['上报人员'] }}

+

上报人员

+
+
+

{{ totalInfo['今日上报'] }}

今日上报

-
-
-

{{ userList.unReport }}

-

今日未报

-

{{ userList.total }}

-

当前正常

-
-
-

{{ userList.unusual }}

-

当前异常

+

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

+

今日风险

@@ -24,7 +20,7 @@
- + {{ areaName }} 请选择 @@ -44,30 +40,25 @@
- - diff --git a/src/project/pingchang/AppHealthReport/Detail.vue b/src/project/pingchang/AppHealthReport/Detail.vue index ec8b46e5..31972097 100644 --- a/src/project/pingchang/AppHealthReport/Detail.vue +++ b/src/project/pingchang/AppHealthReport/Detail.vue @@ -1,34 +1,91 @@ @@ -38,276 +95,205 @@ import { mapState } from 'vuex' export default { data() { return { - show: false, - value: '', id: '', - list: [], - info: {} + info: {}, + userName: '', } }, - computed: { - ...mapState(['user']), - }, + computed: { ...mapState(['user']) }, onShow() { - document.title = '异常情况处理' + document.title = this.userName + '的上报' }, onLoad(option) { - // this.id = option.id - this.id = '5173745c3c00452a9346d1c559266982' - this.$dict.load('epidemicRecentHealth').then(() => { + this.$dict.load('EP_abnormalType', 'epidemicTouchInFourteen', 'EP_nucleicAcidResult', 'EP_jkmType', 'EP_vaccinationCount').then(() => { + this.id = option.id this.getDetail() }) - this.getList() + uni.$on('updateDetail', () => { + this.getDetail() + }) + uni.$emit('updateList') + this.userName = option.name }, methods: { - getList() { - this.$http.post(`/app/appepidemicunusuallog/list?recordId=${this.id}`).then((res) => { - if (res.code == 0) { - this.list = res.data.records - } - }) - }, getDetail() { - this.$http.post(`/app/appepidemicbackhomerecord/queryDetailById?id=${this.id}`).then((res) => { + this.$http.post(`/app/appepidemicpreventionhealthreportinfo/queryDetailById?id=${this.id}`).then((res) => { if (res.code == 0) { - res.data.idNumber = res.data.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2") this.info = res.data - this.info.health = this.info.health.split(',') - } - }) - }, - cancel() { - this.$confirm(`是否解除该条异常信息？`).then(() => { - this.$http.post("/app/appepidemicbackhomerecord/release", {id: this.id}).then(res => { - if (res.code == 0) { - this.$u.toast("解除成功!") - uni.$emit('updateDetail') - uni.$emit('updateList') - setTimeout(() => { - uni.navigateBack() - }, 600); - } - }) - }) - }, - confirm() { - if(!this.value) { - return this.$u.toast('请输入异常情况') - } - - var params = { - "content": this.value, - "createUserId": this.user.id, - "createUserName": this.user.name, - "recordId": this.id - } - this.$http.post("/app/appepidemicunusuallog/addOrUpdate", params).then(res => { - if (res.code == 0) { - this.$u.toast("新增成功!") - this.show = false - this.value = '' - this.getList() + this.info.reportUser.idNumberText = this.info.reportUser.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2") } }) }, callPhone(phone) { uni.makePhoneCall({phoneNumber: phone}) }, - toContent() { - uni.navigateTo({url: './Content'}) + previewImage(img) { + var imgs = [{url: img}] + uni.previewImage({ + urls: imgs.map(v => v.url), + current: img + }) + }, + toError() { + uni.navigateTo({url: `./ErrorInfo?id=${this.info.reportUser.id}`}) } }, } - diff --git a/src/project/pingchang/AppHealthReport/ErrorInfo.vue b/src/project/pingchang/AppHealthReport/ErrorInfo.vue new file mode 100644 index 00000000..e35c625e --- /dev/null +++ b/src/project/pingchang/AppHealthReport/ErrorInfo.vue @@ -0,0 +1,323 @@ + + + + + diff --git a/src/project/pingchang/AppHealthReport/UserList.vue b/src/project/pingchang/AppHealthReport/UserList.vue new file mode 100644 index 00000000..d6fd7764 --- /dev/null +++ b/src/project/pingchang/AppHealthReport/UserList.vue @@ -0,0 +1,204 @@ + + + + + diff --git a/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue b/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue index 4c78c6fa..6807ff8b 100644 --- a/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue +++ b/src/project/pingchang/AppReturnHomeReporting/ErrorInfo.vue @@ -23,7 +23,7 @@
-
异常情况记录
+
风险处置意见

{{item.remarks}}

@@ -56,8 +56,6 @@ import { mapState } from 'vuex' export default { - components: {}, - props: {}, data() { return { show: false, diff --git a/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue b/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue index 0583e339..dab932bb 100644 --- a/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue +++ b/src/project/pingchang/AppReturnHomeReporting/UserInfo.vue @@ -135,7 +135,6 @@ export default { return { id: '', info: {}, - // haveHomeQuarantineBtn: false, // 是否重新处置 true屏蔽居家两种隔离 } }, computed: { ...mapState(['user']) }, @@ -146,7 +145,6 @@ export default { this.$dict.load('yesOrNo', 'EP_registerPersonType', 'EP_travelType', 'EP_abnormalType', 'epidemicTouchInFourteen', 'EP_highRiskIndustries', 'EP_handleType', 'EP_quarantineAddress', 'EP_homeStatus', 'EP_quarantineStrategy', 'EP_controlMethod', 'EP_handoverObject', 'EP_handoverMethod').then(() => { this.id = option.id - // this.haveHomeQuarantineBtn = option.operation == 'reDisposal' ? true : false this.getDetail() }) uni.$on('updateDetail', () => {