Authored by 王涛

Merge branch 'joke' into 'master'

杭州-活动告警及历史告警业务下拉框优化

杭州-活动告警及历史告警业务下拉框优化

See merge request !172
... ... @@ -76,7 +76,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
});
//绑定业务下拉选择数据
admin.req({
url: domainName + '/api-web/home/business/findAllBusType',
url: domainName + '/api-web/home/business/findUserBusTypeAll?table=b_alarm',
success: function (response) {
if (response && response.success) {
busTypeList = response.data;
... ... @@ -102,7 +102,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
show: true,
list: ['ALL', 'REVERSE', 'CLEAR']
},
height: 'auto',
height: '170px',
tree: {
show: true,
showFolderIcon: true,
... ...
... ... @@ -55,7 +55,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
//绑定业务下拉选择数据
admin.req({
url: domainName + '/api-web/home/business/findAllBusType',
url: domainName + '/api-web/home/business/findUserBusTypeAll?table=b_alarm_his',
success: function (response) {
if (response && response.success) {
busTypeList = response.data;
... ... @@ -80,7 +80,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
show: true,
list: ['ALL', 'REVERSE', 'CLEAR']
},
height: 'auto',
height: '170px',
tree: {
show: true,
showFolderIcon: true,
... ...