Merge branch 'master-mj-ztq' into 'master-mj'

feat:业务拓扑 查看告警详情



See merge request !1186

@@ -976,6 +976,22 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'msgTips'
                 $("#indexActiveAlarmList").html('<li style="width:390px;"><p>无告警</p></li>');
                 $("#indexActiveAlarmList").html('<li style="width:390px;"><p>无告警</p></li>');
             });
             });
         }
         }
+
+        $('#indexActiveAlarmList').on('click','li[data-id]',function(){
+            let win = window.parent;
+            if (win) {
+                window.parent.postMessage({
+                    type: 'openResAlarmDetail',
+                    message: {
+                        params:{
+                            'resId':$(this).data('id'),
+                            'batchNo':$(this).data('batchNo'),
+                        },
+                        title:'',
+                    }
+                }, '*')
+            }
+        })
         /**
         /**
          * 跳转到告警管理
          * 跳转到告警管理
          * bizId 业务id
          * bizId 业务id

@@ -89,7 +89,7 @@
     {{# var alarmLevelClas = 'warn-normal'}}
     {{# var alarmLevelClas = 'warn-normal'}}
     {{# if(item.alarmLevel == 3){ alarmLevelClas = 'warn-worst' } }}
     {{# if(item.alarmLevel == 3){ alarmLevelClas = 'warn-worst' } }}
     {{# if(item.alarmLevel == 2){ alarmLevelClas = 'warn-worse' } }}
     {{# if(item.alarmLevel == 2){ alarmLevelClas = 'warn-worse' } }}
-    <li data-id="{{item.id}}" title="{{item.alarmContent}}">
+    <li style="cursor: pointer;" data-id="{{item.id}}" title="{{item.alarmContent}}" data-batch-no="{{item.batchNo}}">
         <i class="icon-level {{alarmLevelClas}}">{{index+1}}</i>
         <i class="icon-level {{alarmLevelClas}}">{{index+1}}</i>
         <span>{{item.updateTime}}</span>
         <span>{{item.updateTime}}</span>
         <p>{{item.alarmContent}}</p>
         <p>{{item.alarmContent}}</p>