Merge remote-tracking branch 'origin/feature/20251222/notice' into feature/20251222/notice

# Conflicts:
#	public/js/Message/MessageList.js

public/js/Message/MessageList.js

@@ -229,7 +229,9 @@ layui.use(['form', 'table', 'laydate', 'layedit'], function () {
                                 page: false,
                                 where: {
                                     obj_type: 100,
-                                    obj_id: data.business_notice_id
+                                    obj_id: data.business_notice_id,
+                                    page:1,
+                                    limit:1000000,
                                 },
                                 cols: [[
                                     { type: 'numbers', title: '序号' },

public/js/public_notice.js

@@ -20,7 +20,7 @@ layui.use([], function () {
             const css = `
             .nrtx{line-height:38px;}
 .noticeitemxo{margin-right:30px;cursor: pointer;}            
-#ann_box{position:fixed;top:0;left:${left}px;right:400px;height:50px;line-height:50px;background:rgba(255,255,255,0);color:#333;overflow:hidden;z-index:9999;font-size:14px;}
+#ann_box{position:fixed;top:0;left:${left}px;right:400px;height:50px;line-height:50px;background:rgba(0,0,0,0.1);color:#333;overflow:hidden;z-index:9999;font-size:14px;}
 #ann_txt{white-space:nowrap;display:inline-block;padding-left:100%;animation:ann_scroll 300s linear infinite;}
 @keyframes ann_scroll{0%{transform:translateX(0)}100%{transform:translateX(-100%)}}`;
             const html = `<div id="ann_box"><div id="ann_txt"></div></div>`;
@@ -80,6 +80,13 @@ layui.use([], function () {
             node.style.animation = '';
         },
         handle: function () {
+            $('.layui-header .layui-icon-shrink-right').closest('.layui-nav-item').on('click', function () {
+                setTimeout(function(){
+                    $("#ann_box").css({"left":`${$(".layui-layout.layui-layout-admin").hasClass("admin-nav-mini")?'240px':'400px'}`})
+                },500)
+            });
+            
+
             document.getElementById('ann_box').addEventListener('mouseenter', () => {
                 document.getElementById('ann_txt').style.animationPlayState = 'paused';
             });
@@ -110,14 +117,14 @@ layui.use([], function () {
                         </div>
                     </div>
                     <div style="padding-left:39px;">公告详情</div>
-                    <div class="noticedetailcs" style="padding-left:39px;padding-top:15px;width:1060px;overflow-x: auto;"></div>
+                    <div class="noticedetailcs" style="padding-left:39px;padding-top:15px;max-width:1060px;overflow-x: auto;"></div>
                 </div>
                 `
                 layer.open({
                     type: 1,
                     title: '公告详情',
                     offset: '50px',
-                    area: ['1100px', '450'],
+                    area: ['1100px', '450px'],
                     shadeClose: false,
                     resize: false,
                     move: false,