From 729fa0a147a65edeee8367dc337082d3033450c0 Mon Sep 17 00:00:00 2001 From: liuye Date: Wed, 28 Sep 2022 17:50:52 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppCheckpointRegistration.vue | 66 +++++++++++-------- .../AppCheckpointRegistration/UserInfo.vue | 1 + 2 files changed, 39 insertions(+), 28 deletions(-) diff --git a/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue b/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue index 451b3290..60737a3a 100644 --- a/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue +++ b/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue @@ -39,30 +39,22 @@ -
- -
-
-

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

-

{{item.idNumber}}

-

{{item.startAreaName}}

-

{{item.arriveAreaName}}

-

{{item.arriveTime}}

- -
-
-
处置人：{{item.handleUserName}}
-
+
+
+
+

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

+

{{item.idNumber}}

+

{{item.startAreaName}}

+

{{item.arriveAreaName}}

+

{{item.arriveTime}}

+
- +
+
处置人：{{item.handleUserName}}
+
+
@@ -81,6 +73,7 @@ export default { areaName: '', tabIndex: 0, current: 1, + pages: 2, list: [], totalInfo: {}, keyword: '', @@ -133,10 +126,21 @@ export default { this.$http.post(`/app/appepidemicpreventionregisterinfo/list?infoType=0¤t=${this.current}&size=10&listType=${this.tabIndex}&gatewayId=${this.gatewayId}&name=${this.keyword}&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 + + 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 } }) }, @@ -312,6 +316,7 @@ export default { .item{ background-color: #fff; border-radius: 16px; + margin-bottom: 24px; .top { padding: 32px 32px 24px; position: relative; @@ -344,6 +349,11 @@ export default { .status2 { color: #f46; } + .del-btn { + display: inline-block; + color: #f46; + margin-left: 24px; + } } p{ width: calc(100% - 200px); @@ -402,7 +412,7 @@ export default { } } .gateway-name { - width: calc(100% - 48px); + max-width: calc(100% - 48px); word-break: break-all; overflow: hidden; text-overflow: ellipsis; diff --git a/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue b/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue index 85fce126..3dd76687 100644 --- a/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue +++ b/src/project/pingchang/AppCheckpointRegistration/UserInfo.vue @@ -223,6 +223,7 @@ export default { uni.$on('updateDetail', () => { this.getDetail() }) + uni.$emit('updateList') }, methods: { getDetail() { From 4f9e539f54be1126ce598b86db4f750ee7455c61 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 29 Sep 2022 08:47:28 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=8D=A1=E5=8F=A3=E7=99=BB=E8=AE=B0=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppCheckpointRegistration.vue | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue b/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue index 60737a3a..e7065465 100644 --- a/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue +++ b/src/project/pingchang/AppCheckpointRegistration/AppCheckpointRegistration.vue @@ -43,9 +43,12 @@

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

-

{{item.idNumber}}

+

+ {{item.idNumber}} + +

{{item.startAreaName}}

{{item.arriveAreaName}}

{{item.arriveTime}}

@@ -349,11 +352,6 @@ export default { .status2 { color: #f46; } - .del-btn { - display: inline-block; - color: #f46; - margin-left: 24px; - } } p{ width: calc(100% - 200px); @@ -369,6 +367,15 @@ export default { 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); From db191b7c097160ca29d06a4197bc297ffae73009 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 29 Sep 2022 08:59:21 +0800 Subject: [PATCH 3/6] css --- .../pingchang/AppCommunityManagement/Statistics.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/project/pingchang/AppCommunityManagement/Statistics.vue b/src/project/pingchang/AppCommunityManagement/Statistics.vue index 5075a337..99d1cbbf 100644 --- a/src/project/pingchang/AppCommunityManagement/Statistics.vue +++ b/src/project/pingchang/AppCommunityManagement/Statistics.vue @@ -4,13 +4,13 @@
-
+
{{ beginDate }} 至 {{ endDate }} 日期选择
-
+
{{ areaName }} 地区选择 @@ -231,6 +231,13 @@ export default { display: flex; justify-content: space-between; padding: 32px; + .time-select{ + width: 400px; + } + .area-select { + width: calc(100% - 400px); + text-align: right; + } h2 { font-size: 36px; font-family: PingFang-SC-Heavy, PingFang-SC; From 53f5df58b6dce97fb3bf862f9ce859b990e2eeaf Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 29 Sep 2022 09:04:28 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=BB=98=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pingchang/AppCommunityManagement/Statistics.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/project/pingchang/AppCommunityManagement/Statistics.vue b/src/project/pingchang/AppCommunityManagement/Statistics.vue index 99d1cbbf..7cdf03a4 100644 --- a/src/project/pingchang/AppCommunityManagement/Statistics.vue +++ b/src/project/pingchang/AppCommunityManagement/Statistics.vue @@ -84,7 +84,8 @@ export default { endDate: '', showDateSelect: false, backVal: 0, - pointVal: 0 + pointVal: 0, + firstGet: true, //第一次请求 } }, computed: { ...mapState(['user']) }, @@ -115,7 +116,14 @@ export default { getData() { this.$http.post(`/app/appepidemicpreventioncommunitymanagement/statistics?areaId=${this.areaId}&beginTime=${this.beginDate}&endTime=${this.endDate}`).then((res) => { if (res.code == 0) { + if(this.firstGet) { + var myDate = new Date(); + this.beginDate = myDate.getFullYear() + res.data.trend[0].ymd + this.endDate = myDate.getFullYear() + res.data.trend[6].ymd + this.firstGet = false + } this.info = res.data + var xData = [], yDataScreening = [], yDataNucleicAcid = [] res.data.trend.map((item) => { xData.push(item.ymd) From c429195369665d7a9007c879c8c91de19ffea08d Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 29 Sep 2022 09:31:50 +0800 Subject: [PATCH 5/6] id --- .../pingchang/AppCheckpointRegistration/RiskContent.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue b/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue index a9b785c9..e3f60af7 100644 --- a/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue +++ b/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue @@ -207,9 +207,8 @@ export default { this.areaId = this.user.areaId this.areaName = this.user.areaName this.$dict.load('yesOrNo', 'EP_registerPersonType', 'EP_travelType', 'EP_abnormalType', 'epidemicTouchInFourteen', 'EP_homeStatus2', 'EP_quarantineStrategy', 'EP_communityHandleType').then(() => { - // this.id = option.id + this.id = option.id this.handleTypeList = this.$dict.getDict('EP_communityHandleType') - this.id = '5ba23169ca3f46fe86c17a7e0af366b9' this.getDetail() }) From 6ecbadd2a88cc6bf2fde53b68295ce2e2a097ef9 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 29 Sep 2022 09:34:31 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=A4=84=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pingchang/AppCheckpointRegistration/RiskContent.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue b/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue index e3f60af7..2ae261e7 100644 --- a/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue +++ b/src/project/pingchang/AppCheckpointRegistration/RiskContent.vue @@ -237,7 +237,9 @@ export default { this.$u.toast('提交成功') uni.$emit('updateDetail') uni.$emit('updateList') - uni.navigateBack() + setTimeout(() => { + uni.navigateTo({ url: './AppCheckpointRegistration' }) + }, 600) } }).catch((err) => { this.$u.toast(err)