fix: message format

src/components/NoticeIcon/Templates/Alarm/index.js

@@ -31,9 +31,8 @@ const Alarm = ({ message, confirmRead, config }) => {
     confirmRead(false, [message.id]);
     const widgetID = 'widget_city_综合运营_管网监控_实时监控_报警监控';
     const webPath = 'product/scada/AlertMonitoring/AlertMonitoring';
-    debugger
     const widget = findPathByWidget("productex/water/IOTMonitor/RealTimeAlarm/RealTimeAlarm", config.widgets, "", "url");
-    console.log(widget)
+
     window.share.event.emit('listenerMointer', {
       widgetId: widgetID,
       label: '报警监控',
@@ -71,12 +70,12 @@ const Alarm = ({ message, confirmRead, config }) => {
         <p>{alarmContent.alarmContent}</p>
         <p>
           <font style={{ color: '#ff0000' }} title="点击查看详情">
-            {(alarmValue.length > 0 &&
+            {(alarmValue && Array.isArray(alarmValue) && alarmValue.length > 0 &&
               alarmValue[0] !== 'undefined' &&
               alarmValue[0]) ||
               ''}
           </font>
-          {`${(alarmValue.length > 0 &&
+          {`${(alarmValue && Array.isArray(alarmValue) && alarmValue.length > 0 &&
             alarmValue[1] !== 'undefined' &&
             alarmValue[1]) ||
             ''} / ${alarmContent.alarmThreshold.split(' ').join('')}`}

src/components/Notifier/index.js

@@ -301,7 +301,7 @@ class Notifier {
             : '刚刚';
         const messString = {
           id: parseMessage.ID,
-          infoContent: messContent,
+          infoContent: this._siteConfig.MessageLevel === DEFAULT_PARSE_LEVEL ? messContent: JSON.parse(messContent || "{}"),
           infoLevel: parseMessage.level,
           time: `${timeMss}`,
           infoType,
@@ -550,7 +550,7 @@ class Notifier {
         : '刚刚';
     const message = {
       id: hisMessage.HisID,
-      infoContent: hisMessage.InfoContent,
+      infoContent: this._siteConfig.MessageLevel === DEFAULT_PARSE_LEVEL ? hisMessage.InfoContent: JSON.parse(hisMessage.InfoContent || "{}"),
       time: `${timeMss}`,
       infoType: this.getMessageType(hisMessage.InfoType),
       dateTime: hisMessage.HisCreateTime,

src/global.less

@@ -65,6 +65,7 @@ select:-webkit-autofill {
 #app {
   & /deep/ .@{ant-prefix}-pro-basicLayout-content {
     margin: 0 !important;
+    height: 100%;
   }
   .subapp-container div[data-qiankun='purehtml'] * {
     margin: inherit;