From c5784e268e4e99d2d96a8eee20d8b93e0246a94f Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Fri, 5 May 2023 14:37:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/bigscreen/dv/AppQxnDv.vue | 4 +- packages/bigscreen/dv/AppQxnEventDv.vue | 200 +++++++++++++----- packages/bigscreen/dv/components/DvMap.vue | 80 +++---- .../components/Detail.vue | 7 +- .../components/List.vue | 12 +- vue.config.js | 2 +- 6 files changed, 209 insertions(+), 96 deletions(-) diff --git a/packages/bigscreen/dv/AppQxnDv.vue b/packages/bigscreen/dv/AppQxnDv.vue index ab8075fb..07786c94 100644 --- a/packages/bigscreen/dv/AppQxnDv.vue +++ b/packages/bigscreen/dv/AppQxnDv.vue @@ -24,7 +24,7 @@
居民数量：{{ item.customerCount + item.groupMemberCount }} - 成员：{{ item.allGridMemberCount }} + 成员：{{ item.allWXMemberCount }}
@@ -171,7 +171,7 @@
- +
diff --git a/packages/bigscreen/dv/AppQxnEventDv.vue b/packages/bigscreen/dv/AppQxnEventDv.vue index cd186abc..44ab10b5 100644 --- a/packages/bigscreen/dv/AppQxnEventDv.vue +++ b/packages/bigscreen/dv/AppQxnEventDv.vue @@ -24,7 +24,7 @@
居民数量：{{ item.customerCount + item.groupMemberCount }} - 成员：{{ item.allGridMemberCount }} + 成员：{{ item.allWXMemberCount }}
@@ -144,16 +144,44 @@
-
-

分局数量

+
+

警格上报事件

- 726,079 - 个 + {{ middleTotalInfo['警格累计上报'] }} + 条 +
+
+
+

居民上报事件

+
+ {{ middleTotalInfo['居民累计上报'] }} + 条 +
+
+
+

今日待处理

+
+ {{ middleTotalInfo['今日上报'] - middleTotalInfo['今日办结'] }} + 条 +
+
+
+

今日办理中

+
+ {{ middleTotalInfo['今日上报'] - middleTotalInfo['今日办结'] }} + 条 +
+
+
+

今日已办结

+
+ {{ middleTotalInfo['今日办结'] }} + 条
- +
@@ -225,59 +253,45 @@

事件详情

-

咨询如何报考摩托车驾驶

+

{{ eventInfo.desc }}

- {{ info['派出所数量'] }}个派出所 + {{ mapStatus(eventInfo.status, 'name') }}
- {{ info['群数量'] }} + {{ eventInfo.typeName }}
- {{ info['成员总数'] }} + {{ eventInfo.location.address }}
- {{ info['群成员数量'] }} + {{ eventInfo.case_name }}

办理流程

-
-
-

已办结

-
- +
+
+

{{ item.solve_username }}

+
+

{{ item.process_desc }}

+ {{ $moment(item.solved_time * 1000).format('YYYY-MM-DD HH:mm:ss') }}
-

王海涛

- 2023-04-08 09:46:47 + {{ mapProcessType(item.process_type) }}
-
-

已办结

+
+
+
+

{{ mapStatus(item.status, 'name') }}

-

王海涛

- 2023-04-08 09:46:47 -
-
-

已办结

-
- -
-

王海涛

- 2023-04-08 09:46:47 -
-
-

已办结

-
- -
-

王海涛

- 2023-04-08 09:46:47 +

{{ item.solve_username }}

