From 717904cf7f1af0798c840679d07dcb3e0ceb9b2a Mon Sep 17 00:00:00 2001 From: zouyx <1798599149@qq.com> Date: Tue, 29 Apr 2025 17:50:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../notice/controller/NoticeController.java | 8 +++- .../project/system/notice/domain/Notice.java | 10 ++++ .../main/resources/static/ruoyi/js/ry-ui.js | 46 +++++++++++++++++++ .../templates/system/notice/detail.html | 18 ++++++-- 4 files changed, 76 insertions(+), 6 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/controller/NoticeController.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/controller/NoticeController.java index 1542bea1..156c13d7 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/controller/NoticeController.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/controller/NoticeController.java @@ -1,5 +1,8 @@ package com.zdxt.auth.project.system.notice.controller; +import java.text.DateFormat; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.List; @@ -90,7 +93,10 @@ public class NoticeController extends BaseController @GetMapping("/detail/{noticeId}") public String detail(@PathVariable("noticeId") String noticeId, ModelMap mmap) { - mmap.put("notice", noticeService.selectNoticeById(noticeId)); + DateFormat str=DateFormat.getDateTimeInstance(); + Notice notice=noticeService.selectNoticeById(noticeId); + notice.setCreateTimeStr(str.format(notice.getCreateTime())); + mmap.put("notice", notice); return prefix + "/detail"; } diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/domain/Notice.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/domain/Notice.java index de1b8313..034feb59 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/domain/Notice.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/domain/Notice.java @@ -50,6 +50,7 @@ public class Notice extends BaseDomain private List bureauDeptNameList; private String beginTime; private String endTime; + private String createTimeStr; public String getNoticeId() @@ -192,6 +193,14 @@ public class Notice extends BaseDomain this.endTime = endTime; } + public String getCreateTimeStr() { + return createTimeStr; + } + + public void setCreateTimeStr(String createTimeStr) { + this.createTimeStr = createTimeStr; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -210,6 +219,7 @@ public class Notice extends BaseDomain .append("bureauDeptNameList",getBureauDeptNameList()) .append("beginTime",getBeginTime()) .append("endTime",getEndTime()) + .append("createTimeStr",getCreateTimeStr()) .toString(); } diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ruoyi/js/ry-ui.js b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ruoyi/js/ry-ui.js index 475aec63..112c1c07 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/ruoyi/js/ry-ui.js @@ -774,6 +774,52 @@ var table = { } }); }, + // 弹出层指定宽度 + openClose: function (title, url, width, height, callback) { + //如果是移动端，就使用自适应大小弹窗 + if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) { + width = 'auto'; + height = 'auto'; + } + if ($.common.isEmpty(title)) { + title = false; + } + if ($.common.isEmpty(url)) { + url = "/404.html"; + } + if ($.common.isEmpty(width)) { + width = 800; + } + if ($.common.isEmpty(height)) { + height = ($(window).height() - 50); + } + if ($.common.isEmpty(callback)) { + callback = function(index, layero) { + var iframeWin = layero.find('iframe')[0]; + iframeWin.contentWindow.submitHandler(index, layero); + } + } + layer.open({ + type: 2, + area: [width + 'px', height + 'px'], + fix: false, + //不固定 + maxmin: true, + shade: 0.3, + title: title, + content: url, + btn: ['关闭'], + // 弹层外区域关闭 + shadeClose: true, + yes: function (index, layero) { + layer.close(index); + } + // , + // cancel: function(index) { + // return true; + // } + }); + }, // 弹出层指定参数选项 openOptions: function (options) { var _url = $.common.isEmpty(options.url) ? "/404.html" : options.url; diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/detail.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/detail.html index 3792f237..825b7d4c 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/detail.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/notice/detail.html @@ -26,7 +26,7 @@
- +
@@ -46,7 +46,7 @@
- +
@@ -82,12 +82,20 @@ callbacks: { onImageUpload: function (files) { sendFile(files[0], this); - } + }, + onInit: function() { + // 加载初始内容并渲染为富文本 + var initialContent = $('#noticeContent').val(); + console.log(initialContent) + $('#editor').summernote('code', initialContent); + // 禁用编辑器交互 + $('#editor').summernote('disable'); + } } }); - var content = $("#noticeContent").val(); +/* var content = $("#noticeContent").val(); $('#editor').summernote('code', content); - $('#editor').summernote('disable'); + $('#editor').summernote('disable');*/ }); $(function (){ initFile();