From 1f729bf86052fca06a446982db6c5c8a4ad2561f Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 18 Jul 2022 10:55:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=A3=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cooperationDetail.vue | 262 +++++++++++------- .../AppPropagandaStatistics.vue | 93 +++++-- .../AppPropagandaStatistics/calendarInfo.vue | 27 +- 3 files changed, 243 insertions(+), 139 deletions(-) diff --git a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue index 999144f4..d39702bd 100644 --- a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue +++ b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue @@ -2,35 +2,54 @@
-
{{ item }} +
+ {{ item }}
- -
+
防疫宣传群发通知
-
创建时间: {{ createTime }}
+
+ 创建时间: {{ createTime }} +
查看详情
-
数据更新于{{ info.remindTime }}
+
+ 数据更新于{{ info.remindTime }} +
-
+
-
计划送达居民群: {{ info.planCount || 0 }}
-
未送达居民群: {{ info.unExecutedCount || 0 }}
-
已送达居民群: {{ info.executedCount || 0 }}
-
无法送达居民群: {{ info.cannotExecuteCount || 0 }}
+
+ 计划送达居民群: {{ info.planCount || 0 }} +
+
+ 未送达居民群: {{ info.unExecutedCount || 0 }} +
+
+ 已送达居民群: {{ info.executedCount || 0 }} +
+
+ 无法送达居民群: {{ info.cannotExecuteCount || 0 }} +
-
提醒成员发送
+ +
提醒成员发送
@@ -39,8 +58,16 @@
- - + +
@@ -48,143 +75,174 @@ \ No newline at end of file diff --git a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue index 9ab6cc7d..0556722a 100644 --- a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue +++ b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue @@ -198,20 +198,38 @@
开始时间：
-
- +
+
结束时间：
-
- +
+
- - + +
确定
@@ -271,7 +289,6 @@ export default { this.getNowDate(); }, mounted() { - // this.getBrokenDate(); this.getBrokenEcharts1(); this.getBrokenEcharts2(); this.getBrokenEcharts3(); @@ -283,8 +300,8 @@ export default { checkTime(index) { if (index == 3) { this.timeSelect = index; - this.customShow = true; - + this.customShow = true; + this.showStart = false; this.showEnd = false; } else { @@ -298,34 +315,35 @@ export default { // 重置 reset() { this.timeType = 0; - this.startTime = ""; - this.endTime = ""; + this.timeSelect = 0; + this.start = ""; + this.end = ""; this.departId = ""; }, selectConfirm() { if (this.timeSelect == 3) { - this.timeType = this.timeSelect; + this.detailType = this.timeSelect; this.start = this.startTime; this.end = this.endTime; this.getBrokenDate(); } else { - this.timeType = this.timeSelect; + this.detailType = this.timeSelect; this.getBrokenDate(); } this.filterShow = false; }, confirmStart(val) { - this.startTime = val.year + '-' + val.month + '-' + val.day + this.startTime = val.year + "-" + val.month + "-" + val.day; }, confirmEnd(val) { - this.endTime = val.year + '-' + val.month + '-' + val.day + this.endTime = val.year + "-" + val.month + "-" + val.day; }, handleTime() { - this.start = this.startTime - this.end = this.endTime + this.start = this.startTime; + this.end = this.endTime; this.customShow = false; }, @@ -341,10 +359,8 @@ export default { params: {}, }) .then((res) => { - { - if (res?.data) { - this.calendarList = res.data; - } + if (res?.data) { + this.calendarList = res.data; } }); }, @@ -363,18 +379,37 @@ export default { .then((res) => { if (res?.data) { if (this.timeType == 0) { - this.resX = res.data.trend.map((e) =>e.ymd.substring(5, 7) + "月" + e.ymd.substring(8, 10) + "日"); + this.resX = res.data.trend.map( + (e) => + e.ymd.substring(5, 7) + "月" + e.ymd.substring(8, 10) + "日" + ); } else if (this.timeType == 1) { - this.resX = res.data.trend.map((e) =>e.ymd.substring(5, 7) + "月" + e.ymd.substring(8, 10) + "日"); + this.resX = res.data.trend.map( + (e) => + e.ymd.substring(5, 7) + "月" + e.ymd.substring(8, 10) + "日" + ); } else if (this.timeType == 2) { - this.resX = res.data.trend.map((e) =>e.ymd.substring(0, 4) + "年" + e.ymd.substring(5, 7) + "月"); + this.resX = res.data.trend.map( + (e) => + e.ymd.substring(0, 4) + "年" + e.ymd.substring(5, 7) + "月" + ); } this.resY = res.data.trend.map((e) => e.receiveCount); - this.peopleNum = this.resY.reduce((accumulator, currentValue)=>{ return accumulator + currentValue}) + this.peopleNum = this.resY.reduce((accumulator, currentValue) => { + return accumulator + currentValue; + }); this.res2Y = res.data.trend.map((e) => e.executeCount); - this.sendNum = this.res2Y.reduce((accumulator, currentValue)=>{ return accumulator + currentValue}) + this.sendNum = this.res2Y.reduce((accumulator, currentValue) => { + return accumulator + currentValue; + }); this.res3Y = res.data.trend.map((e) => e.createCount); - this.predictNum = this.res3Y.reduce((accumulator, currentValue)=>{ return accumulator + currentValue}) + this.predictNum = this.res3Y.reduce((accumulator, currentValue) => { + return accumulator + currentValue; + }); + this.getBrokenEcharts1(); + this.getBrokenEcharts2(); + this.getBrokenEcharts3(); + this.getColumnarEcharts(); } }); }, @@ -382,8 +417,6 @@ export default { getBrokenEcharts1() { let dataX = this.resX; let dataY1 = this.resY; - console.log(dataX); - console.log(dataY1); this.brokenEcharts1 = echarts.init( document.getElementById("brokenEcharts1") ); @@ -414,7 +447,7 @@ export default { axisLine: { show: false, }, - data: dataX, + data: this.resX, }, yAxis: { type: "value", diff --git a/src/project/saas/AppPropagandaStatistics/calendarInfo.vue b/src/project/saas/AppPropagandaStatistics/calendarInfo.vue index a02149e2..43f7ecca 100644 --- a/src/project/saas/AppPropagandaStatistics/calendarInfo.vue +++ b/src/project/saas/AppPropagandaStatistics/calendarInfo.vue @@ -1,6 +1,6 @@