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 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 @@
+