From 89ffcc639a98817c033851d947d07b9a97b14e56 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Thu, 27 Apr 2023 14:38:57 +0800 Subject: [PATCH] bug --- packages/bigscreen/dv/AppQxnDv.vue | 17 +- packages/bigscreen/dv/AppQxnEventDv.vue | 377 ++++++++++++++++++------ 2 files changed, 288 insertions(+), 106 deletions(-) diff --git a/packages/bigscreen/dv/AppQxnDv.vue b/packages/bigscreen/dv/AppQxnDv.vue index 23c73e71..a1d84cce 100644 --- a/packages/bigscreen/dv/AppQxnDv.vue +++ b/packages/bigscreen/dv/AppQxnDv.vue @@ -287,8 +287,9 @@ - + .right { display: flex; flex: 1; + overflow: hidden; .right-left { width: 500px; diff --git a/packages/bigscreen/dv/AppQxnEventDv.vue b/packages/bigscreen/dv/AppQxnEventDv.vue index fee62797..92e266dd 100644 --- a/packages/bigscreen/dv/AppQxnEventDv.vue +++ b/packages/bigscreen/dv/AppQxnEventDv.vue @@ -4,19 +4,27 @@
-
+
{{ index + 1 }}
-

黔西南州公安局

- - - - +

{{ item.gridName }}

+ + +
- 居民数量：17246 - 成员：2057 + 居民数量：{{ item.customerCount + item.groupMemberCount }} + 成员：{{ item.allGridMemberCount }}
@@ -25,10 +33,31 @@
-
-

全部人员数

+
+

全部上报事件

- 726,079 + {{ wxGridReportOverviewInfo['全部上报事件数量'] }} + 人 +
+
+
+

已办结事件

+
+ {{ wxGridReportOverviewInfo['已办结数量'] }} + 人 +
+
+
+

办理中事件

+
+ {{ wxGridReportOverviewInfo['办理中数量'] }} + 人 +
+
+
+

待处理事件

+
+ {{ wxGridReportOverviewInfo['待受理数量'] }} 人
@@ -39,7 +68,7 @@

上报来源分布

@@ -50,7 +79,7 @@

事件办理情況

@@ -63,37 +92,32 @@

事件受理率

- +

事件办结率

- +

最新办理动态

- - - - + + +
- - + +
@@ -126,7 +150,7 @@
- +
@@ -202,6 +226,10 @@ name: 'AppQxnEventDv', label: '事件上报', + props: { + instance: Function + }, + components: { DvMap, DoughnutChart @@ -209,67 +237,12 @@ data () { return { - value: '', + policeStationList: [], currIndex: 0, - chartData2: [ - { - "name": "1月", - "已办理": 4, - "待处理": 44, - "处理中": 23, - "已拒绝": 11 - }, - { - "name": "2月", - "已办理": 2, - "待处理": 24, - "处理中": 23, - "已拒绝": 11 - }, - { - "name": "3月", - "已办理": 44, - "待处理": 14, - "处理中": 2, - "已拒绝": 11 - }, - { - "name": "4月", - "已办理": 4, - "待处理": 44, - "处理中": 3, - "已拒绝": 1 - }, - { - "name": "5月", - "已办理": 4, - "待处理": 4, - "处理中": 23, - "已拒绝": 11 - } - ], - chartData1: [ - { - "name": "1月", - "警格上报": 23, - "居民上报": 23 - }, - { - "name": "2月", - "警格上报": 23, - "居民上报": 23 - }, - { - "name": "3月", - "警格上报": 23, - "居民上报": 23 - }, - { - "name": "4月", - "警格上报": 23, - "居民上报": 23 - } - ], + areaList: [], + type: '0', + gridId: '', + gridParentId: 'gr3AePMwAAFWlqlNvfJboAWkRNbnA14A', tableData: [ { name: '姓名', @@ -669,6 +642,13 @@ v9: '详情>>', v10: '详情>>' } + ], + wxGridReportOverviewInfo: {}, + tableData1: [], + colConfigs1: [ + { prop: 'createTime', label: '时间', align: 'center', width: '60px', dateFormat: 'MM/DD' }, + { prop: 'reporterName', label: '姓名', align: 'center' }, + { prop: 'caseName', label: '事件名称', align: 'left', width: 130 } ] } }, @@ -767,10 +747,144 @@ } } ] - } + }, + + chartData1 () { + if (!this.wxGridReportOverviewInfo['上报来源分布+事件办理情况']) { + return [] + } + + return this.wxGridReportOverviewInfo['上报来源分布+事件办理情况'].map(v => { + return { + name: v['月份'], + '警格上报': v['警格上报'], + '居民上报': v['居民上报'] + } + }) + }, + + chartData2 () { + if (!this.wxGridReportOverviewInfo['上报来源分布+事件办理情况']) { + return [] + } + + return this.wxGridReportOverviewInfo['上报来源分布+事件办理情况'].map(v => { + return { + name: v['月份'], + '上报总数': v['上报数量'], + '已办理': v['已拒绝数量'], + '已拒绝': v['已拒绝数量'] + } + }) + }, + + sllData () { + return [{ + key: '累计受理事件', + value: this.wxGridReportOverviewInfo['全部上报事件数量'] - this.wxGridReportOverviewInfo['待受理数量'] + },{ + key: '累计上报事件', + value: this.wxGridReportOverviewInfo['全部上报事件数量'] + }] + }, + + sllRate () { + if (!this.wxGridReportOverviewInfo['待受理数量']) { + return 0 + } + + return Number((((this.wxGridReportOverviewInfo['全部上报事件数量'] - this.wxGridReportOverviewInfo['待受理数量']) / this.wxGridReportOverviewInfo['全部上报事件数量']) * 100).toFixed(2)) + }, + + sjbjData () { + return [{key: '累计办结事件', value: this.wxGridReportOverviewInfo['已办结数量']}, {key: '累计受理事件', value: this.wxGridReportOverviewInfo['全部上报事件数量'] - this.wxGridReportOverviewInfo['待受理数量']}] + }, + + sjbjRate () { + if (!this.wxGridReportOverviewInfo['待受理数量']) { + return 0 + } + + return Number(((this.wxGridReportOverviewInfo['已办结数量'] / (this.wxGridReportOverviewInfo['全部上报事件数量'] - this.wxGridReportOverviewInfo['待受理数量'])) * 100).toFixed(2)) + }, + }, + + mounted () { + this.getInfo() + this.init() }, methods: { + init (gridId) { + this.gridId = '' + this.gridParentId = gridId || 'gr3AePMwAAFWlqlNvfJboAWkRNbnA14A' + this.instance.post(`/api/wxgridinfo/tree`, null, { + params: { + gridParentId: gridId || '', + corpId: 'wpytYEDgAA5zwi8Ak2mwFh3PwBKwwlWA' + } + }).then(res => { + if (res.code === 0) { + if (gridId) { + this.policeStationList = res.data + } else { + this.areaList = res.data + } + } + }) + + this.getInfo() + }, + + onChange () { + this.instance.post(`/api/wxgridinfo/wxGridReportNew`, null, { + params: { + corpId: 'wpytYEDgAA5zwi8Ak2mwFh3PwBKwwlWA', + gridId: this.gridId || this.gridParentId, + type: this.type + } + }).then(res => { + if (res.code === 0) { + this.wxGridReportNewInfo = res.data + } + }) + }, + + getInfo () { + this.instance.post(`/api/wxgridinfo/comprehensiveOverview`, null, { + params: { + corpId: 'wpytYEDgAA5zwi8Ak2mwFh3PwBKwwlWA' + } + }).then(res => { + if (res.code === 0) { + this.middleTotalInfo = res.data + } + }) + + this.instance.post(`/api/wxgridinfo/wxGridReportOverview`, null, { + params: { + corpId: 'wpytYEDgAA5zwi8Ak2mwFh3PwBKwwlWA', + gridId: this.gridId || this.gridParentId + } + }).then(res => { + if (res.code === 0) { + this.wxGridReportOverviewInfo = res.data + } + }) + + this.instance.post(`/api/wxgridinfo/wxGridReportNew`, null, { + params: { + corpId: 'wpytYEDgAA5zwi8Ak2mwFh3PwBKwwlWA', + gridId: this.gridId || this.gridParentId, + type: this.type + } + }).then(res => { + if (res.code === 0) { + this.tableData1 = res.data + } + }) + }, + Hex2RGBA(color, alpha = 1) { let hex = 0; if (color.charAt(0) == "#") { @@ -998,6 +1112,54 @@ } } + :deep(.ai-table) { + .el-table { + font-size: 12px; + color: #d0e1e8; + background-color: transparent!important; + + th.el-table__cell.is-leaf, .el-table td.el-table__cell { + border: none!important; + } + + tr.el-table__row--striped td { + background: rgba(33, 180, 253, 0.1)!important; + } + + .el-table__header tr th:first-child .cell { + padding: 0!important; + } + + .el-table__body tr td:first-child .cell { + padding: 0!important; + } + + &.el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell { + background-color: rgba(33, 180, 253, 0.1)!important; + } + + th.el-table__cell { + background-color: transparent; + } + + tr { + background-color: transparent; + } + + .el-table__cell { + padding: 7px 0; + color: #d0e1e8; + } + + .el-table__header tr .cell { + color: #02FEFF!important; + } + } + .ai-table__header { + background: rgba(33, 180, 253, 0.1)!important; + } + } + ::-webkit-scrollbar { width: 5px; height: 14px; @@ -1024,12 +1186,14 @@ & > .right { display: flex; flex: 1; + overflow: hidden; .right-left { width: 530px; .right-left__middle { display: flex; + justify-content: space-between; .left { width: 245px; @@ -1037,18 +1201,19 @@ } .right { - flex: 1; + width: 275px; } } .right-left__top { display: flex; + justify-content: space-between; div { - flex: 1; + width: 275px; &:first-child { - margin-right: 12px; + width: 245px; } } } @@ -1086,10 +1251,26 @@ .left-item { position: relative; width: 100%; + cursor: pointer; margin-bottom: 10px; padding: 30px 14px 14px; - background-image: linear-gradient(0deg, rgba(40, 182, 253, 0.08) 1%, rgba(0, 102, 154, 0.65) 100%); + background-image: linear-gradient(0deg, rgba(40, 182, 253, 0.08) 1%, rgba(0, 102, 154, 0.2) 100%); border-radius: 6px; + box-shadow: inset 0 -1px 0 0 transparent; + transition: all ease 0.3s; + + &:hover { + opacity: 0.7; + } + + &.active { + background-image: linear-gradient(0deg, #28b6fd24 0%, #00669aa6 99%); + box-shadow: inset 0 -1px 0 0 #23B2C7; + + &:hover { + opacity: 1; + } + } i { position: absolute;