Authored by wangtao

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

... ... @@ -10,7 +10,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
//对外暴露的接口
exports('alarmpolicyAdd', function (data) {
var sessions = layui.sessions;
var accessToken = sessions.getToken()['access_token'];
var accessToken = common.getMjToken();
admin.req({
url: common.domainName + '/api-web/manage/ddic/findSucDdics/alarm_strategy_type'
, method: 'get'
... ... @@ -299,7 +299,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
"kpiId": data.kpiId
}
admin.req({
url: domainName + '/api-web/policyMerge/save?access_token=' + accessToken
url: domainName + '/api-web/policyMerge/save?accessToken=' + accessToken
, data: JSON.stringify(noticeMergeData)
, type: 'post'
, contentType: "application/json; charset=utf-8"
... ... @@ -320,7 +320,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
form.on('submit(alarmpolicy-form-save-id)', function () {
delete data.noticeMergeFlagExpr;
admin.req({
url: domainName + '/api-web/alarmPolicy/save?access_token=' + accessToken
url: domainName + '/api-web/alarmPolicy/save?accessToken=' + accessToken
, data: JSON.stringify(data)
, type: 'post'
, contentType: "application/json; charset=utf-8"
... ...
... ... @@ -11,7 +11,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
//对外暴露的接口
exports('alarmpolicyEdit', function (data) {
var sessions = layui.sessions;
var accessToken = sessions.getToken()['access_token'];
var accessToken = common.getMjToken();
var policyId = (data && data.id) ? data.id : '';
var policy = {
... ... @@ -217,7 +217,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
layer.load(![] + !!{} + !'');
admin.req({
url: domainName + '/api-web/policy/save?access_token=' + accessToken,
url: domainName + '/api-web/policy/save?accessToken=' + accessToken,
data: JSON.stringify(policy),
type: 'post',
contentType: "application/json; charset=utf-8",
... ... @@ -369,7 +369,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
function initExprSelect() {
var options = '<option value="">=快速引用=</option>'
admin.req({
url: `${domainName}/api-web/manage/ddic/findSucDdics/alarm_expr?access_token=${accessToken}`,
url: `${domainName}/api-web/manage/ddic/findSucDdics/alarm_expr?accessToken=${accessToken}`,
method: 'POST',
success: function (res) {
if (res && res.data) {
... ... @@ -414,4 +414,4 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist', 't
});
});
\ No newline at end of file
});
... ...
... ... @@ -13,7 +13,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
//对外暴露的接口
exports('alarmpolicyIndex', function (data) {
var sessions = layui.sessions;
var accessToken = sessions.getToken()['access_token'];
var accessToken = common.getMjToken();
//获得权限列表
var checkList = common.checkPermission(accessToken);
var resName = '';
... ... @@ -92,7 +92,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
elem: '#alarmpolicyTable'
, url: domainName + '/api-web/alarmPolicy/page'
, where:{
access_token:accessToken,
accessToken:accessToken,
alarmPolicyName:$("#alarmpolicykw").val(),
kpiIdent:$('#alarmpolicy_category').val(),
resType:$('#alarmpolicy_kpitype').val(),
... ... @@ -335,7 +335,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
function reloadAlarmPolicyTable() {
alarmpolicyTable.reload({
where:{
access_token:accessToken,
accessToken:accessToken,
alarmPolicyName:$("#alarmpolicykw").val(),
kpiIdent:$('#alarmpolicy_category').val(),
resType:$('#alarmpolicy_kpitype').val(),
... ... @@ -392,7 +392,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
}
admin.req({
url: `${common.domainName}/api-web/manage/restype/list?access_token=${accessToken}`
url: `${common.domainName}/api-web/manage/restype/list?accessToken=${accessToken}`
,type:"GET"
}).done(function (res) {
// 资源类型下拉框
... ...
... ... @@ -11,7 +11,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
//对外暴露的接口
exports('alarmpolicyList', function (data) {
var sessions = layui.sessions;
var accessToken = sessions.getToken()['access_token'];
var accessToken = common.getMjToken();
//获得权限列表
var checkList = common.checkPermission(accessToken);
... ...
... ... @@ -14,7 +14,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common', 'sessions', 'cron',
//对外暴露的接口
exports('alarmsubscribeAdd', function (data) {
var sessions = layui.sessions;
var accessToken = sessions.getToken()['access_token'];
var accessToken = common.getMjToken();
var receiveUser = ""
var userMap = new Map();
var receiveUserInfos = [];//接收人数组
... ...
... ... @@ -22,7 +22,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
}
var resIdList = (data && data.resIdList) ? data.resIdList : [];
var sessions = layui.sessions;
var accessToken = sessions.getToken()['access_token'];
var accessToken = common.getMjToken();
//获得权限列表
var checkList = common.checkPermission(accessToken);
... ... @@ -105,7 +105,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
layer.close(index);
layer.load(2);
admin.req({
url: domainName + '/api-web/alarmsubscribe/deleteByResIdsAndSubIds?access_token=' + accessToken,
url: domainName + '/api-web/alarmsubscribe/deleteByResIdsAndSubIds?accessToken=' + accessToken,
data: {
resIds: resIdList.toString(),
subIds: ids.toString()
... ... @@ -197,7 +197,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
elem: '#alarmsubscribeTable'
, url: domainName + '/api-web/alarmsubscribe/page'
, where: {
access_token: accessToken,
accessToken: accessToken,
policyId: policyId,
subName: conditions.subName,
subType: subTypeSelect.getValue("valueStr"),
... ... @@ -587,7 +587,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
$.ajax({
url: `${common.domainName}/api-web/manage/restype/list?access_token=${accessToken}`,
url: `${common.domainName}/api-web/manage/restype/list?accessToken=${accessToken}`,
method: 'GET',
success: function (res) {
// 资源类型下拉框
... ... @@ -918,7 +918,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
resIds: resIds.toString(),
kpiIds: kpiIds.toString(),
subId: subId,
access_token: accessToken
accessToken: accessToken
},
done: function (res) {
if (res.success) {
... ... @@ -1010,7 +1010,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
targetId: targetId
};
admin.req({
url: common.domainName + '/api-web/bTypeSubscribe/insertOrChange?access_token=' + accessToken,
url: common.domainName + '/api-web/bTypeSubscribe/insertOrChange?accessToken=' + accessToken,
type: 'post',
contentType: 'application/json',
data: JSON.stringify(typeSubscribe),
... ... @@ -1074,7 +1074,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
var conditions = form.val('alarmsubscribe-form');
alarmsubscribeTable.reload({
where: {
access_token: accessToken,
accessToken: accessToken,
policyId: policyId,
subName: conditions.subName,
subType: subTypeSelect.getValue('valueStr'),
... ... @@ -1186,7 +1186,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
$.ajax({
url: domainName + '/api-user/users/getAll',
data: {
access_token: accessToken
accessToken: accessToken
},
success: function (response) {
if (response) {
... ...
... ... @@ -10,7 +10,7 @@ layui.define(['form', 'table', 'admin', 'common', 'sessions'], function (exports
//对外暴露的接口
exports('alarmtemplateAdd', function (data) {
var sessions = layui.sessions;
var accessToken = sessions.getToken()['access_token'];
var accessToken = common.getMjToken();
form.render(null, 'add-alarmtemplate-form');
if (data && data.id) {
admin.req({
... ... @@ -36,7 +36,7 @@ layui.define(['form', 'table', 'admin', 'common', 'sessions'], function (exports
}
data.policyIds = policyIds.toString();
admin.req({
url: domainName + '/api-web/alarmtemplate/save?access_token=' + accessToken
url: domainName + '/api-web/alarmtemplate/save?accessToken=' + accessToken
, data: JSON.stringify(data)
, type: 'post'
, contentType: "application/json; charset=utf-8"
... ...
... ... @@ -16,7 +16,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
var resIdList = (data && data.resIds) ? data.resIds : '';
var resType = (data && common.isNotEmpty(data.resType)) ? data.resType : '';
var sessions = layui.sessions;
var accessToken = sessions.getToken()['access_token'];
var accessToken = common.getMjToken();
//获得权限列表
var checkList = common.checkPermission(accessToken);
var alarmTempId = '';
... ... @@ -130,7 +130,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
resIds.push(v.resId);
})
admin.req({
url: domainName + '/api-web/manage/resource/alarmTemplate?resIds=' + resIds.toString()+"&flag=" + flag + '&alarmTempId=' + tempIds.toString() + '&access_token=' + accessToken,
url: domainName + '/api-web/manage/resource/alarmTemplate?resIds=' + resIds.toString()+"&flag=" + flag + '&alarmTempId=' + tempIds.toString() + '&accessToken=' + accessToken,
done: function (res) {
if (res.success) {
layer.msg("配置成功!", {offset: '15px', icon: 1, time: 2000}, function () {
... ... @@ -208,7 +208,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
layer.close(index);
layer.load(2);
admin.req({
url: domainName + '/api-web/alarmtemplate/deleteByResIdsAndTempIds?access_token=' + accessToken,
url: domainName + '/api-web/alarmtemplate/deleteByResIdsAndTempIds?accessToken=' + accessToken,
data: {
resIds: resIdList.toString(),
tempIds: tempIds.toString()
... ... @@ -244,7 +244,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
elem: '#alarmtemplateTable'
, url: domainName + '/api-web/alarmtemplate/page'
, where: {
access_token: accessToken,
accessToken: accessToken,
keyWord: $("#alarmtemplatekw").val(),
policyId: policyId,
resIdList: resIdList
... ... @@ -480,7 +480,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
elem: '#res_temp_table',
url: common.domainName + '/api-web/home/res-list/' + (resType ? resType : 'all'),
where: {
access_token: accessToken,
accessToken: accessToken,
resName: $('#res-keyword').val(),
busId: $("#templist_resListBizTypes").val(),
resHealth: $("#templist_resStatus").val(),
... ... @@ -566,7 +566,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
btn: ['确定', '取消'] //按钮
}, function () {
admin.req({
url: common.domainName + '/api-web/alarmtemplate/deleteByResIdsAndTempIds?access_token=' + accessToken,
url: common.domainName + '/api-web/alarmtemplate/deleteByResIdsAndTempIds?accessToken=' + accessToken,
async: false,
data: {
resIds: id,
... ... @@ -583,7 +583,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
});
});
// $.ajax({
// url: common.domainName + '/api-web/alarmtemplate/deleteByResIdsAndTempIds?access_token=' + accessToken
// url: common.domainName + '/api-web/alarmtemplate/deleteByResIdsAndTempIds?accessToken=' + accessToken
// , data: {
// resIds: id,
// tempIds: alarmTempId.toString()
... ... @@ -608,7 +608,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
function reloadalarmtemplateTable() {
alarmtemplateTable.reload({
where: {
access_token: accessToken,
accessToken: accessToken,
policyId: policyId,
resIdList: resIdList,
keyWord: $("#alarmtemplatekw").val()
... ...
... ... @@ -12,7 +12,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
exports('alarmtemplateList', function (data) {
var policyId = (data && data.policyId) ? data.policyId : "";
var sessions = layui.sessions;
var accessToken = sessions.getToken()['access_token'];
var accessToken = common.getMjToken();
//回车搜索
$('#alarmtemplatelistkw').keydown(function (e) {
if (e.keyCode === 13) {
... ... @@ -26,7 +26,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
elem: '#alarmtemplatelistTable'
, url: domainName + '/api-web/alarmtemplate/list'
, where: {
access_token: accessToken,
accessToken: accessToken,
alarmTempName: $("#alarmtemplatekw").val(),
policyId: policyId
}
... ... @@ -149,7 +149,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
function reloadalarmtemplatelistTable() {
alarmtemplatelistTable.reload({
where: {
access_token: accessToken,
accessToken: accessToken,
alarmTempName: $("#alarmtemplatelistkw").val(),
}
});
... ...
... ... @@ -106,8 +106,8 @@ layui.define(['element', 'common', 'sessions', 'form', 'admin'], function (expor
let arr = res.data.rows;
arr.forEach((item, index) => {
newData.push({
name: item.nickname,
value: item.username
name: item.groupName,
value: item.id
})
})
... ...