monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit d5e3ffdc683413472e52e70189d58e652c001671 2 parents 32d4552e 9c06e5b9

Merge branch 'master-500-dev-xwx' into 'master-500-dev' 

告警处理页面优化



See merge request !540
Inline Side-by-side
Showing 4 changed files with 26 additions and 23 deletions
@@ -3,29 +3,29 @@ @@ -3,29 +3,29 @@
3 <div class="content-body-info"> 3 <div class="content-body-info">
4 <div class="info-item-statistics"> 4 <div class="info-item-statistics">
5 统计信息：该告警历史上出现了{{statisticsData.alarmCnt?statisticsData.alarmCnt:0}}次 5 统计信息：该告警历史上出现了{{statisticsData.alarmCnt?statisticsData.alarmCnt:0}}次
6 - <span v-if="statisticsData.alarmCnt">，平均持续时长{{statisticsData.continueTimeAvg?statisticsData.continueTimeAvg:0}}s,  
7 - 最大持续时长{{statisticsData.continueTimeMax?statisticsData.continueTimeMax:0}}s,  
8 - 最小持续时长{{statisticsData.continueTimeMin?statisticsData.continueTimeMin:0}}s</span> 6 + <span v-if="statisticsData.alarmCnt">，平均持续时长{{statisticsData.continueTimeAvg?statisticsData.continueTimeAvg:0}}小时,
  7 + 最大持续时长{{statisticsData.continueTimeMax?statisticsData.continueTimeMax:0}}小时,
  8 + 最小持续时长{{statisticsData.continueTimeMin?statisticsData.continueTimeMin:0}}小时</span>
9 </div> 9 </div>
10 </div> 10 </div>
11 </div> 11 </div>
12 </div> 12 </div>
13 <!-- 告警信息处理审核时有--> 13 <!-- 告警信息处理审核时有-->
14 -<div class="info-content" v-if="isExamine">  
15 - <div class="info-content-body">  
16 - <div class="content-body-info">  
17 - <div class="info-item-statistics">  
18 -<!-- 同类型告警处理过程：{{processingData[0].alarmContent}} <i class="el-icon-more more-style" v-if="processingData.length>1"></i>-->  
19 - <el-collapse v-model="activeName" accordion>  
20 - <el-collapse-item :title="title" name="1">  
21 - <div v-for="(item,index) in processingData" :key="index">  
22 - {{index+1}}.{{item.alarmContent}}  
23 - </div> 14 +<!--<div class="info-content" v-if="isExamine">-->
  15 +<!-- <div class="info-content-body">-->
  16 +<!-- <div class="content-body-info">-->
  17 +<!-- <div class="info-item-statistics">-->
  18 +<!--&lt;!&ndash; 同类型告警处理过程：{{processingData[0].alarmContent}} <i class="el-icon-more more-style" v-if="processingData.length>1"></i>&ndash;&gt;-->
  19 +<!-- <el-collapse v-model="activeName" accordion>-->
  20 +<!-- <el-collapse-item :title="title" name="1">-->
  21 +<!-- <div v-for="(item,index) in processingData" :key="index">-->
  22 +<!-- {{index+1}}.{{item.alarmContent}}-->
  23 +<!-- </div>-->
24 24
25 - </el-collapse-item> 25 +<!-- </el-collapse-item>-->
26 26
27 - </el-collapse>  
28 - </div>  
29 - </div>  
30 - </div>  
31 -</div>  
  27 +<!-- </el-collapse>-->
  28 +<!-- </div>-->
  29 +<!-- </div>-->
  30 +<!-- </div>-->
  31 +<!--</div>-->
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 消除时间：{{alarmInfo.clearTime}} 63 消除时间：{{alarmInfo.clearTime}}
64 </div> 64 </div>
65 <div class="info-item"> 65 <div class="info-item">
66 - 告警次数：{{alarmInfo.alarmRepeatCnt?alarmInfo.alarmRepeatCnt:0}} 66 + 告警次数：{{alarmInfo.alarmRepeatCnt?alarmInfo.alarmRepeatCnt:0}} 次
67 </div> 67 </div>
68 <!-- <div class="info-item"> 68 <!-- <div class="info-item">
69 实际告警值：{{alarmInfo.kpiValue}} 69 实际告警值：{{alarmInfo.kpiValue}}
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 <div class="info-content-body"> 76 <div class="info-content-body">
77 <div class="content-body-info"> 77 <div class="content-body-info">
78 <div class="info-item-notice">通知信息：{{alarmInfo.alarmContent}}</div> 78 <div class="info-item-notice">通知信息：{{alarmInfo.alarmContent}}</div>
79 - <div class="info-item-notice">通知人清单：{{alarmInfo.nickName}}</div> 79 + <div class="info-item-notice">通知人：{{alarmInfo.nickName}}</div>
80 80
81 </div> 81 </div>
82 </div> 82 </div>
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 消除时间：{{alarmInfo.clearTime}} 52 消除时间：{{alarmInfo.clearTime}}
53 </div> 53 </div>
54 <div class="info-item"> 54 <div class="info-item">
55 - 告警次数：{{alarmInfo.alarmRepeatCnt?alarmInfo.alarmRepeatCnt:0}} 55 + 告警次数：{{alarmInfo.alarmRepeatCnt?alarmInfo.alarmRepeatCnt:0}} 次
56 </div> 56 </div>
57 <!-- <div class="info-item"> 57 <!-- <div class="info-item">
58 实际告警值：{{alarmInfo.kpiValue}} 58 实际告警值：{{alarmInfo.kpiValue}}
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 <div class="info-content-body"> 65 <div class="info-content-body">
66 <div class="content-body-info"> 66 <div class="content-body-info">
67 <div class="info-item-notice">通知信息：{{alarmInfo.alarmContent}}</div> 67 <div class="info-item-notice">通知信息：{{alarmInfo.alarmContent}}</div>
68 - <div class="info-item-notice">通知人清单：{{alarmInfo.nickName}}</div> 68 + <div class="info-item-notice">通知人：{{alarmInfo.nickName}}</div>
69 69
70 </div> 70 </div>
71 </div> 71 </div>
@@ -439,6 +439,9 @@ export default { @@ -439,6 +439,9 @@ export default {
439 let data=res.object; 439 let data=res.object;
440 if(data){ 440 if(data){
441 alarmInfo.value=data; 441 alarmInfo.value=data;
  442 + if( alarmInfo.value.busTypeName==null || alarmInfo.value.busTypeName==''){
  443 + alarmInfo.value.busTypeName="暂未绑定业务"
  444 + }
442 if( alarmInfo.value.approver){ 445 if( alarmInfo.value.approver){
443 approverName.value=alarmInfo.value.approver; 446 approverName.value=alarmInfo.value.approver;
444 userList.value.map(item=>{ 447 userList.value.map(item=>{