monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit a136d902f6cb92b4fb927bd6a281261ad670dfb2 2 parents 91bc3688 22150e38

Merge branch 'master-mj-joke' into 'master-mj' 

chore:资源管理页面优化

chore:资源管理页面优化

See merge request !1118
Inline Side-by-side
Showing 7 changed files with 188 additions and 287 deletions
... ... @@ -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) {
, contentType: "application/json; charset=utf-8"
, success: function (res) {
layer.close(loding);
if (res.success) {
layer.close(loding);
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)
// }
// })
})
}
//资源协议验证
... ...
... ... @@ -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-->
... ...
... ... @@ -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) {
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();
}
}
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);
})
}
})
}).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_) {
... ...