Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev-lushangqing

Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w…
…eb into master-500-dev-lushangqing
鲁尚清
Commit c095c5141d2bc0038171020aa64d743af13d05bb 2 parents 0846d934 ab8ba4cf
Showing 4 changed files with 72 additions and 5 deletions
hg-monitor-web-base/src/main/resources/static/src/views/alarm/activewarning.html
hg-monitor-web-base/src/main/resources/static/vue3/public/css/alarmsClear.css
hg-monitor-web-base/src/main/resources/static/vue3/src/views/alarmsClearEditor/index.html
hg-monitor-web-qh/src/main/resources/static/src/controller/activewarning.js
--- a/hg-monitor-web-base/src/main/resources/static/src/views/alarm/activewarning.html
View file @c095c51
+++ b/hg-monitor-web-base/src/main/resources/static/src/views/alarm/activewarning.html
View file @c095c51
@@ -104,7 +104,8 @@
 </article>
 <script type="text/html" id="activeAlarmtoolbar">
     <div class="ayui-btn-container">
-        <button id="clearBtn" type="button" class="layui-btn layui-btn-sm layui-btn-normal">告警消除</button>
+        <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="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>
--- a/hg-monitor-web-base/src/main/resources/static/vue3/public/css/alarmsClear.css
View file @c095c51
+++ b/hg-monitor-web-base/src/main/resources/static/vue3/public/css/alarmsClear.css
View file @c095c51
@@ -137,8 +137,10 @@
 .detail_comments_title{
     text-align: left;
     padding-bottom: 10px;
-    width: 86%;
-    float: left;
+}
+.detail_comments_right{
+    width: calc(100% - 70px);
+    text-align: right;
 }
 .update-icon,.more-style{
     cursor: pointer;
--- a/hg-monitor-web-base/src/main/resources/static/vue3/src/views/alarmsClearEditor/index.html
View file @c095c51
+++ b/hg-monitor-web-base/src/main/resources/static/vue3/src/views/alarmsClearEditor/index.html
View file @c095c51
@@ -76,7 +76,7 @@
     <div class="alarmsRadio" v-if="alarmInfo.alarmTypeCustom=='active'  || alarmInfo.alarmTypeCustom=='his' || status==0 || status==3">
         <div class="alarmNotice-title">消除原因<span style="color: red">*</span></div>
         <div class="alarmsNotice">
-            <div class="alarmsDes"><el-input v-model="reason" placeholder="消除原因" /></div>
+            <div class="alarmsDes"><el-input v-model="reason" maxlength="200" show-word-limit placeholder="消除原因" /></div>
             <div class="alarmsNotice-radio">
                 <span class="radioLabel">是否通知：</span>
                 <el-radio-group v-model="noticeFlag">
@@ -130,12 +130,14 @@
         </div>
     </div>
     <div class="detail_comments"  v-if="isExamine && ((status==3 || (status==1  && !isView)) || status==2) ">
-        <div>
+        <div style="display: flex;">
             <div class="detail_comments_title">审核意见<span style="color: red">*</span></div>
+            <div  v-if="status==1" class="detail_comments_right">
                 <span>快捷输入：</span>
                 <el-tag class="ml-2"  type="success" size="small" style="cursor:pointer; margin-right: 5px" @click="onInput(true)">同意</el-tag>
                 <el-tag class="ml-2"  type="danger" size="small" style=" cursor:pointer;"  @click="onInput(false)">不同意</el-tag>
             </div>
+        </div>
         <el-input
                 v-if="status==1 && approverName==loginName && !isView"
--- a/hg-monitor-web-qh/src/main/resources/static/src/controller/activewarning.js
View file @c095c51
+++ b/hg-monitor-web-qh/src/main/resources/static/src/controller/activewarning.js
View file @c095c51
@@ -234,6 +234,55 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 
         function initToolBarClickEvent() {
             //告警消除
+            $("#alarmClear").unbind('click').on('click', function () {
+                if ($.inArray('app:alarm:clear', checkList) == -1) {
+                    layer.msg('暂无权限!', {icon: 7, time: 3000});
+                    return;
+                }
+                var ids = [];
+                var data = table.checkStatus('activewarningTable').data;
+                if (data.length == 0) {
+                    layer.msg('请最少选择一项数据', {icon: 7, time: 2000});
+                    return;
+                }
+                //选中的告警ID放到集合中
+                $.each(data, function (i, obj) {
+                    ids.push(obj.id)
+                });
+                var index =layer.open({
+                    title: '告警消除',
+                    id:"alarms_clear_id",
+                    type: 1,
+                    area: ['20%', '15%'],
+                    btn: ['消除', '取消'],
+                    content: '<div style="padding-top: 15px;"><span style="margin-left: 6px">是否通知：</span> ' +
+                        '<input type="radio" name="noticeFlag" value="true" title="是" >&nbsp;是' +
+                        '<input type="radio" name="noticeFlag" value="false" title="否" checked="" style="margin-left: 20px;">&nbsp;否</div> ' //这里content是一个普通的String
+                    , yes: function () {
+                        admin.req({
+                            url: common.domainName + '/api-web/home/alarm/clear'
+                            , type: "post"
+                            , data: {
+                                ids: ids.toString(),
+                                reason: '手动消除',
+                                access_token: accessToken,
+                                noticeFlag: $('input[name="noticeFlag"]:checked').val()
+                            }
+                            , done: function (res) {
+                                //如果消除成功，关闭弹出框然后重新加载页面
+                                if (res.success) {
+                                    layer.close(index);
+                                    layer.msg('告警已消除！', {icon: 1, time: 2000});
+                                    reloadTable();
+                                } else {
+                                    layer.msg('告警消除失败，请与管理员联系！', {icon: 7, time: 3000});
+                                }
+                            }
+                        });
+                    }
+                });
+            });
+            //告警闭环消除
             $("#clearBtn").unbind('click').on('click', function () {
                 if ($.inArray('app:alarm:clear', checkList) == -1) {
                     layer.msg('暂无权限!', {icon: 7, time: 3000});
@@ -987,6 +1036,19 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', 
                                         }
                                     }
                                 });
+                                admin.req({
+                                    url: common.domainName + '/api-user/sysConf/getByCode',
+                                    type: "get",
+                                    data: {
+                                        code: 'knFlag'
+                                    },
+                                    done: function (data) {
+                                        let knFlag=data.object.value;
+                                        if(knFlag == '0'){
+                                            $('#clearBtn').hide();
+                                        }
+                                    }
+                                });
                                 initToolBarClickEvent();
                                 //表格排序监听 joke add 20200408
                                 table.on('sort(activewarningTable)', function (obj) {