Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-prod-xwx

@@ -31,9 +31,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
         });
         var resType = localStorage.getItem("currentResType");
 
+        var NoticeMergeFlag = 'off';
         // 获取合并通知开关是否开启
         getNoticeMergeFlag();
-        let NoticeMergeFlag = 'off';
         function getNoticeMergeFlag(){
             admin.req({
                 url: common.domainName + '/api-web/manage/ddic/findSucDdics/noticeMergeFlag'

@@ -306,13 +306,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
                     ,type:"delete"
                     ,data:{ids:id}
                 }).done(function (res) {
-                    layer.msg('删除成功', {
-                        offset: '15px'
-                        , icon: 1
-                        , time: 1000
-                    }, function () {
-                        reloadAlarmPolicyTable();
-                    });
+                    if(res.success){
+                        layer.msg('删除成功', {
+                            offset: '15px'
+                            , icon: 1
+                            , time: 1000
+                        }, function () {
+                            reloadAlarmPolicyTable();
+                        });
+                    }else {
+                        layer.msg( res.msg,{offset: '15px', icon: 2, time: 2000});
+                    }
+
                 }).error(function (error) {
                     console.log(error);
                 });

@@ -160,6 +160,18 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart
             var generalList = chartData.generalList;
             var importantList = chartData.importantList;
             var seriousList = chartData.seriousList;
+            //start lsq 处理x轴标签如果值为null则显示为空 2022-06-20
+            let arr=[];
+            if(nameList && nameList.length>0){
+                nameList.map(item=>{
+                    if(item==null || item=='null'){
+                        item='';
+                    }
+                    arr.push(item)
+                })
+            }
+            nameList=arr;
+            //end lsq 2022-06-20
             var barSeries = [{
                 name: '一般告警',
                 data: generalList,

@@ -22,12 +22,16 @@
                 <textarea name="remark" placeholder="请输入备注" class="layui-textarea"></textarea>
             </div>
         </div>
-        <div class="layui-form-item">
+        <!--start lsq 搜索按钮位置调整 2022-06-07-->
+        <div class="layui-form-item" style="display: flex;align-items: center;">
             <label class="layui-form-label">用户绑定</label>
-            <div class="layui-input-block tags-input" style="height: auto">
+<!--            <div class="layui-input-block tags-input" style="height: auto">-->
+            <div class=" tags-input" style="height: auto">
                 <div class="tags" id="selecte_usergroup_id_user"></div>
             </div>
-            <div class="layui-form-mid layui-word-aux" style="padding: 0!important;position: relative;top: -28px;left: 98%"><i class="layui-icon form-btn-icon" id="usergroup-form-select-users">&#xe615;</i></div>
+<!-- style="padding: 0!important;position: relative;top: -28px;left: 98%"【-->
+            <div class="layui-form-mid layui-word-aux" style="margin-left:6px;"><i class="layui-icon form-btn-icon" id="usergroup-form-select-users">&#xe615;</i></div>
+        <!--end lsq 2022-06-07-->
         </div>
         <button id="btn-usergroup-submit" class="hide" lay-submit lay-filter="btn-usergroup-submit">提交</button>
     </form>