+ {{ $moment(item.solved_time * 1000).format('YYYY-MM-DD HH:mm:ss') }}
@@ -309,8 +323,8 @@ currIndex: 0, areaList: [], type: '0', - info: {}, isShow: false, + middleTotalInfo: {}, gridId: '', gridParentId: 'gr3AePMwAAFWlqlNvfJboAWkRNbnA14A', chartConfig1: { @@ -538,6 +552,7 @@ { prop: 'reporterName', label: '姓名', align: 'center' }, { prop: 'caseName', label: '事件名称', align: 'left', width: 130 } ], + eventInfo: {}, reportHandleList: [], colConfigs2: [ { slot: 'index' }, @@ -611,9 +626,8 @@ cursor: 'pointer' }, on: { - click: e => { - this.isShow = true - console.log(params) + click: () => { + this.getEventInfo(params.row.orderId, params.row) } }, }, '查看>>' @@ -709,6 +723,18 @@ }, methods: { + mapProcessType (status) { + return { + '1': '创建', + '2': '受理', + '3': '分配', + '4': '转交', + '5': '办结', + '6': '拒绝', + '7': '办理中' + }[status] + }, + mapStatus (status, type) { const index = Number(status) return [{ @@ -765,6 +791,25 @@ }) }, + getEventInfo (orderId, info) { + this.instance.post(`/api/wxgridinfo/reportInfo`, null, { + params: { + orderId, + corpId: 'wpytYEDgAA5zwi8Ak2mwFh3PwBKwwlWA' + } + }).then(res => { + if (res.code === 0) { + this.eventInfo = { + ...res.data, + typeName: info.type === '1' ? '居民上报' : '巡查上报', + status: info.status + } + + this.isShow = true + } + }) + }, + onTypeChange (index) { this.currIndex = index this.getWxGridReportCata() @@ -914,6 +959,49 @@ height: 100%; overflow: hidden; + .info-bottom__wrapper { + height: 120px; + margin-top: 20px; + overflow-y: auto; + } + + .info-bottom__item { + display: flex; + align-items: center; + justify-content: space-between; + line-height: 1; + margin-bottom: 12px; + color: #fff; + + div { + flex: 1; + margin: 0 18px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + font-size: 12px; + color: #d0e1e8; + + p { + margin-bottom: 8px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + } + + i { + font-style: normal; + font-size: 14px; + } + + h4 { + font-size: 14px; + font-weight: normal; + color: #9BB7D4; + } + } + .info-mask { position: absolute; left: 0; @@ -924,13 +1012,6 @@ background: rgba($color: #000000, $alpha: 0.1); } - h3 { - margin-top: 28px; - font-weight: 600; - font-size: 16px; - color: #02FEFF; - } - .info-content { position: absolute; top: 50%; @@ -943,12 +1024,25 @@ background-size: 100% 100%; transform: translate(-50%, -50%); + & > h3 { + margin-top: 28px; + font-weight: 600; + font-size: 16px; + color: #02FEFF; + display: -webkit-box; + -webkit-box-orient: vertical; + overflow: hidden; + -webkit-line-clamp: 1; + } + .info-bottom { margin-top: 20px; padding-top: 14px; - h3 { - margin-top: 0; + & > h3 { + font-weight: 600; + font-size: 16px; + color: #02FEFF; } } @@ -999,7 +1093,7 @@ transform: translateY(-50%); } - &:last-child::before { + &:nth-of-type(4n)::before { position: absolute; top: 38px; right: -28px; @@ -1021,7 +1115,7 @@ background: rgba(7, 183, 89, 1); } - &:last-child::before { + &:nth-of-type(4n)::before { background: rgba(7, 183, 89, 1); } diff --git a/packages/bigscreen/dv/components/DvMap.vue b/packages/bigscreen/dv/components/DvMap.vue index 5eda7379..b2b16ae1 100644 --- a/packages/bigscreen/dv/components/DvMap.vue +++ b/packages/bigscreen/dv/components/DvMap.vue @@ -9,7 +9,7 @@

{{ title }}

-
+
{{ info['派出所数量'] }}个派出所 @@ -39,6 +39,40 @@ {{ info['群主人数'] }}
+
+
+ + {{ info['负责人'] }} +
+
+ + {{ info['下属警格数量'] }} +
+
+ + {{ info['外部联系人数量'] }} +
+
+ + {{ rate }} +
+
+ + {{ info['待受理'] }} +
+
+ + {{ info['办理中'] }} +
+
+ + {{ info['已办结'] }} +
+
+ + {{ info['事件总数'] }} +
+
@@ -52,7 +86,8 @@ name: 'AiDvMap', props: { - instance: Function + instance: Function, + type: String }, data() { @@ -69,11 +104,11 @@ computed: { rate () { - if (!this.info['已激活']) { + if (!this.info['事件总数']) { return '0%' } - return (this.info['已激活'] / this.info['成员总数']).toFixed(2) * 100 + '%' + return ((this.info['事件总数'] - this.info['已拒绝']) / this.info['事件总数']).toFixed(2) * 100 + '%' } }, @@ -224,33 +259,6 @@ areaColor: null } }, - // label: { - // show: true, - // formatter: e => { - // const name = e.data[3] - // const value = e.data[2] - // return `{a|${name}}\n{b|${value}}` - // }, - // fontSize: 16, - // rich: { - // a: { - // width: '100%', - // color: '#fff', - // lineHeight: 20, - // fontSize: 16 - // }, - // b: { - // backgroundColor: { - // // image: require('@/assets/images/point.png') - // }, - // color: '#fff', - // height: 56, - // align: 'center', - // width: 50, - // fontSize: 16 - // } - // } - // }, data: [] } ] @@ -311,9 +319,9 @@ top: 50%; left: 50%; z-index: 11; - width: 378px; - height: 254px; - padding: 15px 22px 0; + width: 390px; + height: 262px; + padding: 15px 18px 0; background: url(https://cdn.cunwuyun.cn/dvcp/dv/qxn/info-bg.png); background-size: 100% 100%; transform: translate(-50%, -50%); @@ -332,8 +340,8 @@ margin-bottom: 20px; label { - width: 70px; - margin-right: 20px; + width: 90px; + margin-right: 10px; color: #fff; text-align: right; font-size: 14px; diff --git a/project/qujing/app/AppCertificateIssuance/components/Detail.vue b/project/qujing/app/AppCertificateIssuance/components/Detail.vue index f743a9df..d2d56128 100644 --- a/project/qujing/app/AppCertificateIssuance/components/Detail.vue +++ b/project/qujing/app/AppCertificateIssuance/components/Detail.vue @@ -1,5 +1,5 @@