diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysMeetingnumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysMeetingnumController.java index 02c4e51..8476b7a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysMeetingnumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysMeetingnumController.java @@ -62,7 +62,7 @@ public class SysMeetingnumController extends BaseController { @PostMapping("/countMeetingMonth") @ResponseBody public AjaxResult countMeetingMonth() { - List recentlyTwelveMonth = ObtainLastSixMonthsUtil.getRecentlyTwelveMonth(); + List recentlyTwelveMonth = ObtainLastSixMonthsUtil.getRecentlySixMonth(); List yAxisData = new ArrayList<>(); List yAxisDataW = new ArrayList<>(); List yAxisDataXs= new ArrayList<>(); diff --git a/ruoyi-admin/src/main/resources/templates/system/tdmeeting/meetingnum/meetingnum.html b/ruoyi-admin/src/main/resources/templates/system/tdmeeting/meetingnum/meetingnum.html index 86108dd..31ec328 100644 --- a/ruoyi-admin/src/main/resources/templates/system/tdmeeting/meetingnum/meetingnum.html +++ b/ruoyi-admin/src/main/resources/templates/system/tdmeeting/meetingnum/meetingnum.html @@ -45,7 +45,10 @@
-
+
+
+
+
@@ -145,7 +148,7 @@ }, tooltip: {}, legend: { - data:['已召开','未召开','线上会议','线下会议'] + data:['已召开','未召开'] }, xAxis: { data: response.data.data.xAxisData, @@ -173,7 +176,34 @@ itemStyle: { color: '#a2ea57' } - }, + } + ], + }); + } + }) + + var leftMain = echarts.init(document.getElementById('leftMain')); + axios.post(prefix + '/countMeetingMonth').then(response => { + if (response.data.code == web_status.SUCCESS){ + leftMain.setOption({ + title: { + text: '会议类型统计' + }, + tooltip: {}, + legend: { + data:['线上会议','线下会议'] + }, + xAxis: { + data: response.data.data.xAxisData, + /*axisLabel: { + rotate: 45, // 旋转标签的角度 + margin: 10, // 标签与坐标轴的间距 + },*/ + }, + yAxis: { + + }, + series: [ { name: '线上会议', type: 'bar', @@ -194,6 +224,9 @@ }); } }) + + + var prefixTable = ctx + "system/checkReport"; let datas = [] $.ajax({