Merge remote-tracking branch 'origin/master-500-dev' into master-500-dev

@@ -1319,13 +1319,13 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
                         arrayList= array.join(" ");
                         arrayList= array.join(" ");
                     }
                     }
                     let flagSelect =layer.open({
                     let flagSelect =layer.open({
-                        title: ['指标选择'],
+                        title: ['指标flag选择'],
                         type: 1,
                         type: 1,
-                        area: ['30%', '30%'],
+                        area: ['30%', '15%'],
                         shadeClose: true,//开启遮罩层
                         shadeClose: true,//开启遮罩层
                         id: 'flag_select_div',
                         id: 'flag_select_div',
                         // content: laytpl(res.body).render(JSON.stringify(params)),
                         // content: laytpl(res.body).render(JSON.stringify(params)),
-                        content: '<div style="padding: 6px;">'+arrayList+'</div>',
+                        content: '<div style="padding: 15px 18px">'+arrayList+'</div>',
                     });
                     });
                     $(document).on('click','#selectFlag',function(v) {
                     $(document).on('click','#selectFlag',function(v) {
                         layer.close(flagSelect);
                         layer.close(flagSelect);