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

告警处理页面优化



See merge request !540

@@ -3,29 +3,29 @@
         <div class="content-body-info">
             <div class="info-item-statistics">
                 统计信息：该告警历史上出现了{{statisticsData.alarmCnt?statisticsData.alarmCnt:0}}次
-                <span v-if="statisticsData.alarmCnt">，平均持续时长{{statisticsData.continueTimeAvg?statisticsData.continueTimeAvg:0}}s,
-                最大持续时长{{statisticsData.continueTimeMax?statisticsData.continueTimeMax:0}}s,
-                最小持续时长{{statisticsData.continueTimeMin?statisticsData.continueTimeMin:0}}s</span>
+                <span v-if="statisticsData.alarmCnt">，平均持续时长{{statisticsData.continueTimeAvg?statisticsData.continueTimeAvg:0}}小时,
+                最大持续时长{{statisticsData.continueTimeMax?statisticsData.continueTimeMax:0}}小时,
+                最小持续时长{{statisticsData.continueTimeMin?statisticsData.continueTimeMin:0}}小时</span>
             </div>
         </div>
     </div>
 </div>
 <!-- 告警信息处理审核时有-->
-<div class="info-content" v-if="isExamine">
-    <div class="info-content-body">
-        <div class="content-body-info">
-            <div class="info-item-statistics">
-<!--                同类型告警处理过程：{{processingData[0].alarmContent}} <i class="el-icon-more more-style" v-if="processingData.length>1"></i>-->
-                <el-collapse v-model="activeName" accordion>
-                    <el-collapse-item :title="title" name="1">
-                        <div v-for="(item,index) in processingData" :key="index">
-                            {{index+1}}.{{item.alarmContent}}
-                        </div>
+<!--<div class="info-content" v-if="isExamine">-->
+<!--    <div class="info-content-body">-->
+<!--        <div class="content-body-info">-->
+<!--            <div class="info-item-statistics">-->
+<!--&lt;!&ndash;                同类型告警处理过程：{{processingData[0].alarmContent}} <i class="el-icon-more more-style" v-if="processingData.length>1"></i>&ndash;&gt;-->
+<!--                <el-collapse v-model="activeName" accordion>-->
+<!--                    <el-collapse-item :title="title" name="1">-->
+<!--                        <div v-for="(item,index) in processingData" :key="index">-->
+<!--                            {{index+1}}.{{item.alarmContent}}-->
+<!--                        </div>-->
 
-                    </el-collapse-item>
+<!--                    </el-collapse-item>-->
 
-                </el-collapse>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
+<!--                </el-collapse>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--</div>-->
\ No newline at end of file

@@ -63,7 +63,7 @@
                     消除时间：{{alarmInfo.clearTime}}
                 </div>
                 <div class="info-item">
-                    告警次数：{{alarmInfo.alarmRepeatCnt?alarmInfo.alarmRepeatCnt:0}}
+                    告警次数：{{alarmInfo.alarmRepeatCnt?alarmInfo.alarmRepeatCnt:0}} 次
                 </div>
                 <!--    <div class="info-item">
                         实际告警值：{{alarmInfo.kpiValue}}
@@ -76,7 +76,7 @@
         <div class="info-content-body">
             <div class="content-body-info">
                 <div class="info-item-notice">通知信息：{{alarmInfo.alarmContent}}</div>
-                <div class="info-item-notice">通知人清单：{{alarmInfo.nickName}}</div>
+                <div class="info-item-notice">通知人：{{alarmInfo.nickName}}</div>
 
             </div>
         </div>

@@ -52,7 +52,7 @@
                         消除时间：{{alarmInfo.clearTime}}
                     </div>
                     <div class="info-item">
-                        告警次数：{{alarmInfo.alarmRepeatCnt?alarmInfo.alarmRepeatCnt:0}}
+                        告警次数：{{alarmInfo.alarmRepeatCnt?alarmInfo.alarmRepeatCnt:0}} 次
                     </div>
                 <!--    <div class="info-item">
                         实际告警值：{{alarmInfo.kpiValue}}
@@ -65,7 +65,7 @@
             <div class="info-content-body">
                 <div class="content-body-info">
                     <div class="info-item-notice">通知信息：{{alarmInfo.alarmContent}}</div>
-                    <div class="info-item-notice">通知人清单：{{alarmInfo.nickName}}</div>
+                    <div class="info-item-notice">通知人：{{alarmInfo.nickName}}</div>
 
                 </div>
             </div>

@@ -439,6 +439,9 @@ export default {
                     let data=res.object;
                     if(data){
                         alarmInfo.value=data;
+                        if( alarmInfo.value.busTypeName==null || alarmInfo.value.busTypeName==''){
+                            alarmInfo.value.busTypeName="暂未绑定业务"
+                        }
                         if( alarmInfo.value.approver){
                             approverName.value=alarmInfo.value.approver;
                             userList.value.map(item=>{