From ec379e6b7248e51dd4f5ff5a4312ff646dadb9f1 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 8 Sep 2022 09:03:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=B4=E4=B9=89=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/dv/apps/AppXyDv.vue | 162 +++++++++--------------------------- 1 file changed, 40 insertions(+), 122 deletions(-) diff --git a/project/dv/apps/AppXyDv.vue b/project/dv/apps/AppXyDv.vue index 5807af5e..02460161 100644 --- a/project/dv/apps/AppXyDv.vue +++ b/project/dv/apps/AppXyDv.vue @@ -171,34 +171,18 @@
-
积分排行
-
-
-
累计积分榜
-
上周积分榜
+
警务群统计
+
+
+ 居民群 + 群主 + 群人数
-
-
-
{{ index + 1 }}
-
-
-

{{ item.userName }}

- -
-

-
- {{ item.userIntegral }} -
-
-
{{ index + 1 }}
-
-
-

{{ item.userName }}

- -
-

-
- {{ item.changeIntegral }} +
+
+ {{ item.name || '未命名群聊' }} + {{ item.ownerName }} + {{ item.personCount }}
@@ -229,7 +213,6 @@ data () { return { leftIndex: 0, - rightIndex: 0, dlIndex: 0, qlIndex: 0, currGirdName: '', @@ -241,9 +224,7 @@ groupNumber: {}, replyPercentage: {}, groupChatNumber: {}, - dynamicList: [], - rankList: [], - pointList: [] + dynamicList: [] } }, @@ -1120,9 +1101,6 @@ } } - .middle-wrapper { - margin-bottom: 23px; - .item-table { position: relative; height: 240px; @@ -1194,106 +1172,46 @@ } } } + + .middle-wrapper { + margin-bottom: 23px; } .bottom-wrapper { - .tab { - display: flex; - align-items: center; - height: 32px; - margin-bottom: 15px; - border: 1px solid #0E6EB5; - - div { - flex: 1; - line-height: 32px; - text-align: center; - color: #fff; - font-size: 14px; - cursor: pointer; - user-select: none; - - &.active { - background: #0F93B8; - } - } - } - - .tab-content { - height: 230px; - overflow-y: auto; - .tab-item { + .item-table { + .item-table__header { display: flex; align-items: center; - margin-bottom: 8px; + justify-content: space-between; + height: 40px; + padding: 0 24px; + color: #82C5FF; + font-size: 14px; + background: rgba(35,160,172,0.2000); + } - &:last-child { - margin-bottom: 0; - } + .item-table__body { + height: 280px; + overflow-y: overlay; - .left { - width: 22px; - height: 24px; - line-height: 24px; - text-align: center; + .item-table__item { + display: flex; + align-items: center; + justify-content: space-between; + height: 40px; + padding: 0 24px; color: #fff; font-size: 14px; - background: url(https://cdn.cunwuyun.cn/dvcp/dv/pddv/right-icon3.png); - background-size: 100% 100%; + background: rgba(35,160,172,0.2000); - &.left0 { - background: url(https://cdn.cunwuyun.cn/dvcp/dv/pddv/right-icon1.png); - background-size: 100% 100%; + &:nth-of-type(2n - 1) { + background: transparent; } - &.left1 { - background: url(https://cdn.cunwuyun.cn/dvcp/dv/pddv/right-icon2.png); - background-size: 100% 100%; - } - } - - i { - position: relative; - color: #fff; - font-size: 12px; - font-style: normal; - transform: translateY(50%); - } - - .middel { - width: 250px; - margin: 0 8px; - - p { - width: 100%; - height: 8px; - background: linear-gradient(270deg, #51BF34 0%, #257718 100%); - border: 1px solid; - border-image: linear-gradient(270deg, rgba(96, 255, 99, 1), rgba(13, 156, 17, 1)) 1 1; - } - - .top { - display: flex; - align-items: center; - margin-bottom: 4px; - - h2 { - margin-right: 4px; - color: #FFFFFF; - font-size: 14px; - } - - span { - width: 48px; - height: 20px; - line-height: 20px; - text-align: center; - color: #2AF0F8; - font-size: 12px; - background: linear-gradient(180deg, rgba(69,210,218,0.2500) 0%, rgba(69,210,218,0.1000) 100%); - border: 1px solid; - border-image: linear-gradient(180deg, rgba(5, 185, 203, 1), rgba(73, 214, 207, 1)) 1 1; - } + span { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } } } From a9ae034fcdbf10167db99cbdbdbb0d55600a5ad3 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 8 Sep 2022 10:35:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=B4=E4=B9=89=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/dv/apps/AppXyDv.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project/dv/apps/AppXyDv.vue b/project/dv/apps/AppXyDv.vue index 02460161..da542096 100644 --- a/project/dv/apps/AppXyDv.vue +++ b/project/dv/apps/AppXyDv.vue @@ -9,7 +9,7 @@
-
居民好友统计
+
群员统计

居民好友

@@ -116,7 +116,7 @@
-

网格动态

+

警务群动态

@@ -127,7 +127,7 @@
-
网格信息
+
警务数据
{{ girdInfo['网格名称'] }}
From 36f4283374b3d2adbf2c9590cf4db341c2167a97 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 8 Sep 2022 13:18:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=83=AB=E9=83=BD=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Announce/AppAnnounce/components/Add.vue | 10 +- project/dv/apps/AppPdDv.vue | 2 +- project/dv/apps/AppXyDv.vue | 6 +- project/dv/apps/components/XyGrid.vue | 483 ++++++++++++++++++ 4 files changed, 489 insertions(+), 12 deletions(-) create mode 100644 project/dv/apps/components/XyGrid.vue diff --git a/packages/wxwork/Announce/AppAnnounce/components/Add.vue b/packages/wxwork/Announce/AppAnnounce/components/Add.vue index 0fbf0e5c..5d5d7572 100644 --- a/packages/wxwork/Announce/AppAnnounce/components/Add.vue +++ b/packages/wxwork/Announce/AppAnnounce/components/Add.vue @@ -455,14 +455,8 @@ export default { }, getWxGroups() { - this.instance.post(`/app/appmasssendingtask/queryWxGroups?sendScope=${this.form.sendScope}`, null, { - data: { - filterCriteria: this.form.filterCriteria.join(',') - }, - headers: {'Content-Type': 'application/json;charset=utf-8'}, - transformRequest: [function (data) { - return data.filterCriteria - }] + this.instance.post(`/app/appmasssendingtask/queryWxGroups?sendScope=${this.form.sendScope}`, { + filterCriteria: this.form.filterCriteria.join(',') }).then(res => { if (res.code === 0) { this.form.wxGroups = res.data diff --git a/project/dv/apps/AppPdDv.vue b/project/dv/apps/AppPdDv.vue index 3be64b75..3d58519f 100644 --- a/project/dv/apps/AppPdDv.vue +++ b/project/dv/apps/AppPdDv.vue @@ -322,7 +322,7 @@ this.initLineChart('.chart2', { x: res.data['群成员数'].map(v => v.month), value: res.data['群成员数'].map(v => v.totalNumber), - name: '居民群' + name: '居民数' }) } }) diff --git a/project/dv/apps/AppXyDv.vue b/project/dv/apps/AppXyDv.vue index da542096..8890300f 100644 --- a/project/dv/apps/AppXyDv.vue +++ b/project/dv/apps/AppXyDv.vue @@ -111,7 +111,7 @@
- +
@@ -193,7 +193,7 @@ + +