Merge branch 'master-mj-joke' into 'master-mj'

fix:告警策略--按照资源类型搜索下拉框设置高度

fix:告警策略--按照资源类型搜索下拉框设置高度

See merge request !1166

@@ -431,7 +431,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
                     name: 'name',
                     name: 'name',
                     value: 'name'
                     value: 'name'
                 },
                 },
-                height: 'auto',
+                height: '500px',
                 data: resTypeTree,
                 data: resTypeTree,
                 on: function (data) {
                 on: function (data) {
                     if(data.isAdd){
                     if(data.isAdd){