From d0e517cfcc8e4120f42ea80b81d3d25c59a3bf39 Mon Sep 17 00:00:00 2001 From: liuye Date: Fri, 11 Feb 2022 10:05:02 +0800 Subject: [PATCH 1/8] bug --- src/saas/AppBackUserList/AppBackUserList.vue | 19 +++++++++++++++--- src/saas/AppBackUserList/ErrorInfo.vue | 2 +- src/saas/AppBackUserList/UserInfo.vue | 2 +- src/saas/AppGridManagement/AddGird.vue | 5 ++--- .../AppGridManagement/AppGridManagement.vue | 15 +++++++++++--- src/saas/AppGridManagement/FamilyList.vue | 9 +++++++++ src/saas/AppGridManagement/Map.vue | 8 ++++---- src/saas/AppHealthUp/OtherStatistics.vue | 4 ++-- src/saas/AppWalkask/AppWalkask.vue | 20 +++++++++---------- 9 files changed, 57 insertions(+), 27 deletions(-) diff --git a/src/saas/AppBackUserList/AppBackUserList.vue b/src/saas/AppBackUserList/AppBackUserList.vue index 51818b0a..634226ce 100644 --- a/src/saas/AppBackUserList/AppBackUserList.vue +++ b/src/saas/AppBackUserList/AppBackUserList.vue @@ -3,9 +3,9 @@
- -
- {{girdName}} +
+ +
{{girdName}}
@@ -393,6 +393,19 @@ export default { color: #3F8DF5; line-height: 48px; } + .gird-name-div{ + display: inline-block; + width: 100%; + padding-left: 0; + } + .gird-name{ + display: inline-block; + max-width: calc(100% - 80px); + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + vertical-align: middle; + } } .empty{ text-align: center; diff --git a/src/saas/AppBackUserList/ErrorInfo.vue b/src/saas/AppBackUserList/ErrorInfo.vue index c094efe0..11385e42 100644 --- a/src/saas/AppBackUserList/ErrorInfo.vue +++ b/src/saas/AppBackUserList/ErrorInfo.vue @@ -15,7 +15,7 @@

{{item.content}}

{{item.createTime}} - {{item.createUserName}} +
diff --git a/src/saas/AppBackUserList/UserInfo.vue b/src/saas/AppBackUserList/UserInfo.vue index 584e4ba1..47205017 100644 --- a/src/saas/AppBackUserList/UserInfo.vue +++ b/src/saas/AppBackUserList/UserInfo.vue @@ -109,7 +109,7 @@

{{item.content}}

{{item.createTime}} - 网格员： + 网格员：
diff --git a/src/saas/AppGridManagement/AddGird.vue b/src/saas/AppGridManagement/AddGird.vue index cb198ee2..c0be8fa4 100644 --- a/src/saas/AppGridManagement/AddGird.vue +++ b/src/saas/AppGridManagement/AddGird.vue @@ -165,10 +165,9 @@ export default { color: #666; img { - width: 32px; - height: 32px; + width: 44px; + height: 44px; vertical-align: middle; - margin-left: 8px; } } diff --git a/src/saas/AppGridManagement/AppGridManagement.vue b/src/saas/AppGridManagement/AppGridManagement.vue index 125551e8..8d540277 100644 --- a/src/saas/AppGridManagement/AppGridManagement.vue +++ b/src/saas/AppGridManagement/AppGridManagement.vue @@ -3,8 +3,8 @@
-
- {{ params.girdName }} +
+
{{ params.girdName }}
网格配置 @@ -147,7 +147,7 @@ export default { vertical-align: middle; } - div { + .gird-name-div { display: inline-block; width: calc(100% - 144px); padding-left: 20px; @@ -161,6 +161,15 @@ export default { img { margin-left: 8px; } + + .gird-name{ + display: inline-block; + max-width: calc(100% - 50px); + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + vertical-align: middle; + } } span { diff --git a/src/saas/AppGridManagement/FamilyList.vue b/src/saas/AppGridManagement/FamilyList.vue index 95212203..e4142320 100644 --- a/src/saas/AppGridManagement/FamilyList.vue +++ b/src/saas/AppGridManagement/FamilyList.vue @@ -57,6 +57,15 @@ export default { } }, methods: { + handerSearch() { + this.list = [] + this.current = 1 + this.getList() + }, + handerClear() { + this.keyword = '' + this.handerSearch() + }, getList(){ this.$http.post(`/app/appgirdmemberresident/listByGirdMember?current=${this.current}&girdMemberId=${this.userId}&girdId=${this.girdId}&name=${this.keyword}`).then((res) => { if (res.code == 0) { diff --git a/src/saas/AppGridManagement/Map.vue b/src/saas/AppGridManagement/Map.vue index e0c3014d..051ba4dd 100644 --- a/src/saas/AppGridManagement/Map.vue +++ b/src/saas/AppGridManagement/Map.vue @@ -73,10 +73,10 @@ export default { // this.getLeafNodes() uni.$on('goback', e => { if (e.girdLevel == '0') { - setTimeout(() => { - this.$u.toast('请选择二级或者三级网格') - }, 400) - return false + // setTimeout(() => { + // this.$u.toast('请选择二级或者三级网格') + // }, 400) + // return false } this.getGridList(e.id, true) }) diff --git a/src/saas/AppHealthUp/OtherStatistics.vue b/src/saas/AppHealthUp/OtherStatistics.vue index 07ad2fc5..a9683c81 100644 --- a/src/saas/AppHealthUp/OtherStatistics.vue +++ b/src/saas/AppHealthUp/OtherStatistics.vue @@ -58,10 +58,10 @@
-
+ diff --git a/src/saas/AppWalkask/AppWalkask.vue b/src/saas/AppWalkask/AppWalkask.vue index 8eb2c43c..f6ef1f10 100644 --- a/src/saas/AppWalkask/AppWalkask.vue +++ b/src/saas/AppWalkask/AppWalkask.vue @@ -115,6 +115,11 @@ export default { }, mounted() {}, methods: { + getListInit() { + this.data = [] + this.current = 1 + this.getList() + }, getList() { this.$http .post('/app/appvisitvondolence/list', null, { @@ -140,17 +145,14 @@ export default { areaSelect(e) { this.data = [] this.areaId = e - this.current = 1 - this.getList() + this.getListInit() }, change(index) { - this.data = [] this.areaId = this.user.areaId this.keyword = '' this.currentTabs = index - this.current = 1 - this.getList() + this.getListInit() }, goDetail(item, hint) { @@ -183,21 +185,19 @@ export default { this.$http.post(`/app/appvisitvondolence/delete?ids=${this.deletId}`).then((res) => { if (res.code == 0) { this.$u.toast('删除成功！') - this.getList() + this.getListInit() } }) }, handerSearch(e) { this.keyword = e - this.current = 1 - this.getList() + this.getListInit() }, handerClear() { this.keyword = '' - this.current = 1 - this.getList() + this.getListInit() }, previewImage(images, img) { From 69215f3fe6fe0bcef0e7720b7931853ceb18ac40 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: Fri, 11 Feb 2022 10:09:42 +0800 Subject: [PATCH 2/8] eslint --- src/apps/AppGridManagement/AppGridManagement.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/apps/AppGridManagement/AppGridManagement.vue b/src/apps/AppGridManagement/AppGridManagement.vue index 2e097333..ff9654d7 100644 --- a/src/apps/AppGridManagement/AppGridManagement.vue +++ b/src/apps/AppGridManagement/AppGridManagement.vue @@ -6,12 +6,11 @@
{{params.girdName}} - +
网格配置 -
@@ -115,7 +114,7 @@ export default { this.isGirdUser() uni.$on('goback', (res) => { this.params = res - }) + }) }, onReachBottom() { if(!this.tabIndex) { From f03fa51d7309612b7f6cb83cd760fef6791c5dd7 Mon Sep 17 00:00:00 2001 From: wanglei <1336977847@qq.com> Date: Fri, 11 Feb 2022 10:12:47 +0800 Subject: [PATCH 3/8] 27094 --- src/saas/AppSpecialPeople/add.vue | 3 ++- src/saas/AppSpecialPeople/detail.vue | 27 ++++----------------------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/src/saas/AppSpecialPeople/add.vue b/src/saas/AppSpecialPeople/add.vue index d9fe3253..8b86f92d 100644 --- a/src/saas/AppSpecialPeople/add.vue +++ b/src/saas/AppSpecialPeople/add.vue @@ -408,7 +408,6 @@ export default { methods: { getDetail() { - console.log(111); if (!this.id) return var urlList = ['/app/appspecialdisabled/queryDetailById', '/app/appspecialmental/queryDetailById', '/app/appspecialadjustment/queryDetailById', '/app/appspecialdrug/queryDetailById', '/app/appspecialprison/queryDetailById'] @@ -559,6 +558,7 @@ export default { width: 60%; display: flex; justify-content: flex-end; + font-size: 32px !important; .u-icon { margin-left: 16px; } @@ -594,6 +594,7 @@ export default { .value { margin-left: 16px; + font-size: 32px; } } diff --git a/src/saas/AppSpecialPeople/detail.vue b/src/saas/AppSpecialPeople/detail.vue index 34e9d7e9..c2813b8a 100644 --- a/src/saas/AppSpecialPeople/detail.vue +++ b/src/saas/AppSpecialPeople/detail.vue @@ -7,9 +7,7 @@
- - +
@@ -54,8 +52,8 @@