From 64b816b648f098ab886c451166b85c5df610488d Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 13 Jan 2022 14:41:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=96=AB=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEpidemicSituation/BackUserList.vue | 2 +- src/apps/AppGridManagement/Organization.vue | 22 +- src/apps/AppGridManagement/SelectGird.vue | 131 +---- src/apps/AppGridManagement/SetGird.vue | 448 ++++++++++++++++++ 4 files changed, 468 insertions(+), 135 deletions(-) create mode 100644 src/apps/AppGridManagement/SetGird.vue diff --git a/src/apps/AppEpidemicSituation/BackUserList.vue b/src/apps/AppEpidemicSituation/BackUserList.vue index 669397d0..6dff6fee 100644 --- a/src/apps/AppEpidemicSituation/BackUserList.vue +++ b/src/apps/AppEpidemicSituation/BackUserList.vue @@ -100,7 +100,7 @@ export default { }) }, getTotal() { - this.$http.post(`/app/appepidemicbackhomerecord/statistic`).then((res) => { + this.$http.post(`/app/appepidemicbackhomerecord/statistic?areaId=${this.areaId}`).then((res) => { if (res.code == 0) { this.totalInfo = res.data } diff --git a/src/apps/AppGridManagement/Organization.vue b/src/apps/AppGridManagement/Organization.vue index ad0348d7..0e4eba5b 100644 --- a/src/apps/AppGridManagement/Organization.vue +++ b/src/apps/AppGridManagement/Organization.vue @@ -2,11 +2,11 @@
-
- 南湖街道网格一 +
+ {{userGird.girdName}}
- 网格配置 + 网格配置
网格人员
@@ -34,13 +34,27 @@ export default { data() { return { - + userGird: {} } }, onShow() { document.title = '网格管理' }, + mounted() { + this.isGirdUser() + }, methods: { + isGirdUser() { + this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => { + if (res.code == 0) { + if (res.data.checkType) { + this.userGird = res.data.appGirdInfo + } else { + this.$u.toast('当前人员不是网格员或网格管理员') + } + } + }) + }, linkTo(url) { uni.navigateTo({url}) } diff --git a/src/apps/AppGridManagement/SelectGird.vue b/src/apps/AppGridManagement/SelectGird.vue index db7b4b7b..fb02872e 100644 --- a/src/apps/AppGridManagement/SelectGird.vue +++ b/src/apps/AppGridManagement/SelectGird.vue @@ -4,12 +4,11 @@
/{{item.girdName}}
-
- + @@ -24,59 +23,11 @@
- -
-
-
-
- - - - -
- -
-
{{ e.name }}
-
{{ e.phone }}
-
-
-
- - -
-
确定选择
- -
-
-
{{ form.girdName }}
-
- 网格类型 - {{ }} -
-
- 网格层级 - {{ }} -
-
- 网格负责人 - {{ }} -
-
- 网格员 - {{ }} -
-
- 删除网格 - 编辑网格 -
-
- -
@@ -90,9 +41,6 @@ export default { treeList: [], slectList: [], userList: [], - - show: true, - form: {} } }, onLoad() { @@ -363,82 +311,5 @@ export default { } } - .popup { - padding: 0 32px 16px; - - .bg { - width: 64px; - height: 10px; - background: #CCC; - border-radius: 6px; - margin: 32px 0 32px 344px; - } - - .title { - font-size: 36px; - font-family: PingFang-SC-Heavy, PingFang-SC; - font-weight: 800; - color: #333; - line-height: 50px; - margin-bottom: 24px; - } - - .info-flex { - padding: 26px 0 30px 0; - width: 100%; - border-bottom: 1px solid #D8DDE6; - line-height: 40px; - font-size: 28px; - - .label { - display: inline-block; - width: 160px; - font-weight: 800; - color: #333; - } - - .value { - color: #666; - font-size: 26px; - - .phone-icon { - width: 40px; - height: 40px; - vertical-align: sub; - margin-left: 16px; - } - } - } - .border-b0{ - border-bottom: 0; - } - .btn{ - padding: 32px 0; - background-color: #fff; - display: flex; - span{ - display: inline-block; - height: 92px; - line-height: 90px; - border-radius: 8px; - font-size: 34px; - font-family: PingFangSC-Medium, PingFang SC; - font-weight: 500; - box-sizing: border-box; - text-align: center; - } - .del{ - color: #f46; - border: 1px solid #f46; - flex: 1; - margin-right: 32px; - } - .edit{ - background-color: #3671EE; - color: #fff; - flex: 2; - } - } - } } diff --git a/src/apps/AppGridManagement/SetGird.vue b/src/apps/AppGridManagement/SetGird.vue new file mode 100644 index 00000000..7b86930e --- /dev/null +++ b/src/apps/AppGridManagement/SetGird.vue @@ -0,0 +1,448 @@ + + + + + From 2fdba74d87220bbd45b00c4d962c859b45a951bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Thu, 13 Jan 2022 14:52:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BF=BB=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppEpidemicSituation/ErrorDetail.vue | 16 +++++++++++-- .../AppEpidemicSituation/HealthDetail.vue | 24 +++++++++++++++---- src/apps/AppEpidemicSituation/UserDetail.vue | 2 +- 3 files changed, 34 insertions(+), 8 deletions(-) diff --git a/src/apps/AppEpidemicSituation/ErrorDetail.vue b/src/apps/AppEpidemicSituation/ErrorDetail.vue index 95f7810e..31120e71 100644 --- a/src/apps/AppEpidemicSituation/ErrorDetail.vue +++ b/src/apps/AppEpidemicSituation/ErrorDetail.vue @@ -108,6 +108,8 @@ export default { userList: [], data: [], datas: [], + size: 10, + current: 1, } }, computed: { @@ -152,7 +154,7 @@ export default { .post(`/app/appepidemichealthreport/list?memberId=${this.id}`) .then((res) => { if (res.code == 0) { - this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records + this.datas = res.data.records this.$hideLoading() } else { this.$hideLoading() @@ -167,7 +169,13 @@ export default { getRecord() { this.$loading() this.$http - .post(`/app/appepidemicunusuallog/list?recordId=${this.id}`) + .post(`/app/appepidemicunusuallog/list`, null, { + params: { + recordId: this.id, + size: this.size, + current: this.current, + }, + }) .then((res) => { if (res.code == 0) { this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records @@ -222,6 +230,10 @@ export default { uni.makePhoneCall({ phoneNumber: phone }) }, }, + onReachBottom() { + this.current++ + this.getRecord() + }, } diff --git a/src/apps/AppEpidemicSituation/HealthDetail.vue b/src/apps/AppEpidemicSituation/HealthDetail.vue index 81b326f8..ca1acb52 100644 --- a/src/apps/AppEpidemicSituation/HealthDetail.vue +++ b/src/apps/AppEpidemicSituation/HealthDetail.vue @@ -68,6 +68,8 @@ export default { userList: [], diffNum: '', today: '', + size: 10, + current: 1, } }, computed: { @@ -104,11 +106,19 @@ export default { }, getRecord() { - this.$http.post(`/app/appepidemichealthreport/list?memberId=${this.id}`).then((res) => { - if (res.code == 0) { - this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records - } - }) + this.$http + .post(`/app/appepidemichealthreport/list`, null, { + params: { + memberId: this.id, + size: this.size, + current: this.current, + }, + }) + .then((res) => { + if (res.code == 0) { + this.data = this.current > 1 ? [...this.data, ...res.data.records] : res.data.records + } + }) }, callPhone(phone) { @@ -127,6 +137,10 @@ export default { }) }, }, + onReachBottom() { + this.current++ + this.getRecord() + }, } diff --git a/src/apps/AppEpidemicSituation/UserDetail.vue b/src/apps/AppEpidemicSituation/UserDetail.vue index c75ed550..a9e6e8ef 100644 --- a/src/apps/AppEpidemicSituation/UserDetail.vue +++ b/src/apps/AppEpidemicSituation/UserDetail.vue @@ -179,7 +179,7 @@ export default { .post(`/app/appepidemicunusuallog/list?recordId=${this.userList.memberId}`) .then((res) => { if (res.code == 0) { - this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records + this.datas = res.data.records this.$hideLoading() } else { this.$hideLoading() From c97c96048ba45981997f90dc996ab9a34584453d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Thu, 13 Jan 2022 15:03:08 +0800 Subject: [PATCH 3/3] css --- src/apps/AppEpidemicSituation/HealthDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/AppEpidemicSituation/HealthDetail.vue b/src/apps/AppEpidemicSituation/HealthDetail.vue index ca1acb52..64bbc2f1 100644 --- a/src/apps/AppEpidemicSituation/HealthDetail.vue +++ b/src/apps/AppEpidemicSituation/HealthDetail.vue @@ -147,7 +147,7 @@ export default {