From aca483c7a0911650f769528003859020eb0120b3 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 29 Jul 2022 11:25:23 +0800 Subject: [PATCH 01/12] bug --- project/dv/apps/AppPdDv.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/project/dv/apps/AppPdDv.vue b/project/dv/apps/AppPdDv.vue index 5afe1838..64d50176 100644 --- a/project/dv/apps/AppPdDv.vue +++ b/project/dv/apps/AppPdDv.vue @@ -40,26 +40,26 @@

居民群

- {{ groupNumber.groupSum }} + {{ groupNumber.groupSum || 0 }}

群成员

- {{ groupNumber.totalSum }} + {{ groupNumber.totalSum || 0 }}

昨日新增

- {{ groupNumber.increaseSum }} + {{ groupNumber.increaseSum || 0 }}

昨日流失

- {{ groupNumber.decreaseSum }} + {{ groupNumber.decreaseSum || 0 }}
@@ -113,15 +113,15 @@

活跃群聊

-

{{ groupChatNumber.chatHasMsg || 0 }}

+

{{ groupChatNumber ? groupChatNumber.chatHasMsg : 0 }}

活跃群成员

-

{{ groupChatNumber.memberHasMsg || 0 }}

+

{{ groupChatNumber ? groupChatNumber.memberHasMsg : 0 }}

群聊消息

-

{{ groupChatNumber.msgTotal || 0 }}

+

{{ groupChatNumber ? groupChatNumber.msgTotal : 0 }}

From ef6009f0cc7b1d0a5ca8913ed2653c3593b9b06d Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 29 Jul 2022 11:26:59 +0800 Subject: [PATCH 02/12] bug --- project/dv/apps/AppPdDv.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/project/dv/apps/AppPdDv.vue b/project/dv/apps/AppPdDv.vue index 64d50176..342ec535 100644 --- a/project/dv/apps/AppPdDv.vue +++ b/project/dv/apps/AppPdDv.vue @@ -59,6 +59,7 @@

昨日流失

