Merge branch 'master-v32-lushangqing' into 'master'

【404】【告警概览】资源类型告警统计字段丢失 #1



See merge request !673

@@ -155,6 +155,18 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart
             var generalList = chartData.generalList;
             var generalList = chartData.generalList;
             var importantList = chartData.importantList;
             var importantList = chartData.importantList;
             var seriousList = chartData.seriousList;
             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 = [{
             var barSeries = [{
                 name: '一般告警',
                 name: '一般告警',
                 data: generalList,
                 data: generalList,

@@ -22,12 +22,16 @@
                 <textarea name="remark" placeholder="请输入备注" class="layui-textarea"></textarea>
                 <textarea name="remark" placeholder="请输入备注" class="layui-textarea"></textarea>
             </div>
             </div>
         </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>
             <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 class="tags" id="selecte_usergroup_id_user"></div>
             </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>
         </div>
         <button id="btn-usergroup-submit" class="hide" lay-submit lay-filter="btn-usergroup-submit">提交</button>
         <button id="btn-usergroup-submit" class="hide" lay-submit lay-filter="btn-usergroup-submit">提交</button>
     </form>
     </form>