monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit b7cc4cc60e35cdc17e67d2c21b31c3bafeefa3d1 1 parent 8130e5e6

fix: 告警策略；告警订阅优化

Inline Side-by-side
Showing 10 changed files with 36 additions and 36 deletions
@@ -10,7 +10,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f @@ -10,7 +10,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
10 //对外暴露的接口 10 //对外暴露的接口
11 exports('alarmpolicyAdd', function (data) { 11 exports('alarmpolicyAdd', function (data) {
12 var sessions = layui.sessions; 12 var sessions = layui.sessions;
13 - var accessToken = sessions.getToken()['access_token']; 13 + var accessToken = common.getMjToken();
14 admin.req({ 14 admin.req({
15 url: common.domainName + '/api-web/manage/ddic/findSucDdics/alarm_strategy_type' 15 url: common.domainName + '/api-web/manage/ddic/findSucDdics/alarm_strategy_type'
16 , method: 'get' 16 , method: 'get'
@@ -299,7 +299,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f @@ -299,7 +299,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
299 "kpiId": data.kpiId 299 "kpiId": data.kpiId
300 } 300 }
301 admin.req({ 301 admin.req({
302 - url: domainName + '/api-web/policyMerge/save?access_token=' + accessToken 302 + url: domainName + '/api-web/policyMerge/save?accessToken=' + accessToken
303 , data: JSON.stringify(noticeMergeData) 303 , data: JSON.stringify(noticeMergeData)
304 , type: 'post' 304 , type: 'post'
305 , contentType: "application/json; charset=utf-8" 305 , contentType: "application/json; charset=utf-8"
@@ -320,7 +320,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f @@ -320,7 +320,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
320 form.on('submit(alarmpolicy-form-save-id)', function () { 320 form.on('submit(alarmpolicy-form-save-id)', function () {
321 delete data.noticeMergeFlagExpr; 321 delete data.noticeMergeFlagExpr;
322 admin.req({ 322 admin.req({
323 - url: domainName + '/api-web/alarmPolicy/save?access_token=' + accessToken 323 + url: domainName + '/api-web/alarmPolicy/save?accessToken=' + accessToken
324 , data: JSON.stringify(data) 324 , data: JSON.stringify(data)
325 , type: 'post' 325 , type: 'post'
326 , contentType: "application/json; charset=utf-8" 326 , contentType: "application/json; charset=utf-8"
@@ -11,7 +11,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't @@ -11,7 +11,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
11 //对外暴露的接口 11 //对外暴露的接口
12 exports('alarmpolicyEdit', function (data) { 12 exports('alarmpolicyEdit', function (data) {
13 var sessions = layui.sessions; 13 var sessions = layui.sessions;
14 - var accessToken = sessions.getToken()['access_token']; 14 + var accessToken = common.getMjToken();
15 15
16 var policyId = (data && data.id) ? data.id : ''; 16 var policyId = (data && data.id) ? data.id : '';
17 var policy = { 17 var policy = {
@@ -217,7 +217,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't @@ -217,7 +217,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
217 layer.load(![] + !!{} + !''); 217 layer.load(![] + !!{} + !'');
218 218
219 admin.req({ 219 admin.req({
220 - url: domainName + '/api-web/policy/save?access_token=' + accessToken, 220 + url: domainName + '/api-web/policy/save?accessToken=' + accessToken,
221 data: JSON.stringify(policy), 221 data: JSON.stringify(policy),
222 type: 'post', 222 type: 'post',
223 contentType: "application/json; charset=utf-8", 223 contentType: "application/json; charset=utf-8",
@@ -369,7 +369,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't @@ -369,7 +369,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
369 function initExprSelect() { 369 function initExprSelect() {
370 var options = '<option value="">=快速引用=</option>' 370 var options = '<option value="">=快速引用=</option>'
371 admin.req({ 371 admin.req({
372 - url: `${domainName}/api-web/manage/ddic/findSucDdics/alarm_expr?access_token=${accessToken}`, 372 + url: `${domainName}/api-web/manage/ddic/findSucDdics/alarm_expr?accessToken=${accessToken}`,
373 method: 'POST', 373 method: 'POST',
374 success: function (res) { 374 success: function (res) {
375 if (res && res.data) { 375 if (res && res.data) {
@@ -414,4 +414,4 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't @@ -414,4 +414,4 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
414 414
415 415
416 }); 416 });
417 -});  
  417 +});
@@ -13,7 +13,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', @@ -13,7 +13,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
13 //对外暴露的接口 13 //对外暴露的接口
14 exports('alarmpolicyIndex', function (data) { 14 exports('alarmpolicyIndex', function (data) {
15 var sessions = layui.sessions; 15 var sessions = layui.sessions;
16 - var accessToken = sessions.getToken()['access_token']; 16 + var accessToken = common.getMjToken();
17 //获得权限列表 17 //获得权限列表
18 var checkList = common.checkPermission(accessToken); 18 var checkList = common.checkPermission(accessToken);
19 var resName = ''; 19 var resName = '';
@@ -92,7 +92,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', @@ -92,7 +92,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
92 elem: '#alarmpolicyTable' 92 elem: '#alarmpolicyTable'
93 , url: domainName + '/api-web/alarmPolicy/page' 93 , url: domainName + '/api-web/alarmPolicy/page'
94 , where:{ 94 , where:{
95 - access_token:accessToken, 95 + accessToken:accessToken,
96 alarmPolicyName:$("#alarmpolicykw").val(), 96 alarmPolicyName:$("#alarmpolicykw").val(),
97 kpiIdent:$('#alarmpolicy_category').val(), 97 kpiIdent:$('#alarmpolicy_category').val(),
98 resType:$('#alarmpolicy_kpitype').val(), 98 resType:$('#alarmpolicy_kpitype').val(),
@@ -335,7 +335,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', @@ -335,7 +335,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
335 function reloadAlarmPolicyTable() { 335 function reloadAlarmPolicyTable() {
336 alarmpolicyTable.reload({ 336 alarmpolicyTable.reload({
337 where:{ 337 where:{
338 - access_token:accessToken, 338 + accessToken:accessToken,
339 alarmPolicyName:$("#alarmpolicykw").val(), 339 alarmPolicyName:$("#alarmpolicykw").val(),
340 kpiIdent:$('#alarmpolicy_category').val(), 340 kpiIdent:$('#alarmpolicy_category').val(),
341 resType:$('#alarmpolicy_kpitype').val(), 341 resType:$('#alarmpolicy_kpitype').val(),
@@ -392,7 +392,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect', @@ -392,7 +392,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
392 } 392 }
393 393
394 admin.req({ 394 admin.req({
395 - url: `${common.domainName}/api-web/manage/restype/list?access_token=${accessToken}` 395 + url: `${common.domainName}/api-web/manage/restype/list?accessToken=${accessToken}`
396 ,type:"GET" 396 ,type:"GET"
397 }).done(function (res) { 397 }).done(function (res) {
398 // 资源类型下拉框 398 // 资源类型下拉框
@@ -11,7 +11,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -11,7 +11,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
11 //对外暴露的接口 11 //对外暴露的接口
12 exports('alarmpolicyList', function (data) { 12 exports('alarmpolicyList', function (data) {
13 var sessions = layui.sessions; 13 var sessions = layui.sessions;
14 - var accessToken = sessions.getToken()['access_token']; 14 + var accessToken = common.getMjToken();
15 //获得权限列表 15 //获得权限列表
16 var checkList = common.checkPermission(accessToken); 16 var checkList = common.checkPermission(accessToken);
17 17
@@ -14,7 +14,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common', 'sessions', 'cron', @@ -14,7 +14,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common', 'sessions', 'cron',
14 //对外暴露的接口 14 //对外暴露的接口
15 exports('alarmsubscribeAdd', function (data) { 15 exports('alarmsubscribeAdd', function (data) {
16 var sessions = layui.sessions; 16 var sessions = layui.sessions;
17 - var accessToken = sessions.getToken()['access_token']; 17 + var accessToken = common.getMjToken();
18 var receiveUser = "" 18 var receiveUser = ""
19 var userMap = new Map(); 19 var userMap = new Map();
20 var receiveUserInfos = [];//接收人数组 20 var receiveUserInfos = [];//接收人数组
@@ -22,7 +22,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -22,7 +22,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
22 } 22 }
23 var resIdList = (data && data.resIdList) ? data.resIdList : []; 23 var resIdList = (data && data.resIdList) ? data.resIdList : [];
24 var sessions = layui.sessions; 24 var sessions = layui.sessions;
25 - var accessToken = sessions.getToken()['access_token']; 25 + var accessToken = common.getMjToken();
26 //获得权限列表 26 //获得权限列表
27 var checkList = common.checkPermission(accessToken); 27 var checkList = common.checkPermission(accessToken);
28 28
@@ -105,7 +105,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -105,7 +105,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
105 layer.close(index); 105 layer.close(index);
106 layer.load(2); 106 layer.load(2);
107 admin.req({ 107 admin.req({
108 - url: domainName + '/api-web/alarmsubscribe/deleteByResIdsAndSubIds?access_token=' + accessToken, 108 + url: domainName + '/api-web/alarmsubscribe/deleteByResIdsAndSubIds?accessToken=' + accessToken,
109 data: { 109 data: {
110 resIds: resIdList.toString(), 110 resIds: resIdList.toString(),
111 subIds: ids.toString() 111 subIds: ids.toString()
@@ -197,7 +197,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -197,7 +197,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
197 elem: '#alarmsubscribeTable' 197 elem: '#alarmsubscribeTable'
198 , url: domainName + '/api-web/alarmsubscribe/page' 198 , url: domainName + '/api-web/alarmsubscribe/page'
199 , where: { 199 , where: {
200 - access_token: accessToken, 200 + accessToken: accessToken,
201 policyId: policyId, 201 policyId: policyId,
202 subName: conditions.subName, 202 subName: conditions.subName,
203 subType: subTypeSelect.getValue("valueStr"), 203 subType: subTypeSelect.getValue("valueStr"),
@@ -587,7 +587,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -587,7 +587,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
587 587
588 588
589 $.ajax({ 589 $.ajax({
590 - url: `${common.domainName}/api-web/manage/restype/list?access_token=${accessToken}`, 590 + url: `${common.domainName}/api-web/manage/restype/list?accessToken=${accessToken}`,
591 method: 'GET', 591 method: 'GET',
592 success: function (res) { 592 success: function (res) {
593 // 资源类型下拉框 593 // 资源类型下拉框
@@ -918,7 +918,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -918,7 +918,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
918 resIds: resIds.toString(), 918 resIds: resIds.toString(),
919 kpiIds: kpiIds.toString(), 919 kpiIds: kpiIds.toString(),
920 subId: subId, 920 subId: subId,
921 - access_token: accessToken 921 + accessToken: accessToken
922 }, 922 },
923 done: function (res) { 923 done: function (res) {
924 if (res.success) { 924 if (res.success) {
@@ -1010,7 +1010,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -1010,7 +1010,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
1010 targetId: targetId 1010 targetId: targetId
1011 }; 1011 };
1012 admin.req({ 1012 admin.req({
1013 - url: common.domainName + '/api-web/bTypeSubscribe/insertOrChange?access_token=' + accessToken, 1013 + url: common.domainName + '/api-web/bTypeSubscribe/insertOrChange?accessToken=' + accessToken,
1014 type: 'post', 1014 type: 'post',
1015 contentType: 'application/json', 1015 contentType: 'application/json',
1016 data: JSON.stringify(typeSubscribe), 1016 data: JSON.stringify(typeSubscribe),
@@ -1074,7 +1074,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -1074,7 +1074,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
1074 var conditions = form.val('alarmsubscribe-form'); 1074 var conditions = form.val('alarmsubscribe-form');
1075 alarmsubscribeTable.reload({ 1075 alarmsubscribeTable.reload({
1076 where: { 1076 where: {
1077 - access_token: accessToken, 1077 + accessToken: accessToken,
1078 policyId: policyId, 1078 policyId: policyId,
1079 subName: conditions.subName, 1079 subName: conditions.subName,
1080 subType: subTypeSelect.getValue('valueStr'), 1080 subType: subTypeSelect.getValue('valueStr'),
@@ -1186,7 +1186,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -1186,7 +1186,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
1186 $.ajax({ 1186 $.ajax({
1187 url: domainName + '/api-user/users/getAll', 1187 url: domainName + '/api-user/users/getAll',
1188 data: { 1188 data: {
1189 - access_token: accessToken 1189 + accessToken: accessToken
1190 }, 1190 },
1191 success: function (response) { 1191 success: function (response) {
1192 if (response) { 1192 if (response) {
@@ -10,7 +10,7 @@ layui.define(['form', 'table', 'admin', 'common', 'sessions'], function (exports @@ -10,7 +10,7 @@ layui.define(['form', 'table', 'admin', 'common', 'sessions'], function (exports
10 //对外暴露的接口 10 //对外暴露的接口
11 exports('alarmtemplateAdd', function (data) { 11 exports('alarmtemplateAdd', function (data) {
12 var sessions = layui.sessions; 12 var sessions = layui.sessions;
13 - var accessToken = sessions.getToken()['access_token']; 13 + var accessToken = common.getMjToken();
14 form.render(null, 'add-alarmtemplate-form'); 14 form.render(null, 'add-alarmtemplate-form');
15 if (data && data.id) { 15 if (data && data.id) {
16 admin.req({ 16 admin.req({
@@ -36,7 +36,7 @@ layui.define(['form', 'table', 'admin', 'common', 'sessions'], function (exports @@ -36,7 +36,7 @@ layui.define(['form', 'table', 'admin', 'common', 'sessions'], function (exports
36 } 36 }
37 data.policyIds = policyIds.toString(); 37 data.policyIds = policyIds.toString();
38 admin.req({ 38 admin.req({
39 - url: domainName + '/api-web/alarmtemplate/save?access_token=' + accessToken 39 + url: domainName + '/api-web/alarmtemplate/save?accessToken=' + accessToken
40 , data: JSON.stringify(data) 40 , data: JSON.stringify(data)
41 , type: 'post' 41 , type: 'post'
42 , contentType: "application/json; charset=utf-8" 42 , contentType: "application/json; charset=utf-8"
@@ -16,7 +16,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions' @@ -16,7 +16,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
16 var resIdList = (data && data.resIds) ? data.resIds : ''; 16 var resIdList = (data && data.resIds) ? data.resIds : '';
17 var resType = (data && common.isNotEmpty(data.resType)) ? data.resType : ''; 17 var resType = (data && common.isNotEmpty(data.resType)) ? data.resType : '';
18 var sessions = layui.sessions; 18 var sessions = layui.sessions;
19 - var accessToken = sessions.getToken()['access_token']; 19 + var accessToken = common.getMjToken();
20 //获得权限列表 20 //获得权限列表
21 var checkList = common.checkPermission(accessToken); 21 var checkList = common.checkPermission(accessToken);
22 var alarmTempId = ''; 22 var alarmTempId = '';
@@ -130,7 +130,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions' @@ -130,7 +130,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
130 resIds.push(v.resId); 130 resIds.push(v.resId);
131 }) 131 })
132 admin.req({ 132 admin.req({
133 - url: domainName + '/api-web/manage/resource/alarmTemplate?resIds=' + resIds.toString()+"&flag=" + flag + '&alarmTempId=' + tempIds.toString() + '&access_token=' + accessToken, 133 + url: domainName + '/api-web/manage/resource/alarmTemplate?resIds=' + resIds.toString()+"&flag=" + flag + '&alarmTempId=' + tempIds.toString() + '&accessToken=' + accessToken,
134 done: function (res) { 134 done: function (res) {
135 if (res.success) { 135 if (res.success) {
136 layer.msg("配置成功！", {offset: '15px', icon: 1, time: 2000}, function () { 136 layer.msg("配置成功！", {offset: '15px', icon: 1, time: 2000}, function () {
@@ -208,7 +208,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions' @@ -208,7 +208,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
208 layer.close(index); 208 layer.close(index);
209 layer.load(2); 209 layer.load(2);
210 admin.req({ 210 admin.req({
211 - url: domainName + '/api-web/alarmtemplate/deleteByResIdsAndTempIds?access_token=' + accessToken, 211 + url: domainName + '/api-web/alarmtemplate/deleteByResIdsAndTempIds?accessToken=' + accessToken,
212 data: { 212 data: {
213 resIds: resIdList.toString(), 213 resIds: resIdList.toString(),
214 tempIds: tempIds.toString() 214 tempIds: tempIds.toString()
@@ -244,7 +244,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions' @@ -244,7 +244,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
244 elem: '#alarmtemplateTable' 244 elem: '#alarmtemplateTable'
245 , url: domainName + '/api-web/alarmtemplate/page' 245 , url: domainName + '/api-web/alarmtemplate/page'
246 , where: { 246 , where: {
247 - access_token: accessToken, 247 + accessToken: accessToken,
248 keyWord: $("#alarmtemplatekw").val(), 248 keyWord: $("#alarmtemplatekw").val(),
249 policyId: policyId, 249 policyId: policyId,
250 resIdList: resIdList 250 resIdList: resIdList
@@ -480,7 +480,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions' @@ -480,7 +480,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
480 elem: '#res_temp_table', 480 elem: '#res_temp_table',
481 url: common.domainName + '/api-web/home/res-list/' + (resType ? resType : 'all'), 481 url: common.domainName + '/api-web/home/res-list/' + (resType ? resType : 'all'),
482 where: { 482 where: {
483 - access_token: accessToken, 483 + accessToken: accessToken,
484 resName: $('#res-keyword').val(), 484 resName: $('#res-keyword').val(),
485 busId: $("#templist_resListBizTypes").val(), 485 busId: $("#templist_resListBizTypes").val(),
486 resHealth: $("#templist_resStatus").val(), 486 resHealth: $("#templist_resStatus").val(),
@@ -566,7 +566,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions' @@ -566,7 +566,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
566 btn: ['确定', '取消'] //按钮 566 btn: ['确定', '取消'] //按钮
567 }, function () { 567 }, function () {
568 admin.req({ 568 admin.req({
569 - url: common.domainName + '/api-web/alarmtemplate/deleteByResIdsAndTempIds?access_token=' + accessToken, 569 + url: common.domainName + '/api-web/alarmtemplate/deleteByResIdsAndTempIds?accessToken=' + accessToken,
570 async: false, 570 async: false,
571 data: { 571 data: {
572 resIds: id, 572 resIds: id,
@@ -583,7 +583,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions' @@ -583,7 +583,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
583 }); 583 });
584 }); 584 });
585 // $.ajax({ 585 // $.ajax({
586 - // url: common.domainName + '/api-web/alarmtemplate/deleteByResIdsAndTempIds?access_token=' + accessToken 586 + // url: common.domainName + '/api-web/alarmtemplate/deleteByResIdsAndTempIds?accessToken=' + accessToken
587 // , data: { 587 // , data: {
588 // resIds: id, 588 // resIds: id,
589 // tempIds: alarmTempId.toString() 589 // tempIds: alarmTempId.toString()
@@ -608,7 +608,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions' @@ -608,7 +608,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
608 function reloadalarmtemplateTable() { 608 function reloadalarmtemplateTable() {
609 alarmtemplateTable.reload({ 609 alarmtemplateTable.reload({
610 where: { 610 where: {
611 - access_token: accessToken, 611 + accessToken: accessToken,
612 policyId: policyId, 612 policyId: policyId,
613 resIdList: resIdList, 613 resIdList: resIdList,
614 keyWord: $("#alarmtemplatekw").val() 614 keyWord: $("#alarmtemplatekw").val()
@@ -12,7 +12,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -12,7 +12,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
12 exports('alarmtemplateList', function (data) { 12 exports('alarmtemplateList', function (data) {
13 var policyId = (data && data.policyId) ? data.policyId : ""; 13 var policyId = (data && data.policyId) ? data.policyId : "";
14 var sessions = layui.sessions; 14 var sessions = layui.sessions;
15 - var accessToken = sessions.getToken()['access_token']; 15 + var accessToken = common.getMjToken();
16 //回车搜索 16 //回车搜索
17 $('#alarmtemplatelistkw').keydown(function (e) { 17 $('#alarmtemplatelistkw').keydown(function (e) {
18 if (e.keyCode === 13) { 18 if (e.keyCode === 13) {
@@ -26,7 +26,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -26,7 +26,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
26 elem: '#alarmtemplatelistTable' 26 elem: '#alarmtemplatelistTable'
27 , url: domainName + '/api-web/alarmtemplate/list' 27 , url: domainName + '/api-web/alarmtemplate/list'
28 , where: { 28 , where: {
29 - access_token: accessToken, 29 + accessToken: accessToken,
30 alarmTempName: $("#alarmtemplatekw").val(), 30 alarmTempName: $("#alarmtemplatekw").val(),
31 policyId: policyId 31 policyId: policyId
32 } 32 }
@@ -149,7 +149,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -149,7 +149,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
149 function reloadalarmtemplatelistTable() { 149 function reloadalarmtemplatelistTable() {
150 alarmtemplatelistTable.reload({ 150 alarmtemplatelistTable.reload({
151 where: { 151 where: {
152 - access_token: accessToken, 152 + accessToken: accessToken,
153 alarmTempName: $("#alarmtemplatelistkw").val(), 153 alarmTempName: $("#alarmtemplatelistkw").val(),
154 } 154 }
155 }); 155 });
@@ -106,8 +106,8 @@ layui.define(['element', 'common', 'sessions', 'form', 'admin'], function (expor @@ -106,8 +106,8 @@ layui.define(['element', 'common', 'sessions', 'form', 'admin'], function (expor
106 let arr = res.data.rows; 106 let arr = res.data.rows;
107 arr.forEach((item, index) => { 107 arr.forEach((item, index) => {
108 newData.push({ 108 newData.push({
109 - name: item.nickname,  
110 - value: item.username 109 + name: item.groupName,
  110 + value: item.id
111 }) 111 })
112 }) 112 })
113 113