+ {{ groupNumber.decreaseSum || 0 }}
From 1a262d88594476f7c88a754a4df80dc27c3b9f65 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 29 Jul 2022 11:28:56 +0800 Subject: [PATCH 03/12] bug --- project/dv/apps/components/AiGrid.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/dv/apps/components/AiGrid.vue b/project/dv/apps/components/AiGrid.vue index 543e1219..46637580 100644 --- a/project/dv/apps/components/AiGrid.vue +++ b/project/dv/apps/components/AiGrid.vue @@ -124,7 +124,7 @@ return { ...v, - girdName: v.girdName.substr(0, 8) + girdName: v.girdName.substr(0, 11) } }), { parent: 'parentGirdId' From a701d94402847adb18b2895a25fbc0e391f2a706 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 29 Jul 2022 11:42:02 +0800 Subject: [PATCH 04/12] bug --- project/dv/apps/AppPdDv.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project/dv/apps/AppPdDv.vue b/project/dv/apps/AppPdDv.vue index 342ec535..e38f6981 100644 --- a/project/dv/apps/AppPdDv.vue +++ b/project/dv/apps/AppPdDv.vue @@ -89,9 +89,9 @@
消息回复率
- - - + + +
From f834d71ca56137c995dada397e20df6c50f98922 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 29 Jul 2022 11:44:18 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/dv/apps/components/AiGrid.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/dv/apps/components/AiGrid.vue b/project/dv/apps/components/AiGrid.vue index 46637580..5a525352 100644 --- a/project/dv/apps/components/AiGrid.vue +++ b/project/dv/apps/components/AiGrid.vue @@ -216,13 +216,13 @@ .org-chart-node-label { width: 40px; - height: 230px; + height: 254px; margin-right: 15px; padding: 0 0; .org-chart-node-label-inner { width: 40px!important; - height: 230px!important; + height: 254px!important; border: 1px solid; background: linear-gradient(180deg, rgba(69,210,218,0.2500) 0%, rgba(69,210,218,0.1000) 100%)!important; border-image: linear-gradient(180deg, rgba(5, 185, 203, 1), rgba(73, 214, 207, 1)) 1 1!important; From 8b8e5885a0d9ffede22d0f0d9f5063be9ac525e4 Mon Sep 17 00:00:00 2001 From: liuye Date: Fri, 29 Jul 2022 14:22:24 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=88=90=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extra/AppAddressBook/components/List.vue | 43 +++++++++++-------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/packages/extra/AppAddressBook/components/List.vue b/packages/extra/AppAddressBook/components/List.vue index ebc7b9fe..bfbf0711 100644 --- a/packages/extra/AppAddressBook/components/List.vue +++ b/packages/extra/AppAddressBook/components/List.vue @@ -92,9 +92,8 @@ - 同步数据 - + 同步部门 + 同步成员 添加成员 @@ -505,25 +504,13 @@ export default { }, syncMembers() { - let departId = this.search.departmentId; - if (!departId) departId = 1; this.btnLoading = true this.instance.post(`/app/wxcp/wxdepartment/syncDepart`).then(res => { if (res.code == 0) { - this.instance.post(`/app/wxcp/wxdepartment/syncUser?departmentId=${departId}`, null, { - timeout: 1000000 - }).then(res => { - if (res.code == 0) { - this.$message.success('同步成功') - this.getList() - this.getTree() - } - - this.btnLoading = false - }).catch(() => { - this.btnLoading = false - }) + this.$message.success('同步成功') + this.getList() + this.getTree() } }).catch(() => { @@ -531,6 +518,26 @@ export default { }) }, + syncUser() { + let departId = this.search.departmentId; + if (!departId) departId = 1; + this.btnLoading = true + + this.instance.post(`/app/wxcp/wxdepartment/syncUser?departmentId=${departId}`, null, { + timeout: 1000000 + }).then(res => { + if (res.code == 0) { + this.$message.success('同步成功') + this.getList() + this.getTree() + } + + this.btnLoading = false + }).catch(() => { + this.btnLoading = false + }) + }, + getTags() { this.instance.post(`/app/wxcp/wxtag/listAll`).then(res => { if (res.code == 0) { From 5008d89ee4b10cd137408d053cf8c7a87cd30dba Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 29 Jul 2022 16:27:52 +0800 Subject: [PATCH 07/12] 30690 --- project/sass/apps/Announce/AppAnnounce/components/List.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/sass/apps/Announce/AppAnnounce/components/List.vue b/project/sass/apps/Announce/AppAnnounce/components/List.vue index d4e36b22..6cbe1dfc 100644 --- a/project/sass/apps/Announce/AppAnnounce/components/List.vue +++ b/project/sass/apps/Announce/AppAnnounce/components/List.vue @@ -131,7 +131,7 @@ }, this.dict.getLabel('mstStatus', row.status)) } }, - { prop: 'completionRate', label: '任务完成率', align: 'center' } + { prop: 'completionRate', label: '任务完成率', align: 'center', formart: v => v ? v === '0.0' ? '0%' : `${v}%` : '-' } ] } }, From efc1a5a0b08f4f5985858812db4912e3ee588d2d Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 29 Jul 2022 16:45:38 +0800 Subject: [PATCH 08/12] 30601 --- .../Announce/AppAnnounce/components/Add.vue | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/project/sass/apps/Announce/AppAnnounce/components/Add.vue b/project/sass/apps/Announce/AppAnnounce/components/Add.vue index b82bb285..c34e05b8 100644 --- a/project/sass/apps/Announce/AppAnnounce/components/Add.vue +++ b/project/sass/apps/Announce/AppAnnounce/components/Add.vue @@ -1,5 +1,5 @@ From 41faad81728d95e0637f2087d3886bcb0c360f1d Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 29 Jul 2022 18:29:12 +0800 Subject: [PATCH 11/12] bug --- project/dv/apps/AppPdDv.vue | 260 ++++++++++++++++++++++++++++++++++-- 1 file changed, 251 insertions(+), 9 deletions(-) diff --git a/project/dv/apps/AppPdDv.vue b/project/dv/apps/AppPdDv.vue index e38f6981..4b0ba7f0 100644 --- a/project/dv/apps/AppPdDv.vue +++ b/project/dv/apps/AppPdDv.vue @@ -197,27 +197,27 @@
上周积分榜
-
+
{{ index + 1 }}
-

王磊

- 网格长 +

{{ item.name }}

+

- 433 + {{ item.point }}
-
+
{{ index + 1 }}
-

王磊1

- 网格长 +

{{ item.name }}

+

- 433 + {{ item.point }}
@@ -260,7 +260,247 @@ groupNumber: {}, replyPercentage: {}, groupChatNumber: {}, - dynamicList: [] + dynamicList: [], + rankList: [ + { + name: '李玉梅', + point: 550 + }, + { + name: '尚俊华', + point: 400 + }, + { + name: '周进', + point: 400 + }, + { + name: '熊兰', + point: 350 + }, + { + name: '全学奎', + point: 300 + }, + { + name: '张铂楠', + point: 300 + }, + { + name: '黄立琼', + point: 100 + }, + ], + pointList: [ + { + name: '王娇', + point: 9800 + }, + { + name: '张雨婷', + point: 6500 + }, + { + name: '周进', + point: 7800 + }, + { + name: '彭开富', + point: 5550 + }, + { + name: '李玉梅', + point: 5100 + }, + { + name: '尚俊华', + point: 4900 + }, + { + name: '周进', + point: 4050 + }, + { + name: '熊兰', + point: 3650 + }, + { + name: '全学奎', + point: 3000 + }, + { + name: '张铂楠', + point: 3000 + }, + { + name: '黄立琼', + point: 2500 + }, + { + name: '张丽', + point: 2750 + }, + { + name: '甘华富', + point: 1650 + }, + { + name: '刘明', + point: 1250 + }, + { + name: '张浩', + point: 900 + }, + { + name: '陈利权', + point: 900 + }, + { + name: '邱博文', + point: 600 + }, + { + name: '朱太原', + point: 600 + }, + { + name: '张淑君', + point: 600 + }, + { + name: '郭虹', + point: 600 + }, + { + name: '张丽萍', + point: 600 + }, + { + name: '李申琼', + point: 550 + }, + { + name: '易涛', + point: 500 + }, + { + name: '黄先华', + point: 500 + }, + { + name: '王卫理', + point: 450 + }, + { + name: '郑建秋', + point: 450 + }, + { + name: '尹涛', + point: 450 + }, + { + name: '李青', + point: 400 + }, + { + name: '杨丽蓉', + point: 400 + }, + { + name: '郭俊华', + point: 300 + }, + { + name: '高仁虎', + point: 300 + }, + { + name: '肖维兵', + point: 300 + }, + { + name: '刘文菊', + point: 200 + }, + { + name: '陈艳', + point: 200 + }, + { + name: '兰头', + point: 150 + }, + { + name: '廖加芬', + point: 150 + }, + { + name: '陈林华', + point: 150 + }, + { + name: '严先荣', + point: 150 + }, + { + name: '易涛', + point: 150 + }, + { + name: '伍小兵', + point: 150 + }, + { + name: '刘亚筠', + point: 150 + }, + { + name: '陈群英', + point: 150 + }, + { + name: '刘信党', + point: 150 + }, + { + name: '杨悦堃', + point: 150 + }, + { + name: '李茂珊', + point: 150 + }, + { + name: '饶春秀', + point: 150 + }, + { + name: '范先琼', + point: 150 + }, + { + name: '曾上游', + point: 150 + }, + { + name: '钟郁昭', + point: 150 + }, + { + name: '付德秀', + point: 150 + }, + { + name: '张胜玉', + point: 100 + }, + { + name: '谭星', + point: 100 + } + ] } }, @@ -1125,6 +1365,8 @@ } .tab-content { + height: 280px; + overflow-y: auto; .tab-item { display: flex; align-items: center; From e3b9eca2516b6e5a2c4ea203da21ab2f84888466 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 29 Jul 2022 18:39:47 +0800 Subject: [PATCH 12/12] bug --- project/dv/apps/AppPdDv.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/dv/apps/AppPdDv.vue b/project/dv/apps/AppPdDv.vue index 4b0ba7f0..b8dc4c1f 100644 --- a/project/dv/apps/AppPdDv.vue +++ b/project/dv/apps/AppPdDv.vue @@ -1365,7 +1365,7 @@ } .tab-content { - height: 280px; + height: 230px; overflow-y: auto; .tab-item { display: flex;