From 9e7aa8a447ebfa14b20d3a2fffb8435a6409e1fe Mon Sep 17 00:00:00 2001 From: 20918 <2091823062@qq.com> Date: Wed, 9 Oct 2024 09:43:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/system/count/SysMeetingnumController.java | 4 +--- 1 file changed, 1 insertion(+), 3 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 0801c46..63a2b60 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 @@ -76,7 +76,7 @@ public class SysMeetingnumController extends BaseController { AtomicReference yAxis = new AtomicReference<>(0L); Integer count = new LambdaQueryChainWrapper<>(tdMeetingService.getBaseMapper()) .ge(TdMeeting::getMeetingTime, minDayTime) - .le(TdMeeting::getMeetingTime, maxDayTime).count(); + .le(TdMeeting::getMeetingTime, maxDayTime).eq(TdMeeting::getMeetingState,1).count(); if (Objects.isNull(count)) { count = 0; } @@ -98,6 +98,4 @@ public class SysMeetingnumController extends BaseController { mmap.put("meeting", meeting); return prefix + "/detail"; } - - } \ No newline at end of file From 9ef3a6df5e0180ad2e14ddc4c5d6321ba499a38d Mon Sep 17 00:00:00 2001 From: dshclm <3321914460@qq.com> Date: Wed, 9 Oct 2024 09:47:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/system/examnum/countExam.html | 94 ++++++++++++++++++- 1 file changed, 92 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/system/examnum/countExam.html b/ruoyi-admin/src/main/resources/templates/system/examnum/countExam.html index 12b9581..fd14d31 100644 --- a/ruoyi-admin/src/main/resources/templates/system/examnum/countExam.html +++ b/ruoyi-admin/src/main/resources/templates/system/examnum/countExam.html @@ -12,7 +12,16 @@ } .count_top{ width: 100%; - height: 30%; + height: 25%; + } + .count_center{ + width: 100%; + height: 40%; + background-color: white; + border-radius: 10px; + display: flex; + justify-content: space-between; + overflow: hidden; } .count_top ul{ width: 100%; @@ -76,14 +85,28 @@ } .count_bottom{ width: 100%; - height: 70%; + height: 38%; background-color: white; border-radius: 10px; + margin-top: 10px; + } + .children_echarts{ + width: 33%; + height: 100%; + }
+
+
+
+
+
+
+
+
  • @@ -163,6 +186,7 @@
+