From 0894a937824476073e17c62afb91ec96022ff594 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 22 Aug 2022 16:34:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=A5=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppPropagandaStatistics.vue | 35 ++++++++++--------- .../AppPropagandaStatistics/calendarInfo.vue | 4 +-- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/apps/AppPropagandaStatistics/AppPropagandaStatistics.vue b/src/apps/AppPropagandaStatistics/AppPropagandaStatistics.vue index 2d77d95b..06d2a96e 100644 --- a/src/apps/AppPropagandaStatistics/AppPropagandaStatistics.vue +++ b/src/apps/AppPropagandaStatistics/AppPropagandaStatistics.vue @@ -550,23 +550,26 @@ export default { .then((res) => { if (res.code ===0) { if(res.data && res.data.length) { - this.colData = res.data - let items = [], xData = [], yData = [] - res.data.forEach((item) => { - const i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId} - items.push(i) - yData.push(item.taskCount) - }) + let xData = res.data.map(e=> e.deptName) + let yData = res.data.map(e=> e.taskCount) + this.getColumnarEcharts(xData, yData) + // this.colData = res.data + // let items = [], xData = [], yData = [] + // res.data.forEach((item) => { + // const i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId} + // items.push(i) + // yData.push(item.taskCount) + // }) - this.initOpenData({canvas:true}) - setTimeout(() => { - this.transCanvas(items).then((data) => { - data.items.map((a) => { - xData.push(a.data) - }) - this.getColumnarEcharts(xData, yData) - }) - }, 2000) + // this.initOpenData({canvas:true}) + // setTimeout(() => { + // this.transCanvas(items).then((data) => { + // data.items.map((a) => { + // xData.push(a.data) + // }) + // this.getColumnarEcharts(xData, yData) + // }) + // }, 2000) } } }); diff --git a/src/apps/AppPropagandaStatistics/calendarInfo.vue b/src/apps/AppPropagandaStatistics/calendarInfo.vue index 216b3a1a..39424350 100644 --- a/src/apps/AppPropagandaStatistics/calendarInfo.vue +++ b/src/apps/AppPropagandaStatistics/calendarInfo.vue @@ -5,7 +5,7 @@
-
+
{{ item.createTime.substring(10, 16) }}
@@ -21,7 +21,7 @@
查看更多
- +
From f5f34da7f6c44ccb2bca4854dd9412565ce7dbc2 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 22 Aug 2022 16:51:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=A3=E5=8F=91=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppPropagandaStatistics.vue | 25 +++++-------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/src/apps/AppPropagandaStatistics/AppPropagandaStatistics.vue b/src/apps/AppPropagandaStatistics/AppPropagandaStatistics.vue index 06d2a96e..9d5f69f2 100644 --- a/src/apps/AppPropagandaStatistics/AppPropagandaStatistics.vue +++ b/src/apps/AppPropagandaStatistics/AppPropagandaStatistics.vue @@ -550,26 +550,13 @@ export default { .then((res) => { if (res.code ===0) { if(res.data && res.data.length) { - let xData = res.data.map(e=> e.deptName) - let yData = res.data.map(e=> e.taskCount) + this.colData = res.data + let xData = [], yData = [] + res.data.forEach((item) => { + xData.push(item.deptName) + yData.push(item.taskCount) + }) this.getColumnarEcharts(xData, yData) - // this.colData = res.data - // let items = [], xData = [], yData = [] - // res.data.forEach((item) => { - // const i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId} - // items.push(i) - // yData.push(item.taskCount) - // }) - - // this.initOpenData({canvas:true}) - // setTimeout(() => { - // this.transCanvas(items).then((data) => { - // data.items.map((a) => { - // xData.push(a.data) - // }) - // this.getColumnarEcharts(xData, yData) - // }) - // }, 2000) } } }); From deb90ea17bafb607ed6f531d02ab87db51baefd8 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 22 Aug 2022 16:56:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppPropagandaStatistics/AppPropagandaStatistics.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/AppPropagandaStatistics/AppPropagandaStatistics.vue b/src/apps/AppPropagandaStatistics/AppPropagandaStatistics.vue index 9d5f69f2..422c0fea 100644 --- a/src/apps/AppPropagandaStatistics/AppPropagandaStatistics.vue +++ b/src/apps/AppPropagandaStatistics/AppPropagandaStatistics.vue @@ -556,7 +556,7 @@ export default { xData.push(item.deptName) yData.push(item.taskCount) }) - this.getColumnarEcharts(xData, yData) + setTimeout(() => {this.getColumnarEcharts(xData, yData)}, 2000) } } });