From 426d04ab36519657ce0592eef7169d63a41e7af6 Mon Sep 17 00:00:00 2001
From: liuhanqing <447067298@qq.com>
Date: Fri, 29 Jan 2021 21:19:30 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90notice/message=E3=80=91=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=B6=88=E6=81=AF=E6=98=BE=E7=A4=BA=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: liuhanqing <447067298@qq.com>
---
 .../webapp/assets/modular/system/message/message_list.js    | 3 ++-
 src/main/webapp/pages/index.html                            | 4 ++--
 src/main/webapp/pages/modular/system/index/message.html     | 2 +-
 .../webapp/pages/modular/system/message/message_view.html   | 6 ++++++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/assets/modular/system/message/message_list.js b/src/main/webapp/assets/modular/system/message/message_list.js
index a39cfb6d..8f67d038 100644
--- a/src/main/webapp/assets/modular/system/message/message_list.js
+++ b/src/main/webapp/assets/modular/system/message/message_list.js
@@ -16,8 +16,9 @@ layui.use(['table', 'form', 'func', 'HttpRequest', 'util'], function () {
         return [[
             {type: 'checkbox'},
             {field: 'messageId', hide: true, title: '主键id'},
+            {field: 'businessTypeValue', sort: true, title: '业务类型'},
             {field: 'messageTitle', sort: true, title: '消息标题'},
-            // {field: 'messageType', sort: true, title: '消息类型'},
+            {field: 'messageType', sort: true, title: '消息类型'},
             // {field: 'priorityLevelValue', sort: true, title: '优先级'},
             {field: 'priorityLevelValue', sort: true, title: '优先级'},
             {field: 'readFlagValue', sort: true, title: '阅读状态'
diff --git a/src/main/webapp/pages/index.html b/src/main/webapp/pages/index.html
index 90f22c2d..67051511 100644
--- a/src/main/webapp/pages/index.html
+++ b/src/main/webapp/pages/index.html
@@ -126,11 +126,11 @@
                 try {
                     let msg = JSON.parse(data)
                     notice.info({
-                        title: msg.messageTitle,
+                        title: '['+msg.businessTypeValue+']'+msg.messageTitle,
                         message: msg.messageContent,
                         timeout: false
                     });
-                    $('#messageDot').hide();
+                    $('#messageDot').show();
                 } catch (e) {
                 }
             },
diff --git a/src/main/webapp/pages/modular/system/index/message.html b/src/main/webapp/pages/modular/system/index/message.html
index 531f047b..29530c12 100644
--- a/src/main/webapp/pages/modular/system/index/message.html
+++ b/src/main/webapp/pages/modular/system/index/message.html
@@ -19,7 +19,7 @@
                     <a class="message-list-item" href="javascript:Message.openViewDlg('${msg.messageId}');">
                         <i class="layui-icon layui-icon-speaker message-item-icon"></i>
                         <div class="message-item-right">
-                            <h2 class="message-item-title">${msg.messageTitle}</h2>
+                            <h2 class="message-item-title">[${msg.businessTypeValue}]${msg.messageTitle}</h2>
                             <p class="message-item-text">${msg.messageSendTime,"yyyy-MM-dd HH:mm:ss"}</p>
                         </div>
                     </a>
diff --git a/src/main/webapp/pages/modular/system/message/message_view.html b/src/main/webapp/pages/modular/system/message/message_view.html
index 6dbbdf7f..669c15b1 100644
--- a/src/main/webapp/pages/modular/system/message/message_view.html
+++ b/src/main/webapp/pages/modular/system/message/message_view.html
@@ -7,6 +7,12 @@
             <div class="layui-card-body">
                 <div class="layui-form-item layui-row">
                     <input name="messageId" type="hidden"/>
+                    <div class="layui-inline layui-col-md12">
+                        <label class="layui-form-label">业务类型</label>
+                        <div class="layui-input-block">
+                            <input id="businessTypeValue" name="businessTypeValue" placeholder="请输入业务类型" type="text" class="layui-input" lay-verify="" required viewForm="textinput"/>
+                        </div>
+                    </div>
                     <div class="layui-inline layui-col-md12">
                         <label class="layui-form-label">消息标题</label>
                         <div class="layui-input-block">