From 210a1960a708bd67ffd1bee02e1a3402e286a396 Mon Sep 17 00:00:00 2001
From: wangxy <1481820854@qq.com>
Date: Tue, 15 Oct 2024 10:27:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=BB=9F=E8=AE=A1=E8=BF=91=E7=BA=BF?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=9A=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/count/SysMeetingnumController.java |  2 +-
 .../tdmeeting/meetingnum/meetingnum.html      | 39 +++++++++++++++++--
 2 files changed, 37 insertions(+), 4 deletions(-)

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<String> recentlyTwelveMonth = ObtainLastSixMonthsUtil.getRecentlyTwelveMonth();
+        List<String> recentlyTwelveMonth = ObtainLastSixMonthsUtil.getRecentlySixMonth();
         List<Long> yAxisData = new ArrayList<>();
         List<Long> yAxisDataW = new ArrayList<>();
         List<Long> 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 @@
         <div class="count_top">
             <div class="echart">
                 <div class="children_echarts right_echarts">
-                    <div id="rightMain" style="width: 1300px;height:380px"></div>
+                    <div id="rightMain" style="width: 700px;height:380px"></div>
+                </div>
+                <div class="children_echarts left_echarts">
+                    <div id="leftMain" style="width: 700px;height:380px"></div>
                 </div>
             </div>
         </div>
@@ -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({