diff --git a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue index 104b0951..3699f017 100644 --- a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue +++ b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue @@ -562,37 +562,36 @@ export default { }) .then((res) => { if(res?.data) { - // let data = [ - // {taskCount: 4, deptId: "10"}, - // {taskCount: 6, deptId: "13"}, - // {taskCount: 24, deptId: "5"}, - // {taskCount: 14, deptId: "22"}, - // {taskCount: 12, deptId: "20"}, - // {taskCount: 11, deptId: "15"} - // ] + let data = [ + {taskCount: 4, deptId: "10"}, + {taskCount: 6, deptId: "13"}, + {taskCount: 24, deptId: "5"}, + {taskCount: 14, deptId: "22"}, + {taskCount: 12, deptId: "20"}, + {taskCount: 11, deptId: "15"} + ] let items = [], xData = [], yData = [] - res.data.map((item) => { - var i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId} - items.push(i) - xData.push(item.deptId) - yData.push(item.taskCount) - }) - // data.map((item) => { + // res.data.map((item) => { // var i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId} // items.push(i) - // xData.push(item.deptId) // yData.push(item.taskCount) // }) + data.map((item) => { + var i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId} + items.push(i) + // xData.push(item.deptId) + yData.push(item.taskCount) + }) - // this.initOpenData({canvas:true}) - // this.transCanvas(items).then((data) => { - // console.log(data,'data哈哈哈'); - // data.items.map((i) => { - // xData.push(i.data) - // }) - // this.getColumnarEcharts(xData, yData) - // }) - this.getColumnarEcharts(xData, yData) + this.initOpenData({canvas:true}) + this.transCanvas(items).then((data) => { + console.log(data,'data哈哈哈'); + data.items.map((i) => { + xData.push(i.data) + }) + this.getColumnarEcharts(xData, yData) + }) + // this.getColumnarEcharts(xData, yData) } }); }, diff --git a/src/project/saas/AppPropagandaStatistics/calendarInfo.vue b/src/project/saas/AppPropagandaStatistics/calendarInfo.vue index 896d7c29..46f25e03 100644 --- a/src/project/saas/AppPropagandaStatistics/calendarInfo.vue +++ b/src/project/saas/AppPropagandaStatistics/calendarInfo.vue @@ -45,14 +45,14 @@ export default { }, created() { this.getNowDay() - this.getData() + this.getData() }, methods: { changeMonth(e) { if(e.month<=9) { - this.yyyyMM = e.year + '-' + '0' + e.month + this.yyyyMM = e.year + '0' + e.month } else if(e.month > 9) { - this.yyyyMM = e.year + '-' + e.month + this.yyyyMM = e.year + e.month } this.getData() }, @@ -65,6 +65,7 @@ export default { const date = new Date() this.year = date.getFullYear() this.month = date.getMonth() + 1 + this.day = date.getDate() }, toGroup() { uni.navigateTo({url: './groupSendResident'}) @@ -81,7 +82,6 @@ export default { let arr = Object.keys(res.data).map(key => (res.data[key])) this.list = arr[this.day - 1]?.taskList let calList = arr.filter(item=> (item.taskList && item.taskList.length > 0)) - console.log(calList); this.selected = calList.map(item=> { if(item.day>=1 && item.day<=9) { if(this.month>=1 && this.month <=9) {