From f321fc89869872be0e87f81effee9b23de6889e0 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 4 Aug 2022 14:40:43 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/gridScoreDetail.vue | 2 + .../components/gridScoreStatistics.vue | 103 ++++++++++++------ 2 files changed, 72 insertions(+), 33 deletions(-) diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue index 50ca6e89..737d9bd5 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue @@ -148,6 +148,8 @@ export default { }, }, }, + barWidth: 20, + barGap: '20%', } ] }, true); diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue index bee0fe25..09565bf2 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue @@ -4,7 +4,7 @@

总体统计

-
{{item}}
+
{{item}}
0

-
+
-
+
@@ -83,6 +83,12 @@ + + + @@ -112,7 +118,8 @@ export default { page: {current: 1, size: 10, total: 0}, girdList: [], time: '', - timeCheck: ['昨日','近7天','近30天','自定义'] + timeCheck: ['昨日','近7天','近30天','自定义'], + currrntTime: '0' } }, computed: { @@ -125,6 +132,7 @@ export default { { prop: "", label: '积分变动', align: "center", }, { prop: "", label: '剩余积分', align: "center", }, { prop: "", label: '时间', align: "center", }, + { slot: "options" } ] } }, @@ -134,37 +142,55 @@ export default { methods: { getColEcherts() { let chartDom = document.getElementById('chart1'); - chartDom.style.width = (window.innerWidth - 328) / 2 + "px"; + chartDom.style.width = (window.innerWidth - 344) / 2 + "px"; this.myChart = echarts.init(chartDom); this.myChart.setOption({ - dataZoom: [ - { - type: "slider", - xAxisIndex: [0], - filterMode: "filter", - }, - ], + + title: { + text: '个人积分排行' + }, + tooltip: { + trigger: 'axis', + axisPointer: { + type: 'shadow' + } + }, + grid: { + left: '16px', + right: '28px', + bottom: '14px', + top: '50px', + containLabel: true + }, xAxis: { - type: 'category', - data: ['每日签到', '事件上报', '特殊人员跟进', '群发任务', '邀请居民进群'] + type: 'value', + boundaryGap: [0, 0.01], }, yAxis: { - type: 'value' + type: 'category', + data: ['Brazil', 'Indonesia', 'India', 'China', 'World'], + axisTick: { + show: false, + }, + axisLine: { + show: false, + }, }, + series: [ { data: [120, 200, 150, 80, 70,], type: 'bar', showBackground: true, - backgroundStyle: { - color: 'rgba(180, 180, 180, 0.2)' - }, + // backgroundStyle: { + // color: 'rgba(180, 180, 180, 0.2)' + // }, itemStyle: { normal: { color: "#5087ec", label: { show: true, //开启显示 - position: 'top', //在上方显示 + position: 'right', //在上方显示 textStyle: { fontSize: 13, color: '#666' @@ -172,6 +198,8 @@ export default { }, }, }, + barWidth: 10, + barGap: '20%', } ] }, true); @@ -182,6 +210,9 @@ export default { }, getListInit() {}, getTableData() {}, + timeChange(index) { + this.currrntTime = index + }, }, mounted() { this.getColEcherts() @@ -223,9 +254,16 @@ export default { display: inline-block; width: 70px; height: 32px; + line-height: 32px; border-radius: 2px; border: 1px solid #D0D4DC; margin-right: 8px; + text-align: center; + cursor: pointer; + } + .active { + color: #2266FF; + border: 1px solid #2266FF; } } } @@ -267,26 +305,25 @@ export default { .echertsBox { width: 100%; margin-top: 20px; - background: #F9F9F9; - box-shadow: 0px 4px 6px -2px rgba(15,15,21,0.1500); - border-radius: 4px; - padding: 16px; - box-sizing: border-box; - h4 { - color: #222222; - font-style: 16px; - font-weight: 600; + background: #FFF; + display: flex; + .left_Box { + margin-right: 16px; } + .right_Box {} - .bar_Box { - width: 100%; + .left_Box, + .right_Box { + background: #F9F9F9; + box-shadow: 0px 4px 6px -2px rgba(15,15,21,0.1500); + border-radius: 4px; + padding: 16px; + box-sizing: border-box; #chartDom { width: 100%; - height: 300px; - margin-top: 16px; + height: 260px; } } - } } } From 3452420e52e97e3936fd5eb18e426d60be8e7253 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 4 Aug 2022 15:05:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/gridScoreStatistics.vue | 98 +++++++++++++++---- 1 file changed, 81 insertions(+), 17 deletions(-) diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue index 09565bf2..686867f2 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue @@ -37,7 +37,7 @@
-
+
@@ -108,7 +108,8 @@ export default { data() { return { name: "积分统计", - myChart: null, + myChart1: null, + myChart2: null, tableData: [], search: { current: 1, @@ -140,11 +141,11 @@ export default { this.$dict.load('epidemicDangerousAreaLevel') }, methods: { - getColEcherts() { - let chartDom = document.getElementById('chart1'); - chartDom.style.width = (window.innerWidth - 344) / 2 + "px"; - this.myChart = echarts.init(chartDom); - this.myChart.setOption({ + getColEcherts1() { + let chartDom1 = document.getElementById('chart1'); + chartDom1.style.width = (window.innerWidth - 344) / 2 + "px"; + this.myChart1 = echarts.init(chartDom1); + this.myChart1.setOption({ title: { text: '个人积分排行' @@ -181,10 +182,6 @@ export default { { data: [120, 200, 150, 80, 70,], type: 'bar', - showBackground: true, - // backgroundStyle: { - // color: 'rgba(180, 180, 180, 0.2)' - // }, itemStyle: { normal: { color: "#5087ec", @@ -205,8 +202,70 @@ export default { }, true); window.addEventListener("resize", this.onResize) }, - onResize() { - this.myChart.resize() + getColEcherts2() { + let chartDom2 = document.getElementById('chart2'); + chartDom2.style.width = (window.innerWidth - 344) / 2 + "px"; + this.myChart2 = echarts.init(chartDom2); + this.myChart2.setOption({ + title: { + text: '网格积分排行' + }, + tooltip: { + trigger: 'axis', + axisPointer: { + type: 'shadow' + } + }, + grid: { + left: '16px', + right: '28px', + bottom: '14px', + top: '50px', + containLabel: true + }, + xAxis: { + type: 'value', + boundaryGap: [0, 0.01], + }, + yAxis: { + type: 'category', + data: ['Brazil', 'Indonesia', 'India', 'China', 'World'], + axisTick: { + show: false, + }, + axisLine: { + show: false, + }, + }, + series: [ + { + data: [120, 200, 150, 80, 70,], + type: 'bar', + itemStyle: { + normal: { + color: "#5087ec", + label: { + show: true, //开启显示 + position: 'right', //在上方显示 + textStyle: { + fontSize: 13, + color: '#666' + } + }, + }, + }, + barWidth: 10, + barGap: '20%', + } + ] + }, true); + window.addEventListener("resize", this.onResize2) + }, + onResize1() { + this.myChart1.resize() + }, + onResize2() { + this.myChart2.resize() }, getListInit() {}, getTableData() {}, @@ -215,10 +274,12 @@ export default { }, }, mounted() { - this.getColEcherts() + this.getColEcherts1() + this.getColEcherts2() }, destroyed () { - window.removeEventListener('resize', this.onResize) + window.removeEventListener('resize', this.onResize1) + window.removeEventListener('resize', this.onResize2) }, } @@ -310,7 +371,9 @@ export default { .left_Box { margin-right: 16px; } - .right_Box {} + .right_Box { + width: 100%; + } .left_Box, .right_Box { @@ -319,7 +382,8 @@ export default { border-radius: 4px; padding: 16px; box-sizing: border-box; - #chartDom { + #chart1, + #chart2 { width: 100%; height: 260px; } From 3e03d087b2dd6b36da19eddf0bdd44b0e5595b4f Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 4 Aug 2022 16:08:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/gridScoreStatistics.vue | 46 +++++++++++++++++-- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue index 686867f2..15ab1605 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue @@ -85,13 +85,31 @@ @getList="getTableData" :col-configs="colConfigs" :dict="dict"> + + + + + + + 关闭 + + @@ -120,7 +138,8 @@ export default { girdList: [], time: '', timeCheck: ['昨日','近7天','近30天','自定义'], - currrntTime: '0' + currrntTime: '0', + dialog: true, } }, computed: { @@ -272,6 +291,17 @@ export default { timeChange(index) { this.currrntTime = index }, + open(id) { + this.dialog = true + this.getDetail(id) + }, + getDetail(id) { + + } + + + + }, mounted() { this.getColEcherts1() @@ -281,6 +311,7 @@ export default { window.removeEventListener('resize', this.onResize1) window.removeEventListener('resize', this.onResize2) }, + } @@ -390,5 +421,14 @@ export default { } } } + ::v-deep .el-dialog__footer { + text-align: center; + } + ::v-deep .el-dialog__header { + border-bottom: 1px solid #DDD; + } + ::v-deep .ai-detail { + background: #FFF; + } } \ No newline at end of file From c9e74b7a8c5ca69f2f7964d16c08bfa71ee39ceb Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 4 Aug 2022 16:16:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?aititle=E6=8F=92=E6=A7=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../creditScore/AppGridMemberScore/AppGridMemberScore.vue | 4 +++- .../AppGridMemberScore/components/gridScoreStatistics.vue | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/conv/creditScore/AppGridMemberScore/AppGridMemberScore.vue b/packages/conv/creditScore/AppGridMemberScore/AppGridMemberScore.vue index 42f29b0a..8b2c26c0 100644 --- a/packages/conv/creditScore/AppGridMemberScore/AppGridMemberScore.vue +++ b/packages/conv/creditScore/AppGridMemberScore/AppGridMemberScore.vue @@ -2,7 +2,9 @@