From 80d7d9a96ddf6118237fb3d26476d0f0abb8bc3c Mon Sep 17 00:00:00 2001 From: luyue123456 <1398150030@qq.com> Date: Thu, 5 Dec 2024 09:51:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=99=E8=82=B2=E5=9F=B9=E8=AE=AD=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ability/RwkMeetingController.java | 63 ++++++ .../resources/static/ruoyi/css/meeting.css | 80 +++++++ .../src/main/resources/templates/main.html | 53 ++++- .../templates/system/information/add.html | 4 +- .../templates/system/meeting/add.html | 196 ++++++++++++++++++ .../templates/system/meeting/edit.html | 188 +++++++++++++++++ .../templates/system/meeting/meeting.html | 158 ++++++++++++++ 7 files changed, 737 insertions(+), 5 deletions(-) create mode 100644 rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkMeetingController.java create mode 100644 rwk-admin/src/main/resources/static/ruoyi/css/meeting.css create mode 100644 rwk-admin/src/main/resources/templates/system/meeting/add.html create mode 100644 rwk-admin/src/main/resources/templates/system/meeting/edit.html create mode 100644 rwk-admin/src/main/resources/templates/system/meeting/meeting.html diff --git a/rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkMeetingController.java b/rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkMeetingController.java new file mode 100644 index 0000000..09dfa12 --- /dev/null +++ b/rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkMeetingController.java @@ -0,0 +1,63 @@ +package com.rwk.web.controller.ability; + +import com.rwk.common.core.controller.BaseController; +import com.rwk.common.core.page.TableDataInfo; +import com.rwk.system.domain.RwkStaffInformation; +import com.rwk.system.service.IRwkStaffInformationService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Controller +@RequestMapping("/system/meeting") +public class RwkMeetingController extends BaseController { + private String prefix = "system/meeting"; + + @Autowired + private IRwkStaffInformationService rwkStaffInformationService; + + @RequiresPermissions("system:meeting:view") + @GetMapping() + public String information() + { + return prefix + "/meeting"; + } + + /** + * 查询人员信息列表 + */ + @RequiresPermissions("system:meeting:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(RwkStaffInformation rwkStaffInformation) + { + startPage(); + List list = rwkStaffInformationService.selectRwkStaffInformationList(rwkStaffInformation); + return getDataTable(list); + } + + /** + * 修改人员信息 + */ + @RequiresPermissions("system:meeting:edit") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + return prefix + "/edit"; + } + + /** + * 修改人员信息 + */ + @RequiresPermissions("system:meeting:add") + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + +} diff --git a/rwk-admin/src/main/resources/static/ruoyi/css/meeting.css b/rwk-admin/src/main/resources/static/ruoyi/css/meeting.css new file mode 100644 index 0000000..a25d615 --- /dev/null +++ b/rwk-admin/src/main/resources/static/ruoyi/css/meeting.css @@ -0,0 +1,80 @@ +.tr-meeting tr{ + border: 1px solid #CCCCCC; + border-radius: 10px; + height: 170px; +} + +.meeting-introdution { + height: 32%!important; + width: 100%; +} +.meeting-content{ + height: 100%; +} +.div-display{ + display: inline-block; +} +.inline-meeting-div{ + display: inline-block; + /*margin-top: -20px;*/ +} +.meeting-pieChart1{ + height:40%; + width: 30%; + margin-top: 50px; +} +.pieChart1{ + height:100%; + width: 100%; +} +.meeting-add-input{ + border: 0px; + outline: none; +} +.meeting-add-header{ + height: 40px; + width: 100%; + font-size: 25px; +} +.meeting-add-content { + width: 98%; + height: 200px; + font-size: 18px; + font-family: 仿宋; + resize: none; + border: none; + outline: none; +} +.meeting-add-introdution { + height: 40%!important; + width: 100%; +} +.meeting-add-font{ + font-size: 18px; + font-family: 仿宋; +} +.meeting-btn-add{ + font-size: 20px; + height: 40px; + text-align: center!important; + align-content: center; +} +.meeting-add-files{ + /*border: 1px solid #5897fb;*/ + height: 173px; + width: 100%; +} + +.meeting-edit-files{ + /*border: 1px solid #5897fb;*/ + height: 173px; + width: 35%; + margin-left: 20px; +} +.meeting-table tr td{ + border: 1px solid black; +} + +.meeting-table tr{ + width: 100%; +} \ 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 4fbee83..eced24a 100644 --- a/rwk-admin/src/main/resources/templates/main.html +++ b/rwk-admin/src/main/resources/templates/main.html @@ -17,7 +17,7 @@
-

职务层次情况

+

知联会职务

@@ -39,7 +39,7 @@
-
正会长
+
会长
1
@@ -51,6 +51,46 @@
+
+

近期培训活动

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
***************************活动 2024-01-09
***************************活动 2024-01-09
***************************活动 2024-01-09
***************************活动 2024-01-09
***************************活动 2024-01-09
***************************活动 2024-01-09
***************************活动 2024-01-09
+
+
+
@@ -91,6 +131,7 @@ + + + \ No newline at end of file diff --git a/rwk-admin/src/main/resources/templates/system/meeting/edit.html b/rwk-admin/src/main/resources/templates/system/meeting/edit.html new file mode 100644 index 0000000..c4dfb46 --- /dev/null +++ b/rwk-admin/src/main/resources/templates/system/meeting/edit.html @@ -0,0 +1,188 @@ + + + + + + + + +
+ + + + + + +
+
+

培训活动标题示例

+
+
+
+ 培训活动简介示例培训活动简介示例培训活动简介示例
+ 培训活动简介示例培训活动简介示例培训活动简介示例培训活动简介示例
+ 培训活动简介示例培训活动简介示例 +
培训地点:*******楼****号***室 +
培训时间:2024年5月21日 +
+
+
+ +
+
+
+
+
+
+
+
+ +
+
+ + + + \ No newline at end of file diff --git a/rwk-admin/src/main/resources/templates/system/meeting/meeting.html b/rwk-admin/src/main/resources/templates/system/meeting/meeting.html new file mode 100644 index 0000000..d42a3c7 --- /dev/null +++ b/rwk-admin/src/main/resources/templates/system/meeting/meeting.html @@ -0,0 +1,158 @@ + + + + + + + + + +
+
+
+
+ +
+
    +
  • + + +
  • +
  • + + - + +
  • +
  • + 搜索 + 重置 +
  • +
+
+
+
+ + + +
+
+
+
+
+ + + + \ No newline at end of file