monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 袁晋鹏
Commit a14665f3f03792ee86dc018a99b1de86de68baf5 1 parent 517ec395

新增日志页面嵌套监控的公共方法，后续根据需求合入公共代码

Inline Side-by-side
Showing 6 changed files with 120 additions and 120 deletions
... ... @@ -54,19 +54,19 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
form.render(null, 'alarmpolicy-form');
//新增
$("#alarmpolicy_create").unbind("click").on("click",function () {
if ($.inArray('back:alarmpolicy:save', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
return;
}
// if ($.inArray('back:alarmpolicy:save', checkList) == -1) {
// layer.msg('暂无权限!', {icon: 7, time: 3000});
// return;
// }
openPolicyForm();
});
//同步
$("#alarmpolicy_sync").on("click",function (){
if ($.inArray('back:alarmpolicy:synchronization', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
return;
}
// if ($.inArray('back:alarmpolicy:synchronization', checkList) == -1) {
// layer.msg('暂无权限!', {icon: 7, time: 3000});
// return;
// }
syncAlarmPolicy();
});
//删除
... ... @@ -180,10 +180,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
//点击名称编辑
$(".view-alarmPolicy-name").off("click").on("click",function () {
if ($.inArray('back:alarmpolicy:update', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
return;
}
// if ($.inArray('back:alarmpolicy:update', checkList) == -1) {
// layer.msg('暂无权限!', {icon: 7, time: 3000});
// return;
// }
openPolicyForm($(this).data("id"));
});
... ... @@ -279,10 +279,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
//删除数据
function deleteAlarmPolicy(id) {
if ($.inArray('back:alarmpolicy:delete', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
return;
}
// if ($.inArray('back:alarmpolicy:delete', checkList) == -1) {
// layer.msg('暂无权限!', {icon: 7, time: 3000});
// return;
// }
if (typeof (id) != "string") {
var ids = [];
var data = table.checkStatus('alarmpolicyTable').data;
... ...
... ... @@ -51,19 +51,19 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
form.render(null, 'alarmpolicy-form');
//新增
$("#alarmpolicy_list_create").unbind("click").on("click", function () {
if ($.inArray('back:alarmpolicy:save', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
return;
}
// if ($.inArray('back:alarmpolicy:save', checkList) == -1) {
// layer.msg('暂无权限!', {icon: 7, time: 3000});
// return;
// }
openPolicyForm();
});
//同步
$("#alarmpolicy_list_sync").on("click", function () {
if ($.inArray('back:alarmpolicy:synchronization', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
return;
}
// if ($.inArray('back:alarmpolicy:synchronization', checkList) == -1) {
// layer.msg('暂无权限!', {icon: 7, time: 3000});
// return;
// }
syncAlarmPolicy();
});
//删除
... ... @@ -177,10 +177,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
//点击名称编辑
$(".view-alarmPolicy-name").off("click").on("click", function () {
if ($.inArray('back:alarmpolicy:update', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
return;
}
// if ($.inArray('back:alarmpolicy:update', checkList) == -1) {
// layer.msg('暂无权限!', {icon: 7, time: 3000});
// return;
// }
openPolicyForm($(this).data("id"));
});
... ... @@ -264,10 +264,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
//删除数据
function deleteAlarmPolicy(id) {
if ($.inArray('back:alarmpolicy:delete', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
return;
}
// if ($.inArray('back:alarmpolicy:delete', checkList) == -1) {
// layer.msg('暂无权限!', {icon: 7, time: 3000});
// return;
// }
if (typeof (id) != "string") {
var ids = [];
var data = table.checkStatus('alarmpolicyListTable').data;
... ...
... ... @@ -46,10 +46,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
form.render(null, 'alarmsubscribe-form');
//新增
$("#alarmsubscribe_create").off("click").on("click",function () {
if ($.inArray('back:alarmsubscribe:save', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
return;
}
// if ($.inArray('back:alarmsubscribe:save', checkList) == -1) {
// layer.msg('暂无权限!', {icon: 7, time: 3000});
// return;
// }
openAlarmsubscribeForm();
});
//删除
... ... @@ -58,10 +58,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
});
//同步
$("#alarmsubscribe_sync").on("click",function () {
if ($.inArray('back:alarmsubscribe:synchronization', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
return;
}
// if ($.inArray('back:alarmsubscribe:synchronization', checkList) == -1) {
// layer.msg('暂无权限!', {icon: 7, time: 3000});
// return;
// }
var ids = [];
var data = table.checkStatus('alarmsubscribeTable').data;
if(data && data.length > 0){
... ... @@ -320,10 +320,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
done:function () {
//点击名称编辑
$(".view-alarmsubscribe-name").on("click",function () {
if ($.inArray('back:alarmsubscribe:update', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
return;
}
// if ($.inArray('back:alarmsubscribe:update', checkList) == -1) {
// layer.msg('暂无权限!', {icon: 7, time: 3000});
// return;
// }
openAlarmsubscribeForm($(this).data("id"));
});
... ... @@ -800,10 +800,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
//资源订阅
$(".alarmsubscribe-resource-btn").on("click", function () {
if ($.inArray('back:alarmsubscribe:resource', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
return;
}
// if ($.inArray('back:alarmsubscribe:resource', checkList) == -1) {
// layer.msg('暂无权限!', {icon: 7, time: 3000});
// return;
// }
var subId = $(this).data("id");
var oldData = getResOrKpiBySubId(subId, 'res');
oldData = $.map(oldData, function (item) {
... ... @@ -847,10 +847,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
//指标订阅
$(".alarmsubscribe-kpi-btn").on("click",function (){
if ($.inArray('back:alarmsubscribe:target', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
return;
}
// if ($.inArray('back:alarmsubscribe:target', checkList) == -1) {
// layer.msg('暂无权限!', {icon: 7, time: 3000});
// return;
// }
var subId = $(this).data("id");
var oldData = getResOrKpiBySubId(subId,'kpi');
var oldKpiData = Array.from(new Set($.map(oldData,function (item) {
... ... @@ -1054,10 +1054,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
//删除拓扑数据
function deletealarmsubscribe(id) {
if ($.inArray('back:alarmsubscribe:delete', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
return;
}
// if ($.inArray('back:alarmsubscribe:delete', checkList) == -1) {
// layer.msg('暂无权限!', {icon: 7, time: 3000});
// return;
// }
if (typeof (id) != "string") {
var ids = [];
var data = table.checkStatus('alarmsubscribeTable').data;
... ...
... ... @@ -222,7 +222,7 @@ layui.define(['table', 'form', 'laydate','view', 'common','sessions','xmSelect',
var data1 = form.val("dirctiveAddForm");
var txt = codeEditor.editor.getValue();
if (data1.dirctiveName != '' && data1.collScope != '' && txt != '') {
test();
//test();
} else {
layer.msg("请将所有必填项补充完整后验证！", { offset: '15px' , icon: 7 , time: 2000 });
}
... ...
... ... @@ -73,7 +73,7 @@ layui.define(['sessions', 'form', 'common'], function (exports) {
success(response) {
//debugger
if (response.gateway) {
//logApi = response.gateway;
logApi = response.gateway;
}
}
});
... ... @@ -93,66 +93,67 @@ layui.define(['sessions', 'form', 'common'], function (exports) {
success: function (rsp) {
if (rsp.code == 0) {
var name = rsp.object.username;
try {
var SubtleCrypto = new SubtleCrypto();
var pwd = SubtleCrypto.decrypt(rsp.object.password);
console.log(pwd);
} catch (e) {
}
var field = {};
field.username = name;
field.password = '123456';
field.grant_type = 'password';
field.scope = 'app';
field.client_id = 'webApp';
field.client_secret = 'webApp';
field.deviceId = "";
field.validCode = '';
$.ajax({
url: common.domainName + '/api-auth/oauth/token',
data: field,
type: 'POST',
dataType: 'JSON',
success: function (data) {
if (data.access_token) {
console.log('登录成功')
layui.data(setter.tableName, {
key: setter.request.tokenName
, value: data.access_token
});
sessions.putToken(data);
sessions.putUser(name);
layer.closeAll();
//将access_token和refresh_token写入本地
localStorage.setItem("access_token", data.access_token);
localStorage.setItem("refresh_token", data.refresh_token);
//将登陆url写入本地
localStorage.setItem("loginUrl", location.href);
//登入成功的提示与跳转
if (url.indexOf("ajConfig") != -1 && url.indexOf("ajConfig/view") != -1) {
window.location = window.location.origin + '/vue3/index.html#/' + url;
} else {
window.location = window.location.origin + '/start/index.html?show=0&access_token=' + data.access_token + '#/' + url;
}
} else {
layer.msg('登录失败，请重试', {icon: 5, time: 500});
}
},
error: function (xhr) {
err();
// try {
// var SubtleCrypto = new SubtleCrypto();
// var pwd = SubtleCrypto.decrypt(rsp.object.password);
// } catch (e) {
//
// }
//
// var field = {};
// field.username = name;
// field.password = '123456';
// field.grant_type = 'password';
// field.scope = 'app';
// field.client_id = 'webApp';
// field.client_secret = 'webApp';
// field.deviceId = "";
// field.validCode = '';
//
//
// $.ajax({
// url: common.domainName + '/api-auth/oauth/token',
// data: field,
// type: 'POST',
// dataType: 'JSON',
// success: function (data) {
if (tokenStr) {
console.log('登录成功')
layui.data(setter.tableName, {
key: setter.request.tokenName
, value: tokenStr
});
sessions.putToken({"access_token":tokenStr});
sessions.putUser(name);
layer.closeAll();
//将access_token和refresh_token写入本地
localStorage.setItem("access_token", tokenStr);
//localStorage.setItem("refresh_token", data.refresh_token);
//将登陆url写入本地
localStorage.setItem("loginUrl", location.href);
//登入成功的提示与跳转
if (url.indexOf("ajConfig") != -1 && url.indexOf("ajConfig/view") != -1) {
window.location = window.location.origin + '/vue3/index.html#/' + url;
} else {
window.location = window.location.origin + '/start/index.html?show=0&access_token=' + tokenStr+ '#/' + url;
}
});
}
//
// } else {
// layer.msg('登录失败，请重试', {icon: 5, time: 500});
// }
// },
// error: function (xhr) {
// err();
// }
//});
}
},
}
,
error: function (xhr, type, errorThrown) {
err();
}
... ...
... ... @@ -206,8 +206,7 @@ layui.extend({
// 跳转到过度页面的时候，判断参数与跳转的过渡页面的参数是否一直，则强制设置hash
// http://localhost:8088/?Authorization=xxx&show=0&url=alarm/activewarning#/page/forward
var href = window.location.href;
console.log(pathURL)
console.log(href)
if (href.indexOf('?Authorization') != -1 && href.indexOf('&show=0&url=') != -1 && pathURL !== '/page/forward'&& pathURL !== '/page/log') {
if(href.indexOf('&flag=log') != -1){
return location.hash = "/page/log";
... ... @@ -639,8 +638,8 @@ layui.extend({
if (!connectFlg) {
tryIndex++;
access_token = localStorage.getItem("access_token")
webSockState = false;
alarmWebSocket();
//webSockState = false;
//alarmWebSocket();
//setTimeout(tryFunc(),3000);
}
}, tryIndex * 3000);
... ...