monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 13c54bd319a589bfbd49583d49b10f46f78daed7 2 parents c2387574 bb9a24fd

Merge branch 'joke' into 'master' 

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

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

See merge request !172
Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
@@ -76,7 +76,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -76,7 +76,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
76 }); 76 });
77 //绑定业务下拉选择数据 77 //绑定业务下拉选择数据
78 admin.req({ 78 admin.req({
79 - url: domainName + '/api-web/home/business/findAllBusType', 79 + url: domainName + '/api-web/home/business/findUserBusTypeAll?table=b_alarm',
80 success: function (response) { 80 success: function (response) {
81 if (response && response.success) { 81 if (response && response.success) {
82 busTypeList = response.data; 82 busTypeList = response.data;
@@ -102,7 +102,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -102,7 +102,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
102 show: true, 102 show: true,
103 list: ['ALL', 'REVERSE', 'CLEAR'] 103 list: ['ALL', 'REVERSE', 'CLEAR']
104 }, 104 },
105 - height: 'auto', 105 + height: '170px',
106 tree: { 106 tree: {
107 show: true, 107 show: true,
108 showFolderIcon: true, 108 showFolderIcon: true,
@@ -55,7 +55,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -55,7 +55,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
55 55
56 //绑定业务下拉选择数据 56 //绑定业务下拉选择数据
57 admin.req({ 57 admin.req({
58 - url: domainName + '/api-web/home/business/findAllBusType', 58 + url: domainName + '/api-web/home/business/findUserBusTypeAll?table=b_alarm_his',
59 success: function (response) { 59 success: function (response) {
60 if (response && response.success) { 60 if (response && response.success) {
61 busTypeList = response.data; 61 busTypeList = response.data;
@@ -80,7 +80,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -80,7 +80,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
80 show: true, 80 show: true,
81 list: ['ALL', 'REVERSE', 'CLEAR'] 81 list: ['ALL', 'REVERSE', 'CLEAR']
82 }, 82 },
83 - height: 'auto', 83 + height: '170px',
84 tree: { 84 tree: {
85 show: true, 85 show: true,
86 showFolderIcon: true, 86 showFolderIcon: true,