From fef00f6423c3d474760bd0bcdbe51403b7b67579 Mon Sep 17 00:00:00 2001 From: aixianling Date: Tue, 15 Feb 2022 10:24:02 +0800 Subject: [PATCH 1/3] BUG 27406 --- src/components/pages/selectGird.vue | 61 +++-------------------------- 1 file changed, 6 insertions(+), 55 deletions(-) diff --git a/src/components/pages/selectGird.vue b/src/components/pages/selectGird.vue index a1503bf6..3c9b8c62 100644 --- a/src/components/pages/selectGird.vue +++ b/src/components/pages/selectGird.vue @@ -19,7 +19,7 @@
-
{{ item.girdName }}
+
{{ item.girdName }}
@@ -65,7 +65,7 @@ export default { if (params.girdLevel) { this.girdLevel = params.girdLevel } - if(params.isMyGird) { + if (params.isMyGird) { this.isMyGird = params.isMyGird } this.isGirdUser() @@ -76,12 +76,12 @@ export default { if (res?.data) { if (res.data.checkType) { this.userGird = res.data - if(this.isMyGird) { + if (this.isMyGird) { this.getMyGird() - }else { + } else { this.getTree() } - + } else { this.$u.toast('当前人员不是网格员或网格管理员') } @@ -248,9 +248,9 @@ export default { margin-left: 32px; border-bottom: 1px solid #e4e5e6; padding-right: 16px; + box-sizing: border-box; .applicationNames { - width: calc(100% - 56px); font-size: 36px; font-weight: 500; color: #333333; @@ -261,55 +261,6 @@ export default { } } } - - .showUsers { - .cards { - display: flex; - align-items: center; - height: 120px; - line-height: 120px; - // background: pink; - padding: 0 0 0 32px; - - .imges { - display: flex; - align-items: center; - width: 200px; - - .imgselect { - width: 48px; - height: 48px; - } - - .avatras { - width: 74px; - height: 74px; - border-radius: 8px; - margin-left: 36px; - } - } - - .rights { - width: 100%; - display: flex; - justify-content: space-between; - align-items: center; - margin-left: 32px; - border-bottom: 1px solid #e4e5e6; - padding-right: 40px; - - .applicationNames { - font-size: 36px; - font-weight: 500; - color: #333333; - } - - .idNumbers { - color: #666; - } - } - } - } } .subBtn { From e11fb930adc8e073a179b814f736d08a3ffb0911 Mon Sep 17 00:00:00 2001 From: aixianling Date: Tue, 15 Feb 2022 10:42:02 +0800 Subject: [PATCH 2/3] BUG 27410 --- src/saas/AppMeetingNotice/detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/saas/AppMeetingNotice/detail.vue b/src/saas/AppMeetingNotice/detail.vue index b920d725..d746c2a5 100644 --- a/src/saas/AppMeetingNotice/detail.vue +++ b/src/saas/AppMeetingNotice/detail.vue @@ -36,7 +36,7 @@
相关附件
-
+