diff --git a/rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkStaffInformationController.java b/rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkStaffInformationController.java index 187da9d..9944c95 100644 --- a/rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkStaffInformationController.java +++ b/rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkStaffInformationController.java @@ -2,6 +2,7 @@ package com.rwk.web.controller.ability; import java.util.ArrayList; import java.util.List; +import java.util.Map; import com.rwk.common.utils.DateUtils; import com.rwk.system.service.IRwkFamilyMemberService; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -158,6 +159,31 @@ public class RwkStaffInformationController extends BaseController return toAjax(rwkStaffInformationService.deleteRwkStaffInformationByIds(ids)); } + /** + * 首页大屏数据集合 + */ + @GetMapping("/dashboard") + @ResponseBody + public AjaxResult dashboard(ModelMap mmap) { + List> list1 = rwkStaffInformationService.selectTotalByJob(); + List> list2 = rwkStaffInformationService.selectTotalByParty(); + List> list3 = rwkStaffInformationService.selectTotalByAge(); + List> list4 = rwkStaffInformationService.selectTotalByUnitAttribute(); + List> list5 = rwkStaffInformationService.selectTotalByQrzQualification(); + List> list6 = rwkStaffInformationService.selectTotalByQrzDegree(); + List> list7 = rwkStaffInformationService.selectTotalByZzQualification(); + List> list8 = rwkStaffInformationService.selectTotalByZzDegree(); + mmap.put("list1",list1); + mmap.put("list2",list2); + mmap.put("list3",list3); + mmap.put("list4",list4); + mmap.put("list5",list5); + mmap.put("list6",list6); + mmap.put("list7",list7); + mmap.put("list8",list8); + return success(mmap); + } + private List> splitConversion(String string){ List> result = new ArrayList<>(); String[] lines = string.split("\r\n"); diff --git a/rwk-admin/src/main/resources/static/css/use/css1.css b/rwk-admin/src/main/resources/static/css/use/css1.css index 0306323..e0151f5 100644 --- a/rwk-admin/src/main/resources/static/css/use/css1.css +++ b/rwk-admin/src/main/resources/static/css/use/css1.css @@ -279,4 +279,9 @@ dd,dl{ } .informationText table tr td:last-child{ text-align: left; +} +#informationTable label.error{ + position: relative; + right: 0; + top: 0; } \ No newline at end of file diff --git a/rwk-admin/src/main/resources/templates/main.html b/rwk-admin/src/main/resources/templates/main.html index bbfad28..4fbee83 100644 --- a/rwk-admin/src/main/resources/templates/main.html +++ b/rwk-admin/src/main/resources/templates/main.html @@ -92,16 +92,29 @@