Authored by wangtao

Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj

Showing 20 changed files with 639 additions and 416 deletions
layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'sessions',"commonDetail",], function (exports) {
var $ = layui.$;
var laytpl = layui.laytpl;
var tree = layui.tree;
var form = layui.form;
var view = layui.view;
var table = layui.table;
var admin = layui.admin;
var common = layui.common;
var commonDetail = layui.commonDetail;
// var mxClient = layui.mxClient;
var busId = '';//当前业务Id
var appId = '';
var curTreeNode = '';
var curDhResType = '';//当前动环所在的资源类型
var currRoomId = '';
var sortKey = '';
function autoHeight(el) {
// var height = el.parents('.layui-card').height();
// el.css('min-height', height - 75);
}
// 隐藏左侧菜单
$('#LAY_app_flexible').click();
//对外暴露的接口
exports('dhSxInfo', function () {
var accessToken = localStorage.getItem("accessToken");
var router = layui.router();
// 资源视图父级表格
var dhParentList;
// 资源视图父级表格
var loading = layer.load(2);
// 树收缩事件
$('#dhInfo-leftree-shrink').on('click', function () {
$(".dhInfoLeft").animate({width:0,minWidth:0,marginLeft:0},300,function () {
$("#dhInfo-leftree_btn").show();
$("#dhInfo-leftree-shrink").hide();
});
});
//树展开事件
$("#dhInfo-leftree_btn").on("click",function () {
$("#dhInfo-leftree_btn").hide();
$("#dhInfo-leftree-shrink").show();
$(".dhInfoLeft").animate({minWidth:250,marginLeft:10},300);
});
//加载动环树
loadDhTree();
//根据roomId查询默认jtopo信息
function getJtopoIdByRoom(roomId) {
$('#dhInfoContent').hide();
$('#dhviewGraphContainer').show();
admin.req({
url: common.domainName + '/api-web/mxgraph/findByTypeAndTargetId?type=4&targetId='+roomId
,type: 'GET'
}).done(function (res) {
if (res && res.success && res.object){
var jtopo = res.object;
var jtopoId = jtopo.jtopoId;
if (jtopoId){ //当查询到jtopoId后,则查询机房拓扑
renderMxgraphView(jtopoId);
}
}else{
$(".mxgraph-view").html("<div style='text-align: center;width: 100%;font-size:18px;'>暂未绑定默认拓扑</div>");
}
}).error(function (error) {
console.log(error);
});
}
//加载树节点
function loadDhTree() {
//获取树节点数据
$("#dhInfotree").empty();
admin.req({
url: common.domainName + '/api-web/dhInfoSx/getDhTree',
sync: true,
done: function (res) {
layer.close(loading);
$('.layui-form layui-card-header')
if (res.success) {
var data = res.data;
if (data.length > 0){
if (data[0].children && data[0].children.length > 0){
childrenFirst = data[0].children[0];
if (childrenFirst.children && childrenFirst.children.length > 0){
sonFirst = childrenFirst.children[0];
if (sonFirst && sonFirst.children.length > 0){
// getResMap(sonFirst.children[0].id);
loadResInfo(sonFirst.children[0].id);
}
}
}
// var roomId = data[0].id;
// currRoomId = data[0].id;
// getJtopoIdByRoom(roomId);
}
tree.render({
elem: '#dhInfotree',
showLine: false,
data: data,
click: function (node) {
if (node.data.children && node.data.children.length == 1) {
$('[data-id="'+ node.data.children[0].id +'"]').find('.layui-tree-iconClick:first').click()
}
curTreeNode = node;
curDhResType = node.data.id;
if (node.data.code) {
busId = JSON.parse(node.data.code)["busId"];
appId = JSON.parse(node.data.code)["appId"];
}
var el = null;
if (node.data.children) {
el = $(node.elem[0]).find('>.layui-tree-entry .layui-tree-txt');
} else {
el = $(node.elem[0]).find('.layui-tree-txt');
}
var action = 'removeClass';
if (!el.hasClass('tree-node-select') && node.state === 'open') {
action = 'addClass';
el.parents('.layui-tree').find('.tree-node-select').removeClass('tree-node-select');
}
el[action]('tree-node-select');
// 决定显示那个视图
if (node.data.type === 'resType') { //资源类型只做展开或折叠操作
// options = JSON.parse(node.data.options);
// var callback = options.bizCallBack;
// var fun = eval(callback);
// // 获取回调方法
// if ($.isFunction(fun)) {
// fun.call(this, data, node.data, options);
// }
} else if (node.data.type === 'res') { //动环资源点击,则显示资源信息及告警信息
loadResInfo(node.data.id);
} else { //机房点击时间
//根据机房id查询拓扑信息
currRoomId = node.data.id;
// getJtopoIdByRoom(node.data.id);
}
}
});
treeTableTips();
//树表格添加new提示
function treeTableTips() {
$.each($('#dhInfotree .layui-tree').find('.layui-tree-set'), function (i, v) {
var $node = $(this);
//不是父节点
if (!$node.find('.layui-tree-set').length) {
$.each(data,function (i,v) {
$.each(v.children,function (x,y) {
$.each(y.children,function (n,m) {
if(m.id==$node.attr('data-id') && m.isNew=="1"){
$node.find('.layui-tree-main').append(' <i class="shake iconfont" style="color: red;font-size: 28px;">&#xe68b;</i>');
}
})
})
})
}
});
}
}
}
}).error(function () {
layer.close(loading);
var data = new Array();
tree.render({
elem: '#dhInfotree',
showLine: false,
data: data
});
});
// renderDefaultIndex();
}
function loadResInfo(resId) {
$('#dhInfoContent').show();
$('#dhviewGraphContainer').hide();
getResMap(resId);
commonDetail.renderActiveAlarms("dh_alarms",resId,'hide');
}
function getResMap(resId) {
$('#dh_baseinfo').html('')
admin.req({
url: common.domainName + '/api-web/dhInfoSx/getCollResultByResId?resId='+resId
,type: 'GET'
}).done(function (res) {
$('.lastCollTime').html(res.str);
var propertys = res.data;
var dataArr = common.splieceGroup(propertys, 3);
var li = "";
//先遍历分组后的,在遍历组内的数组
$.each(dataArr, function (i, v) {
var span = '';
$.each(v, function (j, ar) {
var valueStr = '';
var valueColor;
if (ar.value != 'null'){
valueStr = ar.kpiValue;
if (ar.kpiValue != 'true' && ar.kpiValue != 'false'){
if (ar.kpiValue != 'max'){
if (parseFloat(ar.kpiValue) > parseFloat(ar.max)){
valueColor = 'red';
}
}
if (ar.kpiValue != 'min'){
if (parseFloat(ar.kpiValue) < parseFloat(ar.min)){
valueColor = 'red';
}
}
}
}
span += ' <span style="font-weight: bold;text-align: right;padding-right: 20px">' + ar.kpiName + '</span>' +
'<span title="' + valueStr + '" style="overflow: hidden;text-overflow: ellipsis;padding-left:20px;text-align:left;white-space: nowrap;color: '+valueColor+'">'
+ valueStr +' ' + ar.unit +'</span>';
});
//补充空白区域
var lastLength = v.length
if (lastLength == 1){
span += '<span style="padding-right: 20px;"></span><span style="padding-left:20px;"></span><span style="padding-right: 20px;"></span><span style="padding-left:20px;"></span>'
}else if (lastLength == 2 ){
span += '<span style="padding-right: 20px;"></span><span style="padding-left:20px;"></span>'
}
li += '<li>' + span + '</li>'
$('#dh_baseinfo').html(li);
});
}).error(function (error) {
console.log(error);
});
}
//资源视图父级列表
function openParentResourceView(parentNode, data, node, options) {
// renderParentList(node.parentId, node.id);
}
//渲染拓扑
// function renderMxgraphView(topoId) {
// if (!mxClient.isBrowserSupported()) {
// mxUtils.error('浏览器不支持:Browser is not supported!', 200, false);
// }else{
// if (topoId) {
// var height = window.screen.height -200 ;
// $('.mxgraph-view').html(`<iframe style="border: none;width: 100%;height: calc(100vh - 120px)" src="${common.graphEditorOrigin}/jgraph/grapheditor/viewer.html?access_token=${accessToken}&id=${topoId}"></iframe>`);
// } else {
// $(".mxgraph-view").html("<div style='text-align: center;width: 100%;font-size:18px;'>暂未绑定默认拓扑</div>");
// }
// }
//
// if(topoId){
// //编辑拓扑
// $("#gotoedittopo").unbind("click").on("click",function (){
// //旧版本
// // $(this).attr("lay-href","/mxgraph/setting/id="+topoId);
// //新版本
// var url = common.graphEditorOrigin+"/jgraph/grapheditor/index.html?access_token=" + accessToken +'&id='+topoId;
// window.open(url);
// });
// }
// }
//
// var obj = {
// viewMxGraphNodeResInfo: function (resId) {
// admin.req({
// url: common.domainName + "/api-web/home/resource/findById?resId=" + resId
// , type: "get"
// , done: function (res) {
// var data = res.object;
// if (res.object.type != 'machineroom') {
// return;
// }
// var resType = res.object.resType;
// //模拟点击资源事件
// $('[data-id="'+ currRoomId +'"]').find('.layui-tree-iconClick:first').click();
// $('[data-id="'+ currRoomId +'"]').find('[data-id="'+ resType +'"]').find('.layui-tree-iconClick:first').click();
// $('[data-id="'+ resId +'"]').find('.layui-tree-iconClick:first').click();
// $('[data-id="'+ resId +'"]').find('.layui-tree-txt').addClass('tree-node-select');
// loadResInfo(resId);
// }
// });
// },
// layJump: function (layHref) {
// var resId = layHref.split('=')[1];
// obj.viewMxGraphNodeResInfo(resId)
// },
// };
// window.onmessage = function (messageEvent) {
// console.log(JSON.stringify(messageEvent.data.evalParam));
// if (messageEvent.data.type === 'dhinfo') {
// // 如果是执行方法
// // if(!messageEvent.data.evalParam.startsWith('obj.viewMxGraphNodeResInfo')) {
// // messageEvent.data.evalParam = messageEvent.data.evalParam.replace(/obj\./, 'common.');
// // }
// var result = eval(messageEvent.data.evalParam);
// }
// }
});
});
\ No newline at end of file
... ...
... ... @@ -13,7 +13,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
//对外暴露的接口
exports('domainManageIndex', function (data) {
var sessions = layui.sessions;
var accessToken = sessions.getToken()['access_token'];
var accessToken = common.getMjToken();
var tokenKey = common.getMjTokenKey();
form.render();
var checkList = common.checkPermission(accessToken);
... ... @@ -30,7 +31,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
});
//新增
$("#adddomainManage").unbind().on("click", function () {
if (!common.hasPermission('back:menus:save')){
if (!common.hasPermission('back:domain:save')){
return;
}
openAddHtml();
... ... @@ -174,53 +175,6 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
layer.close(setIndex);
layer.msg("接口请求异常!", {icon: 7, time: 3000});
});
// $.ajax({
// type: 'get',
// url: domainName + '/api-user/menus/findDefaultMenusBydomainManageId/' + domainManageId + '?access_token=' + accessToken,
// success: function (data) {
// layer.close(setIndex);
// var _html = "<div style='text-align:center;height: 120px;width: 500px;position: relative;color: black;'>" +
// "<div style='margin: 40px auto'>" +
// " <select style='text-align: center;text-align-last: center;height: 40px;width: 80%' id='selectFlow'>";
// _html += '<option value ="">=默认首页=</option>';
// if (data && data.data) {
// var result = data.data;
// var defaultMenu = data.object;
// var defaultMenuId = '';
// if (defaultMenu != null) {
// defaultMenuId = defaultMenu.id;
// }
// $.each(result, function (i, e) {
// if (e.id === defaultMenuId) {
// _html += '<option style="height: 100px" value ="' + e.id + '" selected = "selected">' + e.name + '</option>';
// } else {
// _html += '<option style="height: 100px" value ="' + e.id + '">' + e.name + '</option>';
// }
// })
// }
// _html += "</select></div></div>";
// layer.open({
// type: 1,
// title: "设置默认首页", //标题
// area: ['auto', 'auto'], //宽高
// content: _html,
// btn: ['确定', '取消']
// , yes: function (index) {
// var menuId = $('#selectFlow').val();
// if (menuId === '') {
// layer.msg("请选择默认首页", {icon: 7, time: 3000});
// return;
// }
// saveDefaultMenu(domainManageId, menuId);
// layer.close(index);
// }
// });
// },
// error: function (xhr, exp) {
// layer.close(setIndex);
// layer.msg("接口请求异常!", {icon: 7, time: 3000});
// }
// });
}
function saveDefaultMenu(domainManageId, menuId) {
... ... @@ -237,26 +191,11 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
layer.msg('操作失败');
layer.close(loadIndex);
});
// $.ajax({
// type: 'get',
// url: domainName + '/api-user/menus/saveOrUpdateDefaultMenu?access_token=' + accessToken + '&domainManageId=' + domainManageId + '&menuId=' + menuId,
// success: function (data) {
// layer.close(loadIndex);
// if (data) {
// layer.msg(data.msg);
// }
// },
// error: function (xhr, ex) {
// layer.msg('操作失败');
// layer.close(loadIndex);
// }
// });
}
function deleteByIds(ids) {
if ($.inArray('back:menus:delete', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
if (!common.hasPermission('back:domain:delete')){
return;
}
//确认提示框
... ...
... ... @@ -44,11 +44,6 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
}
});
// inputTags.render({
// elem:'#domainAddr',
// content: [],
// aldaBtn: false
// })
form.render();
//自定义验证
form.verify({
... ... @@ -82,10 +77,10 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
var loading = layer.load(2);
admin.req({
type: 'post',
url: common.domainName + '/api-web/manage/domain/save',
contentType: "application/json; charset=utf-8",
data: JSON.stringify(bean),
}).done(function (data) {
url: common.domainName + '/api-web/manage/domain/save'
, success: function (res) {
layer.close(loading);
layer.msg(res.msg, {
offset: '15px'
... ... @@ -97,29 +92,8 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
table.reload('domainManage_table', {});
}
})
}).error(function (error) {
layer.close(loading);
console.error(error);
}
});
// $.ajax({
// type: 'post',
// url: common.domainName + '/api-web/manage/domain/save?access_token=' + accessToken,
// contentType: "application/json; charset=utf-8",
// data: JSON.stringify(bean),
// success: function (res) {
// layer.close(loading);
// layer.msg(res.msg, {
// offset: '15px'
// , icon: 1
// , time: 2000
// }, function () {
// if (res.success === true) {
// layer.closeAll();
// table.reload('domainManage_table', {});
// }
// })
// }
// });
return false;
})
... ...
... ... @@ -78,15 +78,22 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laytpl',
// liHtml += '<li>' + domainList[i].domainName + '</li>'
// }
//joke modify 20230419 tab改为名称+数量,并带有提示
if (response.str && response.str.indexOf("&&")!=-1){
if (response.str){
//多个域
if (response.str.indexOf("&&")!=-1){
for (let i = 0; i < response.str.split("&&").length; i++) {
var v = response.str.split("&&")[i];
var name = v.split("_")[0];
var number = v.split("_")[1];
liHtml += '<li lay-tips="'+name+'C类地址段共'+number+'个">' + name + '('+ number +')</li>'
}
}else if(response.str.indexOf('_')!= -1){
//一个域
var name = response.str.split("_")[0];
var number = response.str.split("_")[1];
liHtml += '<li lay-tips="'+name+'C类地址段共'+number+'个">' + name + '('+ number +')</li>'
}
}
$('#div-ip-card-body .layui-tab-title').html(liHtml);
$('#div-ip-card-body .ip-tab-content').html(laytpl($('#tpl-ip-segment-card').html()).render(response.data));
$('#div-ip-card-body .layui-tab-title li').eq(0).click();
... ...
... ... @@ -12,7 +12,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
//对外暴露的接口
exports('reportConfigAdd', function (data) {
var accessToken = session.getToken()['access_token']
// var accessToken = session.getToken()['access_token']
var accessToken = common.getMjToken();
var adminSelect = {}
var userSelect = {}
... ... @@ -43,7 +44,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
data.userName = userSelect.getValue('nameStr')
data.theirType = $('#config_theirType').val();
admin.req({
url: domainName + '/api-web/bWorkreportGroup/save?access_token=' + accessToken,
url: domainName + '/api-web/bWorkreportGroup/save?accessToken=' + accessToken,
data: JSON.stringify(data),
type: 'post',
contentType: "application/json; charset=utf-8",
... ... @@ -108,15 +109,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
}
})
}*/
var url = `${domainName}/api-web/bWorkreportGroup/findManufacturerList?access_token=${accessToken}`;
// var url = `${domainName}/api-web/bWorkreportGroup/findManufacturerList?accessToken=${accessToken}`;
let url = `${domainName}/mj/sys/conf/getSelect/provider?accessToken=${accessToken}`
$.ajax({
url: url,
success: function (res) {
var selects = res.data;
var selects = res.data.options;
var $sel = $("form[name='add-config-form']").find("select[name='manufacturerId']");
$sel.append('<option value="">请选择</option>')
$.each(selects, function (i, e) {
$sel.append('<option value="' + e.id + '">' + e.manufacturerName + '</option>')
// $sel.append('<option value="' + e.id + '">' + e.manufacturerName + '</option>')
$sel.append(`<option value="${e.value}"> ${e.label}</option>`)
})
if (data && data.id) {
admin.req({
... ... @@ -140,10 +143,28 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
})
}
// 所属类型表单赋值
function fromTheirType() {
let url = `${domainName}/mj/sys/conf/getSelect/theirType?accessToken=${accessToken}`
$.ajax({
url: url,
success: function (res) {
var selects = res.data.options;
var $sel = $("form[name='add-config-form']").find("select[name='theirType']");
$sel.append('<option value="">请选择</option>')
$.each(selects, function (i, e) {
$sel.append(`<option value="${e.value}"> ${e.label}</option>`)
})
form.render();
}
})
}
//初始化组负责人下拉列表框
function initSelect() {
$.ajax({
url: domainName + '/api-user/users/getAll?access_token=' + accessToken,
// url: domainName + '/api-user/users/getAll?accessToken=' + accessToken,
url: domainName + '/mj/user/page?username=&nickname=&enabled=&perPage=10000&page=1&accessToken=' + accessToken,
success: function (res) {
adminSelect = xmSelect.render({
el: '.admin',
... ... @@ -157,7 +178,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
},
layVerify: 'required',
layVerType: 'msg',
data: res,
data: res.data.rows,
})
userSelect = xmSelect.render({
el: '.user',
... ... @@ -169,9 +190,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
},
layVerify: 'required',
layVerType: 'msg',
data: res,
data: res.data.rows,
})
fromAssignment()
fromTheirType()
}
})
}
... ... @@ -179,7 +201,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
//初始化所属组列表
function initGroupSelect() {
$.ajax({
url: domainName + '/api-web/bWorkreportGroup/list?access_token=' + accessToken,
url: domainName + '/api-web/bWorkreportGroup/list?accessToken=' + accessToken,
success: function (res) {
$("#groupName")[0].options.length = 1
$.each(res.data, function (i, v) {
... ...
... ... @@ -11,9 +11,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
//对外暴露的接口
exports("reportConfigIndex", function () {
var accessToken = session.getToken()['access_token']
// var accessToken = session.getToken()['access_token']
var accessToken = common.getMjToken();
let theirTypeOptions = [];
initGroupSelect()
// initGroupSelect()
//回车搜索
$('#adminName').keydown(function (e) {
... ... @@ -82,11 +84,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
{
field: 'theirType', title: '所属类型', align: 'center', width: 150,
templet: function (d) {
if (d.theirType == '1') {
/*if (d.theirType == '1') {
return '日志类型';
} else {
return '文档类型';
}*/
let label='';
theirTypeOptions.forEach((item,index)=>{
if (item.value == d.theirType){
label = item.label;
}
})
return label;
}
},
{
... ... @@ -183,7 +192,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
, time: 1000
}, function () {
reloadConfigTable();
initGroupSelect()
// initGroupSelect()
});
}).error(function (error) {
console.log(error);
... ... @@ -219,6 +228,24 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
})
}
// 所属类型表单赋值
function fromTheirType() {
let url = `${domainName}/mj/sys/conf/getSelect/theirType?accessToken=${accessToken}`
$.ajax({
url: url,
success: function (res) {
var selects = res.data.options;
theirTypeOptions = res.data.options;
var $sel = $("form.layuiadmin-card-header-auto").find("select[name='theirType']");
$.each(selects, function (i, e) {
$sel.append(`<option value="${e.value}"> ${e.label}</option>`)
})
form.render();
}
})
}
fromTheirType();
//获取页面选中数据
function getCheckStatusData() {
return table.checkStatus('workReportConfigTable').data
... ...
... ... @@ -10,13 +10,14 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
//对外暴露的接口
exports('resManageAdd', function (data) {
var accessToken = common.getMjToken();
var tokenKey = common.getMjTokenKey();
var inputTags = layui.inputTags;
var id = data.id;
var copy = data.copy;
var resType = data.resType;
var hardwareFlag = data.hardwareFlag;
var sessions = layui.sessions;
var accessToken = common.getMjToken();
var formData = {ip: '', port: '', manageIp: ''};
var protocolParam = [];
var dimainlist = [];
... ... @@ -31,37 +32,37 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
//延递对象
$.when(
$.ajax({
url: common.domainName + '/api-web/home/business/findAllBusType?accessToken=' + accessToken,
url: common.domainName + `/api-web/home/business/findAllBusType?${tokenKey}=${accessToken}` ,
data: {'type': 'per'}
}), $.ajax({
url: `${common.domainName}/api-web/manage/ddic/findSucDdics/provider?accessToken=${accessToken}`,
url: `${common.domainName}/api-web/manage/ddic/findSucDdics/provider?${tokenKey}=${accessToken}`,
method: 'get'
}), $.ajax({
url: `${common.domainName}/api-web/manage/application/page?page=-1&limit=-1&accessToken=${accessToken}`,
url: `${common.domainName}/api-web/manage/application/page?page=-1&limit=-1&${tokenKey}=${accessToken}`,
method: 'POST'
}), $.ajax({
url: `${common.domainName}/api-web/manage/restype/list?accessToken=${accessToken}`,
url: `${common.domainName}/api-web/manage/restype/list?${tokenKey}=${accessToken}`,
method: 'GET'
}), $.ajax({
url: `${common.domainName}/api-user/users/getAll?accessToken=${accessToken}`,
url: `${common.domainName}/mj/user/page?username=&nickname=&enabled=&perPage=10000&page=1&${tokenKey}=${accessToken}`,
method: 'GET'
}), $.ajax({
url: `${common.domainName}/api-web/manage/ddic/findSucDdics/os?accessToken=${accessToken}`,
url: `${common.domainName}/api-web/manage/ddic/findSucDdics/os?${tokenKey}=${accessToken}`,
method: 'get'
}), $.ajax({
url: `${common.domainName}/api-web/manage/domain/page?accessToken=${accessToken}`,
url: `${common.domainName}/api-web/manage/domain/page?${tokenKey}=${accessToken}`,
method: 'GET'
}), $.ajax({
url: `${common.domainName}/api-web/manage/restypeProtocol/getProtocolByResType?accessToken=${accessToken}&resTypeCode=${resType}`,
url: `${common.domainName}/api-web/manage/restypeProtocol/getProtocolByResType?${tokenKey}=${accessToken}&resTypeCode=${resType}`,
method: 'GET'
}), $.ajax({
url: `${common.domainName}/api-web/sysConf/getConfByCode?accessToken=${accessToken}&code=pwd_level`,
url: `${common.domainName}/api-web/sysConf/getConfByCode?${tokenKey}=${accessToken}&code=pwd_level`,
method: 'GET'
}), $.ajax({
url: `${common.domainName}/api-web/manage/ddic/findSucDdics/resCategory?accessToken=${accessToken}`,
url: `${common.domainName}/api-web/manage/ddic/findSucDdics/resCategory?${tokenKey}=${accessToken}`,
method: 'get'
}), $.ajax({
url: `${common.domainName}/api-web/manage/machineroom/list?accessToken=${accessToken}`,
url: `${common.domainName}/api-web/manage/machineroom/list?${tokenKey}=${accessToken}`,
method: 'GET'
})
).done(function (res1, res2, res3, res4, res5, res6, res7, res8, res9, res10, res11) {
... ... @@ -95,7 +96,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
var bizlist = res1[0].data;
var ddiclist = res2[0].data;
var applist = res3[0].data;
var userList = res5[0];
var userList = res5[0].data.rows;
var oslist = res6[0].data;
dimainlist = res7[0].data;
var resCategoryList = res10[0].data;
... ... @@ -168,7 +169,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
$("#resManageAddForm").find("input[name='resId']").val(id);
}
$.ajax({
url: common.domainName + '/api-web/manage/resource/findById?accessToken=' + accessToken,
url: common.domainName + `/api-web/manage/resource/findById?${tokenKey}=${accessToken}` ,
data: {resId: id},
async: false,
success: function (res) {
... ... @@ -762,7 +763,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
success: function (index, layero) {
$.ajax({
type: 'get',
url: common.domainName + '/api-web/manage/resextendgroup/page?accessToken=' + accessToken,
url: common.domainName + `/api-web/manage/resextendgroup/page?${tokenKey}=${accessToken}` ,
success: function (res) {
var selects = res.data;
$("#chooseExtendParamGroupSelect").append("<option value=''>请选择</option>");
... ... @@ -816,7 +817,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
var param = {groupName: val, arr: arr}
$.ajax({
type: 'post',
url: common.domainName + '/api-web/manage/resextendgroup/save?accessToken=' + accessToken,
url: common.domainName + `/api-web/manage/resextendgroup/save?${tokenKey}=${accessToken}` ,
data: JSON.stringify(param),
contentType: "application/json; charset=utf-8",
success: function (res) {
... ...
... ... @@ -49,7 +49,9 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
}
var sessions = layui.sessions;
accessToken = sessions.getToken().access_token;
// accessToken = sessions.getToken().access_token;
accessToken = common.getMjToken();
var tokenKey = common.getMjTokenKey();
var checkList = common.checkPermission(accessToken);
var loading = layer.load(2, {shade: 0.2});
admin.req({
... ... @@ -288,7 +290,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
}
layer.load(2);
admin.req({
url: `${common.domainName}/api-web/manage/restypeProtocol/getProtocolByResType?access_token=${accessToken}&resTypeCode=${data.id}`,
url: `${common.domainName}/api-web/manage/restypeProtocol/getProtocolByResType?${tokenKey}=${accessToken}&resTypeCode=${data.id}`,
success(response) {
layer.closeAll('loading');
if (response && response.success) {
... ... @@ -310,7 +312,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
yes: function (index, layero) {
var checks = table.checkStatus('protocol_table').data;
var params = {
access_token: accessToken,
accessToken: accessToken,
protocolCodes: checks.map(item => item.protocolCode).toString(),
resTypeCode: data.id
}
... ... @@ -331,7 +333,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
//渲染上传组件
var uploadIndex = upload.render({
elem: '#btn-resManageImport'
, url: domainName + '/api-web/bResource/importFromTemplate?access_token=' + accessToken
, url: domainName + '/api-web/bResource/importFromTemplate?accessToken=' + accessToken
, accept: 'file',
before: function () {
loadIndex = layer.load(1, {shade: [0.6], content: '正在导入,请稍后...'});
... ... @@ -379,7 +381,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
}
layer.load(2);
admin.req({
url: `${common.domainName}/api-web/manage/restypeProtocol/getProtocolByResType?access_token=${accessToken}&resTypeCode=${data.id}`,
url: `${common.domainName}/api-web/manage/restypeProtocol/getProtocolByResType?accessToken=${accessToken}&resTypeCode=${data.id}`,
success(response) {
layer.closeAll('loading');
if (response && response.success) {
... ... @@ -411,7 +413,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
}
}
Object.assign(params, {
access_token: accessToken,
accessToken: accessToken,
protocolCodes: checks.map(item => item.protocolCode).toString(),
resTypeCode: data.id
});
... ... @@ -461,9 +463,8 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
return false;
}
var loding = layer.load(2);
admin.req({
type: "get",
url: common.domainName + '/api-web/manage/restemp/resourceTaskTemplate?resIds=' + resIds.toString() + '&taskId=' + taskId + '&checkTempId=' + checkTempId ,
$.ajax({
url: common.domainName + '/api-web/manage/restemp/resourceTaskTemplate?resIds=' + resIds.toString() + '&taskId=' + taskId + '&checkTempId=' + checkTempId + '&accessToken=' + accessToken,
success: function (res) {
layer.close(loding);
layer.msg('配置成功', {
... ... @@ -475,29 +476,11 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
reloadTable();
});
},
error: function (err) {
error: function () {
layer.close(loding)
layer.msg("配置失败!服务异常", {offset: '15px', icon: 7, time: 2000});
}
});
// $.ajax({
// url: common.domainName + '/api-web/manage/restemp/resourceTaskTemplate?resIds=' + resIds.toString() + '&taskId=' + taskId + '&checkTempId=' + checkTempId + '&access_token=' + accessToken,
// success: function (res) {
// layer.close(loding);
// layer.msg('配置成功', {
// offset: '15px'
// , icon: 1
// , time: 1500
// }, function () {
// layer.closeAll();
// reloadTable();
// });
// },
// error: function () {
// layer.close(loding)
// layer.msg("配置失败!服务异常", {offset: '15px', icon: 7, time: 2000});
// }
// })
})
})
}
})
... ... @@ -510,18 +493,25 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
$.each(data, function (i, e) {
resIds.push(e.resId)
})
var url = "/vue3/index.html#/vue3/portSense";//不传参
var url = "/monitor-web/vue3/index.html#/vue3/portSense";//不传参
if (data.length > 0) {//传参
url = "/vue3/index.html#/vue3/portSense?resId=" + resIds.toString();
url = "/monitor-web/vue3/index.html#/vue3/portSense?resId=" + resIds.toString();
}
layer.open({
type: 1
, title: '端口侦测'
, closeBtn: 1
, area: ['90%', '80%']
, id: 'lay_port_sense' //设定一个id,防止重复弹出
, content: '<iframe src=' + url + ' frameborder="0" class="layadmin-iframe"/>' //支持传入html
});
let win = window.parent;
if (win) {
window.parent.postMessage({
type: 'dialog',
message: {'params':{},'title':'端口侦测','url':url}
}, '*')
}
// layer.open({
// type: 1
// , title: '端口侦测'
// , closeBtn: 1
// , area: ['90%', '80%']
// , id: 'lay_port_sense' //设定一个id,防止重复弹出
// , content: '<iframe src=' + url + ' frameborder="0" class="layadmin-iframe"/>' //支持传入html
// });
})
function openResManageCollHtml(callback) {
... ... @@ -549,35 +539,8 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
resize: false,
area: ['50%', '40%'],
success: function (indexm, layero) {
admin.req({
url: common.domainName + '/api-web/manage/task/page?page=-1&limit=-1' ,
success: function (res) {
$.each(res.data, function (i, e) {
var option = '<option value="' + e.taskId + '">' + e.taskName + '</option>'
$("#resChooseTaskSelect").append(option);
})
$("#resChooseTaskSelect").on("change", function () {
var $that = $(this);
$("#resChooseTaskTempSelect").empty();
$("#resChooseTaskTempSelect").append('<option value="">请选择</option>')
if ($that.val()) {
$.ajax({
url: common.domainName + '/api-web/manage/restemp/findByTaskId?taskId=' + $that.val() + '&access_token=' + accessToken,
success: function (tempRes) {
$.each(tempRes.data, function (k, j) {
var option = '<option value="' + j.checkTempId + '">' + j.taskId + '</option>'
$("#resChooseTaskTempSelect").append(option);
})
}
})
}
})
},
error: function (err) {
}
});
// $.ajax({
// url: common.domainName + '/api-web/manage/task/page?page=-1&limit=-1&access_token=' + accessToken,
// admin.req({
// url: common.domainName + '/api-web/manage/task/page?page=-1&limit=-1' ,
// success: function (res) {
// $.each(res.data, function (i, e) {
// var option = '<option value="' + e.taskId + '">' + e.taskName + '</option>'
... ... @@ -599,8 +562,35 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
// })
// }
// })
// },
// error: function (err) {
// }
// })
// });
$.ajax({
url: common.domainName + '/api-web/manage/task/page?page=-1&limit=-1&accessToken=' + accessToken,
success: function (res) {
$.each(res.data, function (i, e) {
var option = '<option value="' + e.taskId + '">' + e.taskName + '</option>'
$("#resChooseTaskSelect").append(option);
})
$("#resChooseTaskSelect").on("change", function () {
var $that = $(this);
$("#resChooseTaskTempSelect").empty();
$("#resChooseTaskTempSelect").append('<option value="">请选择</option>')
if ($that.val()) {
$.ajax({
url: common.domainName + '/api-web/manage/restemp/findByTaskId?taskId=' + $that.val() + '&accessToken=' + accessToken,
success: function (tempRes) {
$.each(tempRes.data, function (k, j) {
var option = '<option value="' + j.checkTempId + '">' + j.taskId + '</option>'
$("#resChooseTaskTempSelect").append(option);
})
}
})
}
})
}
})
},
yes: function (index, layero) {
if (callback && callback()) {
... ... @@ -951,7 +941,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
, id: 'resManageTable'
, url: common.domainName + '/api-web/home/res-list/' + resType
, where: {
access_token: accessToken,
accessToken: accessToken,
editMode: 'true',
resName: $("#resManageIndexForm").find("input[name='resName']").val() ? $("#resManageIndexForm").find("input[name='resName']").val() : searchId,
ipOrManageIp: $("#resManageIndexForm").find("input[name='ipOrManageIp']").val(),
... ... @@ -1016,7 +1006,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
});
$('[resmanage-data-console]').unbind("click").on('click', function () {
var resId = $(this).attr("resmanage-data-console");
window.open('/src/lib/extend/ssh/page/webssh.html?resId=' + resId, "_blank");
window.open('/monitor-web/src/lib/extend/ssh/page/webssh.html?resId=' + resId, "_blank");
});
$('[resmanage-data-stopcoll]').unbind("click").on('click', function () {
var $that = $(this)
... ... @@ -1029,14 +1019,14 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
resId: $that.attr("resmanage-data-stopcoll"),
state: $that.data("param")
}
admin.req({
url: common.domainName + '/api-web/manage/resource/stopOrStartColl'
,data: JSON.stringify(opj)
$.ajax({
url: common.domainName + '/api-web/manage/resource/stopOrStartColl?accessToken=' + accessToken
, data: JSON.stringify(opj)
, type: 'post'
, contentType: "application/json; charset=utf-8",
success: function (res) {
if (res.success) {
, contentType: "application/json; charset=utf-8"
, success: function (res) {
layer.close(loding);
if (res.success) {
layer.msg('操作成功', {
offset: '15px'
, icon: 1
... ... @@ -1053,32 +1043,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
layer.closeAll();
console.error(res);
}
});
// $.ajax({
// url: common.domainName + '/api-web/manage/resource/stopOrStartColl?access_token=' + accessToken
// , data: JSON.stringify(opj)
// , type: 'post'
// , contentType: "application/json; charset=utf-8"
// , success: function (res) {
// if (res.success) {
// layer.close(loding);
// layer.msg('操作成功', {
// offset: '15px'
// , icon: 1
// , time: 1500
// }, function () {
// layer.closeAll();
// reloadTable();
// });
// } else {
// layer.msg('操作异常:' + res.msg, {icon: 7, time: 3000});
// }
// },
// error: function (res) {
// layer.closeAll();
// console.error(res);
// }
// })
})
});
});
// 加入/移出收藏夹
... ... @@ -1523,11 +1488,10 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
subIds: formdata.subIds
}
var loding = layer.load(2);
admin.req({
//修改扩展字段T3/IOp值
url: common.domainName + '/api-web/manage/resource/saveResAlarmAndTaskInfo',
$.ajax({
url: common.domainName + `/api-web/manage/resource/saveResAlarmAndTaskInfo?${tokenKey}=${accessToken}` ,
data: param,
success: function (response) {
success: function (res) {
layer.msg('配置成功', {offset: '15px', icon: 1, time: 2000}, function () {
layer.closeAll();
reloadTable();
... ... @@ -1537,27 +1501,10 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
});
},
error: function (err) {
error: function (res) {
layer.close(loding);
}
});
// $.ajax({
// url: common.domainName + '/api-web/manage/resource/saveResAlarmAndTaskInfo?access_token=' + accessToken,
// data: param,
// success: function (res) {
// layer.msg('配置成功', {offset: '15px', icon: 1, time: 2000}, function () {
// layer.closeAll();
// reloadTable();
// if (next == '1') {
// openResourceRelationConfigHtml(bean.resId, bean.resType)
// }
// });
//
// },
// error: function (res) {
// layer.close(loding);
// }
// })
})
})
},
... ... @@ -1613,7 +1560,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
btn: ['关闭'],
success: function (layero, index) {
relationTableRender(resId)
var url = domainName + '/api-web/relationType/getAll?access_token=' + accessToken
var url = domainName + '/api-web/relationType/getAll?accessToken=' + accessToken
var options = '';
$.ajaxSettings.async = false;
$.getJSON(url, function (res) {
... ... @@ -1634,12 +1581,11 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
layer.msg("请先选择关系类型!", {offset: '15px', icon: 7, time: 2000});
return false;
}
admin.req({
//修改扩展字段T3/IOp值
$.ajax({
url: common.domainName + '/api-web/manage/resource/findResRelationByResId',
async: false,
data: {
access_token: accessToken,
accessToken: accessToken,
resId: resId,
reType: reType,
page: 1,
... ... @@ -1649,26 +1595,8 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
resIds = res.data.map(item => {
return item.targetId;
})
},
error: function (err) {
}
});
// $.ajax({
// url: common.domainName + '/api-web/manage/resource/findResRelationByResId',
// async: false,
// data: {
// access_token: accessToken,
// resId: resId,
// reType: reType,
// page: 1,
// limit: -1
// },
// success: function (res) {
// resIds = res.data.map(item => {
// return item.targetId;
// })
// }
// })
})
common.openWin("template/res/reslist", "选择资源", {oldData: resIds}, ["选择"], function () {
var reslist = layui.reslist({});
var data = reslist.getData();
... ... @@ -1691,9 +1619,8 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
reType: reType,
arr: arr
}
admin.req({
//修改扩展字段T3/IOp值
url: common.domainName + '/api-web/manage/resource/saveResRelation',
$.ajax({
url: common.domainName + `/api-web/manage/resource/saveResRelation?${tokenKey}=${accessToken}` ,
type: 'post',
contentType: "application/json; charset=utf-8",
data: JSON.stringify(param),
... ... @@ -1703,25 +1630,10 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
relationTableRender(resId);
});
},
error: function (err) {
error: function (res) {
layer.close(loding);
}
});
// $.ajax({
// url: common.domainName + '/api-web/manage/resource/saveResRelation?access_token=' + accessToken,
// type: 'post',
// contentType: "application/json; charset=utf-8",
// data: JSON.stringify(param),
// success: function (res) {
// layer.msg('保存成功!', {icon: 1, time: 1500}, function () {
// layer.close(loding);
// relationTableRender(resId);
// });
// },
// error: function (res) {
// layer.close(loding);
// }
// })
})
return true;
})
})
... ... @@ -1732,7 +1644,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
elem: '#resource_relation_add_table'
, url: common.domainName + '/api-web/manage/resource/findResRelationByResId'
, where: {
access_token: accessToken,
accessToken: accessToken,
resId: resId,
reType: $('input[name="res_retype"]:checked').val(),
}
... ... @@ -1775,7 +1687,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
$('.delete_resRelation').unbind().on('click', function (el) {
var id = $(this).data('id');
var deleteLoding = layer.load(2)
var url = common.domainName + '/api-web/manage/resource/deleteResRelation?access_token=' + accessToken + '&id=' + id;
var url = common.domainName + '/api-web/manage/resource/deleteResRelation?accessToken=' + accessToken + '&id=' + id;
$.get(url, function (res) {
if (res.success) {
layer.close(deleteLoding);
... ... @@ -2022,7 +1934,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
curr: 1
}
, where: { //请求参数(注意:这里面的参数可任意定义,并非下面固定的格式)
access_token: accessToken,
accessToken: accessToken,
resName: $("#resManageIndexForm").find("input[name='resName']").val(),
ipOrManageIp: $("#resManageIndexForm").find("input[name='ipOrManageIp']").val(),
// admin: $("#resManageIndexForm").find("input[name='admin']").val(),
... ... @@ -2075,9 +1987,8 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
extend: extend
}
var loding = layer.load(2)
admin.req({
//修改扩展字段T3/IOp值
url: common.domainName + '/api-web/manage/resource/save',
$.ajax({
url: common.domainName + '/api-web/manage/resource/save?accessToken=' + accessToken,
type: 'post',
data: JSON.stringify(param),
contentType: "application/json;charset=utf-8",
... ... @@ -2092,30 +2003,10 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
}
});
},
error: function (err) {
error: function (res) {
layer.close(loding)
}
});
// $.ajax({
// url: common.domainName + '/api-web/manage/resource/save?access_token=' + accessToken,
// type: 'post',
// data: JSON.stringify(param),
// contentType: "application/json;charset=utf-8",
// success: function (res) {
// layer.close(loding)
// layer.msg('保存成功!', {icon: 1, time: 1500}, function () {
// layer.closeAll();
// reloadTable();
// if (next == '1') {
// //openCollTaskAndAlarm(res.object)
// openResourceRelationConfigHtml(res.object.resId, res.object.resType)
// }
// });
// },
// error: function (res) {
// layer.close(loding)
// }
// })
})
}
//资源协议验证
... ...
... ... @@ -10,8 +10,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'admin'], function (exports
// 对外暴露的接口
exports('resdescribe', function (data) {
var sessions = layui.sessions;
var accessToken = sessions.getToken().access_token;
var accessToken = localStorage.getItem("accessToken");
var resDescribeTable = {}
form.render();
... ...
... ... @@ -10,8 +10,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'admin'], function (exports
// 对外暴露的接口
exports('resdescribeAdd', function (data) {
var sessions = layui.sessions;
var accessToken = sessions.getToken().access_token;
var accessToken = localStorage.getItem("accessToken");
form.render();
... ...
... ... @@ -82,7 +82,7 @@ layui.define(['table', 'form', 'sessions', 'common', 'view', 'admin', 'taskadd']
elem: '#task-table',
url: domainName + '/api-web/manage/task/page',
where: {
access_token: accessToken,
accessToken: accessToken,
keyword: $('#condition-task-name').val(),
resId: resId,
haveNotCollector: haveNotCollector
... ...
... ... @@ -12,7 +12,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
//对外暴露的接口
exports('userIndex', function (data) {
var sessions = layui.sessions;
var accessToken = sessions.getToken()['access_token'];
// var accessToken = sessions.getToken()['access_token'];
var accessToken = common.getMjToken();
var userResTable = {};
var userindexOrgSel = {};
var userroleSelect = {}
... ... @@ -63,9 +64,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
//新增
$('#addUserBtn').unbind().on('click', function () {
if ($.inArray('back:user:save', permissionList) == -1) {
layer.msg('暂无权限', {icon: 7, time: 3000})
return false;
if (!common.hasPermission('back:user:save')){
return;
}
openUserForm()
})
... ... @@ -77,55 +77,49 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
//冻结
$('#disableUserBtn').on('click', function () {
if ($.inArray('back:user:operating', permissionList) == -1) {
layer.msg('暂无权限', {icon: 7, time: 3000})
return false;
if (!common.hasPermission('back:user:operating')){
return;
}
disableUser()
})
//恢复
$('#recoverUserBtn').on('click', function () {
if ($.inArray('back:user:operating', permissionList) == -1) {
layer.msg('暂无权限', {icon: 7, time: 3000})
return false;
if (!common.hasPermission('back:user:operating')){
return;
}
recoverUser()
})
//下载模板
$('#user_temp_download').on('click', function () {
if ($.inArray('back:user:operating', permissionList) == -1) {
layer.msg('暂无权限', {icon: 7, time: 3000})
return false;
if (!common.hasPermission('back:user:operating')){
return;
}
var url = domainName + '/api-user/users/userTemp-download?access_token=' + accessToken;
var url = domainName + '/api-user/users/userTemp-download?accessToken=' + accessToken;
window.open(url);
})
//资源类型授权
$('#user_resType_authorization').unbind().on('click', function () {
if ($.inArray('back:user:impower', permissionList) == -1) {
layer.msg('暂无权限', {icon: 7, time: 3000})
return false;
if (!common.hasPermission('back:user:impower')){
return;
}
resTypeAuthorization()
})
//业务类型授权
$('#user_busType_authorization').unbind().on('click', function () {
if ($.inArray('back:user:impower', permissionList) == -1) {
layer.msg('暂无权限', {icon: 7, time: 3000})
return false;
if (!common.hasPermission('back:user:impower')){
return;
}
busTypeAuthorization()
})
//资源授权
$('#user_resource_authorization').unbind().on('click', function () {
if ($.inArray('back:user:impower', permissionList) == -1) {
layer.msg('暂无权限', {icon: 7, time: 3000})
return false;
if (!common.hasPermission('back:user:impower')){
return;
}
resourceAuthorization()
})
... ... @@ -133,14 +127,23 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
//渲染表格
var userTable = table.render({
elem: '#user_table',
url: domainName + "/api-user/users",
url: domainName + "/mj/user/page",
where: {
access_token: accessToken,
accessToken: accessToken,
username: $('#userSearchForm').find("input[name='username']").val(),
nickname: $('#userSearchForm').find("input[name='nickname']").val(),
enabled: $('#userSearchForm').find("select[name='enabled']").val(),
orgId: userindexOrgSel.getValue("valueStr"),
roles: userroleSelect.getValue("valueStr"),
perPage: 10000
},
parseData:function(res){ // 解析请求到的结果 在return 中也可以返回自己想要的东西
return{
"code":0, // 这个0 一定是数字类型的
"msg":"",
"count":res.data.count,
"data":res.data.rows, // 注意此处res为对象包含 code msg data
}
},
height: 'full-200',
cellMinWidth: 80,
... ... @@ -208,9 +211,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
done: function (res, curr, count) {
//点击用户名编辑表单
$('.user_name_btn').on('click', function () {
if ($.inArray('back:user:update', permissionList) == -1) {
layer.msg('暂无权限', {icon: 7, time: 3000})
return false;
if (!common.hasPermission('back:user:update')){
return;
}
var id = $(this).data('id')
openUserForm(id)
... ... @@ -218,9 +220,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
//点击角色为用户分配角色
$('.user_roles_btn').on('click', function () {
if ($.inArray('back:user:setRole', permissionList) == -1) {
layer.msg('暂无权限', {icon: 7, time: 3000})
return false;
if (!common.hasPermission('back:user:setRole')){
return;
}
var id = $(this).data('id')
setRoles(id)
... ... @@ -228,9 +229,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
//修改密码
$('.user_pass_btn').on('click', function () {
if ($.inArray('back:user:password', permissionList) == -1) {
layer.msg('暂无权限', {icon: 7, time: 3000})
return false;
if (!common.hasPermission('back:user:password')){
return;
}
var id = $(this).data('id');
var username = $(this).data('username');
... ... @@ -244,33 +244,30 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
})
//资源类型授权 joke add 20210426
$('.user_resType_authorization_btn').unbind().on('click', function () {
if ($.inArray('back:user:impower', permissionList) == -1) {
layer.msg('暂无权限', {icon: 7, time: 3000})
return false;
if (!common.hasPermission('back:user:impower')){
return;
}
resTypeAuthorization($(this).data('username'));
});
//业务类型授权 joke add 20210426
$('.user_busType_authorization_btn').unbind().on('click', function () {
if ($.inArray('back:user:impower', permissionList) == -1) {
layer.msg('暂无权限', {icon: 7, time: 3000})
return false;
if (!common.hasPermission('back:user:impower')){
return;
}
busTypeAuthorization($(this).data('username'))
});
//资源授权 joke add 20210426
$('.user_resource_authorization_btn').unbind().on('click', function () {
if ($.inArray('back:user:impower', permissionList) == -1) {
layer.msg('暂无权限', {icon: 7, time: 3000})
return false;
if (!common.hasPermission('back:user:impower')){
return;
}
resourceAuthorization($(this).data('username'))
});
//资源授权的回显
if (data && data.resIds && data.resIds.split(',').length == 1) {
var url = common.domainName + "/api-web/manage/resource/getUserIdsByResId?resId=" + data.resIds.split(',')[0] + '&access_token=' + accessToken
var url = common.domainName + "/api-web/manage/resource/getUserIdsByResId?resId=" + data.resIds.split(',')[0] + '&accessToken=' + accessToken
$.ajax({
url: url,
type: 'get',
... ... @@ -485,7 +482,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
layer.load(2);
admin.req({
url: domainName + '/api-web/defaultIndex/save?access_token=' + accessToken,
url: domainName + '/api-web/defaultIndex/save?accessToken=' + accessToken,
type: 'POST',
contentType: 'application/json',
data: JSON.stringify({
... ... @@ -513,7 +510,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
btn2: function (layerIndex) {
layer.load(2);
admin.req({
url: domainName + '/api-web/defaultIndex/delete?access_token=' + accessToken,
url: domainName + '/api-web/defaultIndex/delete?accessToken=' + accessToken,
data: {
type: 'user',
targetId: username
... ... @@ -552,7 +549,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
function reloadTable() {
userTable.reload({
where: {
access_token: accessToken,
accessToken: accessToken,
username: $('#userSearchForm').find("input[name='username']").val(),
nickname: $('#userSearchForm').find("input[name='nickname']").val(),
enabled: $('#userSearchForm').find("select[name='enabled']").val(),
... ... @@ -567,9 +564,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
//删除数据
function deleteUser(id) {
if ($.inArray('back:user:delete', permissionList) == -1) {
layer.msg('暂无权限', {icon: 7, time: 3000})
return false;
if (!common.hasPermission('back:user:delete')){
return;
}
if (typeof (id) == "number") {
id = id.toString()
... ... @@ -593,7 +589,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
btn: ['确定', '取消'] //按钮
}, function () {
$.ajax({
url: common.domainName + '/api-user/users/delete?access_token=' + accessToken
url: common.domainName + '/api-user/users/delete?accessToken=' + accessToken
, type: "get"
, data: {ids: id}
}).done(function (res) {
... ... @@ -627,7 +623,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
//初始化角色下拉列表框
function initRolesSelect() {
$.ajax({
url: domainName + '/api-user/roles?access_token=' + accessToken,
url: domainName + '/mj/sys/role/roles?name=&perPage=100&page=1&accessToken=' + accessToken,
async: false,
success: function (res) {
userroleSelect = xmSelect.render({
... ... @@ -656,7 +652,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
},
filterable: true,
layVerType: 'msg',
data: res.data,
data: res.data.rows,
})
}
})
... ... @@ -666,7 +662,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
//TODO 目前先设置为非强制父子关系,后期讨论看用户列表查询如何根据组织查询 joke 20210423
function initOrgSelect() {
$.ajax({
url: domainName + '/api-user/org/getOrgTreeByPid?access_token=' + accessToken,
url: domainName + '/mj/sysOrg/orgTree?name=&accessToken=' + accessToken,
async: false,
success: function (res) {
userindexOrgSel = xmSelect.render({
... ...
... ... @@ -118,10 +118,10 @@
<button class="layui-btn layui-btn-sm layui-btn-normal" id="resManageSub" type="button"><i
class="layui-icon">&#xe678;</i>告警订阅
</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="res-user-grant-btn"><i
<button class="layui-btn layui-btn-sm layui-btn-normal layui-hide" id="res-user-grant-btn"><i
class="layui-icon">&#xe66f;</i>资源授权
</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="res_relation_config"><i
<button class="layui-btn layui-btn-sm layui-btn-normal layui-hide" id="res_relation_config"><i
class="layui-icon">&#xe630;</i>关系配置
</button>
<div class="right-btns" style="float: right">
... ...
... ... @@ -54,16 +54,16 @@
</div>
<div class="layui-card-body">
<div class="warn-btns">
<button class="layui-btn layui-btn-sm layui-btn-normal" id="addUserBtn" type="button"><i
<button class="layui-btn layui-btn-sm layui-btn-normal layui-hide" id="addUserBtn" type="button"><i
class="layui-icon">&#xe654;</i>新增
</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="delUserBtn" type="button"><i
<button class="layui-btn layui-btn-sm layui-btn-normal layui-hide" id="delUserBtn" type="button"><i
class="layui-icon">&#xe640;</i>删除
</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="disableUserBtn" type="button"><i
<button class="layui-btn layui-btn-sm layui-btn-normal layui-hide" id="disableUserBtn" type="button"><i
class="layui-icon">&#xe651;</i>冻结
</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="recoverUserBtn" type="button"><i
<button class="layui-btn layui-btn-sm layui-btn-normal layui-hide" id="recoverUserBtn" type="button"><i
class="layui-icon">&#xe652;</i>恢复
</button>
<!-- <button id="user_resType_authorization" type="button" class="layui-btn layui-btn-sm layui-btn-normal"><i-->
... ...
<title>动环视图</title>
<article class="page-container">
<div class="page-panel">
<div class="main dhInfoMain">
<div class="layui-card template_detail_content" id="dhInfoContent" style="display: none">
<div class="layui-card-body">
<div class="lay-row">
<div class="lay-row-item lay-row-item--auto-width">
<h5 class="lay-row-title"><span style="color: #666">最近采集时间:<span style="color: #666" class="lastCollTime"></span></span></h5>
<h5 class="lay-row-title">信息展示</h5>
<ul class="info-table" id="dh_baseinfo"></ul>
</div>
</div>
<div class="lay-row">
<div class="lay-row-item">
<h5 class="lay-row-title">实时告警动态</h5>
<div id="dh_alarms"></div>
</div>
</div>
</div>
</div>
<div class="layui-card template_detail_content" id="dhviewGraphContainer" style="border: none">
<!--画布主区域-->
<div class="layui-card-body mxgraph-view" style="border: none"></div>
</div>
</div>
<!-- <div class="tree-expend-control" id="dhInfo-leftree_btn" title="展开">-->
<!-- <i class="layui-icon layui-icon-next"></i>-->
<!-- </div>-->
<div class="left dhInfoLeft">
<div class="layui-card">
<div class="layui-card-body">
<div id="dhInfotree"></div>
</div>
</div>
</div>
<!-- <div class="tree-expend-control-shrink" id="dhInfo-leftree-shrink" title="收缩">-->
<!-- <i class="layui-icon layui-icon-prev"></i>-->
<!-- </div>-->
</div>
</article>
<script>
layui.use('dhSxInfo', function (fn) {
fn();
});
</script>
\ No newline at end of file
... ...
... ... @@ -20,7 +20,7 @@
type="text">
</div>
</div>
<div class="layui-inline">
<div class="layui-inline hide">
<div class="layui-input-inline">
<select id="groupName" lay-filter="groupName" name="groupName">
<option value="">=配置名称=</option>
... ... @@ -31,8 +31,8 @@
<div class="layui-input-inline">
<select id="theirType" lay-filter="theirType" name="theirType">
<option value="">全部</option>
<option value="1">日志类型</option>
<option value="2">文档类型</option>
<!-- <option value="1">日志类型</option>-->
<!-- <option value="2">文档类型</option>-->
</select>
</div>
</div>
... ...
... ... @@ -18,8 +18,8 @@
<label class="layui-form-label">所属类型</label>
<div class="layui-input-block">
<select id="config_theirType" lay-filter="config_theirType" lay-verify="required" name="theirType">
<option value="1">日志类型</option>
<option value="2">文档类型</option>
<!-- <option value="1">日志类型</option>-->
<!-- <option value="2">文档类型</option>-->
</select>
</div>
</div>
... ...
... ... @@ -300,8 +300,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
// 点击编号编辑事件
$('.btn-bustype-edit').click(function () {
if ($.inArray('back:bustype:update', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
if (!common.hasPermission('back:bustype:update')){
return;
}
var busTypeCode = $(this).data('code');
... ... @@ -493,9 +492,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
//资源分配
$('.btn-bustype-res-config').click(function () {
if ($.inArray('back:bustype:resource', checkList) == -1) {
if (!common.hasPermission('back:bustype:resource')){
layer.closeAll();
layer.msg('暂无权限!', {icon: 7, time: 3000});
return;
}
var busId = $(this).data('id');
... ... @@ -773,9 +771,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
//授权页面
function authorizationIndex(busId) {
if ($.inArray('back:bustype:impower', checkList) == -1) {
if (!common.hasPermission('back:bustype:impower')){
layer.closeAll();
layer.msg('暂无权限!', {icon: 7, time: 3000});
return;
}
var params = {
... ... @@ -818,8 +815,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
// 新增按钮
$('#bustype-create').click(function () {
if ($.inArray('back:bustype:save', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
if (!common.hasPermission('back:bustype:save')){
return;
}
saveBusType();
... ... @@ -844,8 +840,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
}
function deleteBusTypeByIds(busIds) {
if ($.inArray('back:bustype:delete', checkList) == -1) {
layer.msg('暂无权限!', {icon: 7, time: 3000});
if (!common.hasPermission('back:bustype:delete')){
return;
}
if (busIds.length == 0) {
... ...
... ... @@ -16,7 +16,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
// 对外暴露的接口
exports('bustypeAdd', function (data) {
var sessions = layui.sessions;
var accessToken = sessions.getToken()['access_token'];
// var accessToken = sessions.getToken()['accessToken'];
var accessToken = common.getMjToken();
var userSelect = {}
var opsSelect = {}
initUserSelect();
... ... @@ -166,7 +167,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
busType.principal = opsSelect.getValue("valueStr");
delete busType.select
admin.req({
url: domainName + '/api-web/manage/bustype/save?access_token=' + accessToken,
url: domainName + '/api-web/manage/bustype/save?accessToken=' + accessToken,
type: 'POST',
contentType: 'application/json',
data: JSON.stringify(busType),
... ... @@ -214,7 +215,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
//初始化用户下拉列表框
function initUserSelect() {
$.ajax({
url: domainName + '/api-user/users/getAll?access_token=' + accessToken,
url: domainName + '/mj/user/page?username=&nickname=&enabled=&perPage=10000&page=1&accessToken=' + accessToken,
sync: false,
success: function (res) {
userSelect = xmSelect.render({
... ... @@ -228,7 +229,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
filterable: true,
layVerify: 'required',
layVerType: 'msg',
data: res,
data: res.data.rows,
})
}
})
... ... @@ -237,7 +238,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
//初始化用户下拉列表框
function initUserSelectOps() {
$.ajax({
url: domainName + '/api-user/users/getAll?access_token=' + accessToken,
url: domainName + '/mj/user/page?username=&nickname=&enabled=&perPage=10000&page=1&accessToken=' + accessToken,
sync: false,
success: function (res) {
opsSelect = xmSelect.render({
... ... @@ -246,7 +247,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
name: 'nickname',
value: 'username'
},
data: res,
data: res.data.rows,
})
}
})
... ...
... ... @@ -468,20 +468,33 @@ layui.define(['xmSelect', 'md5'], function (exports) {
renderCollProtocolSelect(targtetId, callback) {
var sessions = layui.sessions;
var accessToken = sessions.getToken()['access_token'];
$.ajax({
url: obj.domainName + '/api-web/manage/protocol/page?page=1&limit=10000&access_token=' + accessToken,
success: function (res) {
admin.req({
url: obj.domainName + '/api-web/manage/protocol/page?page=1&limit=10000',
async: false,
}).done(function (res) {
if (res && res.data) {
res.data.forEach(function (v) {
var options = `<option value="${v.protocolCode}">${v.protocolName}</option>`
$('[id="' + targtetId + '"]').append(options);
})
if (callback) {
callback();
}
}
}
})
}).error(function (error) {
console.error(error);
});
// $.ajax({
// url: obj.domainName + '/api-web/manage/protocol/page?page=1&limit=10000&access_token=' + accessToken,
// success: function (res) {
// if (res && res.data) {
// res.data.forEach(function (v) {
// var options = `<option value="${v.protocolCode}">${v.protocolName}</option>`
// $('[id="' + targtetId + '"]').append(options);
// })
// if (callback) {
// callback();
// }
// }
// }
// })
},
menuXmSelect: function (xmSelectParams, done, username_, roleId_) {
... ...