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

活动告警告警闭环消除按钮默认不展示



See merge request !567

@@ -105,7 +105,7 @@
 <script type="text/html" id="activeAlarmtoolbar">
     <div class="ayui-btn-container">
         <button id="alarmClear" type="button" class="layui-btn layui-btn-sm layui-btn-normal">告警消除</button>
-        <button id="clearBtn" type="button" class="layui-btn layui-btn-sm layui-btn-normal">告警闭环消除</button>
+        <button id="clearBtn" type="button" class="layui-btn layui-btn-sm layui-btn-normal" style="display: none">告警闭环消除</button>
         <button id="closeBtn" type="button" class="layui-btn layui-btn-sm layui-btn-normal">告警关闭</button>
         <button id="confirmBtn" type="button" class="layui-btn layui-btn-sm layui-btn-normal">告警确认</button>
         <button id="resumeBtn" type="button" class="layui-btn layui-btn-sm layui-btn-normal">告警恢复</button>

@@ -1046,8 +1046,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                                     },
                                     done: function (data) {
                                         let knFlag=data.object.value;
-                                        if(knFlag == '0'){
-                                            $('#clearBtn').hide();
+                                        if(knFlag == '1'){
+                                            $('#clearBtn').show();
                                         }
                                     }
                                 });