diff --git a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue index 8ceb01ee..28077f2a 100644 --- a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue +++ b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue @@ -10,82 +10,25 @@
-
- 昨天{{ nowMonth }}.{{ nowDate - 1 }} -
-
- 晴风小区志愿者活动 -
-
- 今日暂无宣发任务 -
+
昨天{{ nowMonth }}.{{ nowDate - 1 }}
+
晴风小区志愿者活动
+
晴风小区志愿者活动
+
今日暂无宣发任务
+
{{ isShow ? "收起" : "展开" }}
-
- 今天{{ nowMonth }}.{{ nowDate }} -
-
- 晴风小区志愿者活动 -
-
- 今日暂无宣发任务 -
+
今天{{ nowMonth }}.{{ nowDate }}
+
晴风小区志愿者活动
+
晴风小区志愿者活动
+
今日暂无宣发任务
+
{{ isShow ? "收起" : "展开" }}
-
- 明天{{ nowMonth }}.{{ nowDate + 1 }} -
-
- 晴风小区志愿者活动 -
-
- 今日暂无宣发任务 -
-
- {{ isShow ? "收起" : "展开" }} -
+
明天{{ nowMonth }}.{{ nowDate + 1 }}
+
晴风小区志愿者活动
+
晴风小区志愿者活动
+
今日暂无宣发任务
+
{{ isShow ? "收起" : "展开" }}
@@ -437,7 +380,6 @@ export default { }, dataZoom: [ { - id: "dataZoomX", type: "slider", xAxisIndex: [0], filterMode: "filter", @@ -495,7 +437,6 @@ export default { }, dataZoom: [ { - id: "dataZoomX", type: "slider", xAxisIndex: [0], filterMode: "filter", @@ -553,7 +494,6 @@ export default { }, dataZoom: [ { - id: "dataZoomX", type: "slider", xAxisIndex: [0], filterMode: "filter", @@ -613,6 +553,13 @@ export default { document.getElementById("columnarEcharts") ); this.columnarEcharts.setOption({ + dataZoom: [ + { + type: "slider", + xAxisIndex: [0], + filterMode: "filter", + }, + ], xAxis: { type: "category", axisTick: { diff --git a/src/project/saas/AppPropagandaStatistics/calendarInfo.vue b/src/project/saas/AppPropagandaStatistics/calendarInfo.vue index 43f7ecca..74e8efde 100644 --- a/src/project/saas/AppPropagandaStatistics/calendarInfo.vue +++ b/src/project/saas/AppPropagandaStatistics/calendarInfo.vue @@ -3,22 +3,23 @@
-
-
-
{{ item.time }}
-
{{ item.info }}
+
+
+
+
{{ item.createTime.substring(10, 16) }}
+
{{ item.taskTitle }}
+
-
-
-
-
{{ item.time }}
-
{{ item.info }}
+
+
+
{{ item.createTime.substring(10, 16) }}
+
{{ item.taskTitle }}
+
+
查看更多
- -
查看更多
+
@@ -30,10 +31,8 @@ export default { return { date: '', selected: [], - list: [{ - time: '11:00', - info: '晴风小区志愿者活动' - }], + list: [], + show: false, calendarList: {}, year: '', month: '', @@ -46,8 +45,7 @@ export default { }, created() { this.getNowDay() - this.getData() - + this.getData() }, methods: { changeMonth(e) { @@ -59,7 +57,9 @@ export default { this.getData() }, change(val) { - this.date = `${val.year} + '-' + ${val.month} + '-' + ${val.day}` + this.date = val.fulldate + this.day = val.date + this.getData() }, getNowDay() { const date = new Date() @@ -79,6 +79,7 @@ export default { if (res?.data) { this.calendarList = res.data; 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)) this.selected = calList.map(item=> { if(item.day>=1 && item.day<=9) { @@ -164,14 +165,11 @@ export default { } .readMore { - height: 100px; - line-height: 100px; + height: 40px; + line-height: 40px; text-align: center; color: #3F8DF5; } } - - - } \ No newline at end of file