diff --git a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue index 94371e0c..a0f06b67 100644 --- a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue +++ b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue @@ -41,12 +41,17 @@
200
-
+
触达人次
+
+
宣发次数
+
+
宣发任务数
+
宣发明细
-
+
筛选
@@ -90,7 +95,9 @@ export default { data() { return { isShow: false, - brokenEcharts: null, + brokenEcharts1: null, + brokenEcharts2: null, + brokenEcharts3: null, columnarEcharts: null, pieEcharts: null, filterShow: false, @@ -101,7 +108,9 @@ export default { document.title = '宣发统计' }, mounted() { - this.getBrokenEcharts() + this.getBrokenEcharts1() + this.getBrokenEcharts2() + this.getBrokenEcharts3() this.getColumnarEcharts() this.getPieEcharts() }, @@ -112,18 +121,12 @@ export default { uni.navigateTo({url: `./calendarInfo`}) }, // 折线图 - getBrokenEcharts() { - this.brokenEcharts = echarts.init(document.getElementById('brokenEcharts')) - this.brokenEcharts.setOption({ + getBrokenEcharts1() { + this.brokenEcharts1 = echarts.init(document.getElementById('brokenEcharts1')) + this.brokenEcharts1.setOption({ tooltip: { trigger: 'axis' }, - legend: { - selectedMode: false, - orient: 'horizontal', - padding: [25,0,0,0], - data: ['触达人次', '宣发次数', '宣发任务数'] - }, grid: { left: '2%', right: '5%', @@ -160,19 +163,122 @@ export default { }, series: [ { - name: '触达人次', type: 'line', - data: [120, 132, 101, 134, 90, 230] + data: [120, 132, 101, 134, 90, 230], + lineStyle: { + color: '#4B87FE', + }, + itemStyle: { + color: '#4E8EEE' + } }, + ] + }) + }, + getBrokenEcharts2() { + this.brokenEcharts2 = echarts.init(document.getElementById('brokenEcharts2')) + this.brokenEcharts2.setOption({ + tooltip: { + trigger: 'axis' + }, + grid: { + left: '2%', + right: '5%', + bottom: '2%', + containLabel: true + }, + dataZoom: [ { - name: '宣发次数', - type: 'line', - data: [220, 182, 191, 234, 290, 330] + id: 'dataZoomX', + type: 'slider', + xAxisIndex: [0], + filterMode: 'filter' }, + ], + xAxis: { + type: 'category', + boundaryGap: false, + axisTick: { + show: false, + }, + axisLine: { + show: false, + }, + data: ['2月', '3月', '4月', '5月', '6月', '7月'] + }, + yAxis: { + type: 'value', + axisTick: { + show: false, + }, + axisLine: { + show: false, + } + }, + series: [ { - name: '宣发任务数', type: 'line', - data: [1000, 232, 201, 154, 190, 330] + data: [220, 182, 191, 234, 290, 330], + lineStyle: { + color: '#32C5FF', + }, + itemStyle: { + color: '#31C1FA' + } + }, + ] + }) + }, + getBrokenEcharts3() { + this.brokenEcharts3 = echarts.init(document.getElementById('brokenEcharts3')) + this.brokenEcharts3.setOption({ + tooltip: { + trigger: 'axis' + }, + grid: { + left: '2%', + right: '5%', + bottom: '2%', + containLabel: true + }, + dataZoom: [ + { + id: 'dataZoomX', + type: 'slider', + xAxisIndex: [0], + filterMode: 'filter' + }, + ], + xAxis: { + type: 'category', + boundaryGap: false, + axisTick: { + show: false, + }, + axisLine: { + show: false, + }, + data: ['2月', '3月', '4月', '5月', '6月', '7月'] + }, + yAxis: { + type: 'value', + axisTick: { + show: false, + }, + axisLine: { + show: false, + } + }, + series: [ + { + type: 'line', + data: [1000, 232, 201, 154, 190, 330], + lineStyle: { + color: '#FFAA44', + }, + itemStyle: { + color: '#FFAA44' + } }, ] }) @@ -348,6 +454,13 @@ export default { } } } + + .title { + padding: 30px 0; + box-sizing: border-box; + font-size: 32px; + font-weight: 600; + } } .brokenEcharts, @@ -355,7 +468,9 @@ export default { .pieEcharts { background: #FFF; - #brokenEcharts, + #brokenEcharts1, + #brokenEcharts2, + #brokenEcharts3, #columnarEcharts, #pieEcharts { width: 100%; diff --git a/src/project/saas/AppPropagandaStatistics/calendarInfo.vue b/src/project/saas/AppPropagandaStatistics/calendarInfo.vue index 5581a150..29644ea2 100644 --- a/src/project/saas/AppPropagandaStatistics/calendarInfo.vue +++ b/src/project/saas/AppPropagandaStatistics/calendarInfo.vue @@ -4,19 +4,21 @@
-
-
11:00
-
晴风小区志愿者活动
+
+
{{ item.time }}
+
{{ item.info }}
-
-
11:00
-
晴风小区志愿者活动
+
+
{{ item.time }}
+
{{ item.info }}
-
查看更多
+
查看更多
@@ -28,6 +30,10 @@ export default { return { date: '', selected: [{date: '2022-07-12'}], + list: [{ + time: '11:00', + info: '晴风小区志愿者活动' + }] } }, components: { @@ -37,8 +43,13 @@ export default { change(val) { this.date = `${val.year} + '-' + ${val.month} + '-' + ${val.day}` }, + toGroup() { + uni.navigateTo({url: './groupSendResident'}) + } + }, + onShow() { + document.title = '宣发日历' }, - onShow() {}, } diff --git a/src/project/saas/AppPropagandaStatistics/groupSendResident.vue b/src/project/saas/AppPropagandaStatistics/groupSendResident.vue index b7e74c5c..ce98e490 100644 --- a/src/project/saas/AppPropagandaStatistics/groupSendResident.vue +++ b/src/project/saas/AppPropagandaStatistics/groupSendResident.vue @@ -1,5 +1,25 @@ \ No newline at end of file