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 @@