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

告警消除页中通知统计及同类型告警处理过程组件增加v-if判断



See merge request !497

@@ -52,7 +52,7 @@
 <!--新增编辑弹框-->
 <cm-dialog :title="dialog.title" :showDialogVisible="dialog.show" @hidedialog="hideDialog" :showFooter="false">
     <template v-slot>
-        <alarmsClearEditor :isExamine="true" @saveback='saveback' :status="dialog.amStatus" :amId="dialog.amId" :alarmId="dialog.alarmId"/>
+        <alarmsClearEditor v-if="dialog.show" :isExamine="true" @saveback='saveback' :status="dialog.amStatus" :amId="dialog.amId" :alarmId="dialog.alarmId"/>
     </template>
 </cm-dialog>
 

@@ -62,7 +62,7 @@
             </div>
         </div>
         <!--通知统计信息组件-->
-        <cm-notice-statistics :alarmId="alarmIdVal" :alarmInfo="alarmInfo" :isExamine="isExamine"></cm-notice-statistics>
+        <cm-notice-statistics v-if="alarmIdVal" :alarmId="alarmIdVal" :alarmInfo="alarmInfo" :isExamine="isExamine"></cm-notice-statistics>
     </div>
     <div class="alarmsRadio" v-if="alarmInfo.alarmTypeCustom=='active' || status==0 || status==3">
         <div class="alarmNotice-title">消除原因</div>