monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 张凯
Commit 1d6eb1f858a50d8647a4b4161ffe2fcb834d2eaa 2 parents 69bef423 d47e8717

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

Inline Side-by-side
Showing 5 changed files with 45 additions and 30 deletions
... ... @@ -108,7 +108,7 @@ layui.define(['form', 'admin', 'layer', 'common', 'sessions', 'xmSelect', 'resli
//绑定角色
$.ajax({
type: 'get',
url: common.domainName + '/mj/sys/role/roles?name=&perPage=10&page=1&&accessToken=' + access_token,
url: common.domainName + '/mj/sys/role/roles?name=&perPage=99999&page=1&&accessToken=' + access_token,
async: false,
success: function (res) {
if (res && res.data) {
... ... @@ -277,7 +277,9 @@ layui.define(['form', 'admin', 'layer', 'common', 'sessions', 'xmSelect', 'resli
}
//回填拓扑类型
if (topoInfo.topoType) {
$("#jgraph-topo_type").val(topoInfo.topoType);
setTimeout(()=>{
$("#jgraph-topo_type").val(topoInfo.topoType);
},2000)
var type = topoInfo.topoType;
var topoInfoTargetId = topoInfo.targetId;
busTypeDom.hide();
... ...
... ... @@ -585,7 +585,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'transfer
table.render({
elem: '#mxgraphRoleListTable'
, height: 'auto'
, url: domainName + '/api-user/roles'
, url: domainName + '/mj/sys/role/roles?name=&perPage=10&page=1'
, page: true
, parseData: function (res) {
// 如果原来有权限，回显
... ...
... ... @@ -19,31 +19,37 @@ layui.define(['transfer', 'layer', 'laytpl', 'common', 'sessions', 'admin'], fun
function init() {
$.ajax({
url: domainName + '/api-user/users/getAll',
url: domainName + '/mj/user/page?username=&nickname=&enabled=&perPage=9999999&page=1',
data: {
access_token: accessToken
accessToken: accessToken
},
success(response) {
response.filter(item => !selectedUsers.includes(item.username))
transfer.render({
id: 'transfer-user',
elem: '#transfer-user',
data: response,
title: ['未授权用户', '已授权用户'],
value: selectedUsers,
showSearch: true,
width: 700,
height: 700,
parseData(e) {
return {
value: e.username,
title: e.nickname,
disabled: false,
checked: e.checked
success(res) {
if(res && res.data && res.data.rows){
let userArr = res.data.rows;
userArr.filter(item => !selectedUsers.includes(item.username))
transfer.render({
id: 'transfer-user',
elem: '#transfer-user',
data: userArr,
title: ['未授权用户', '已授权用户'],
value: selectedUsers,
showSearch: true,
width: 700,
height: 700,
parseData(e) {
return {
value: e.username,
title: e.nickname,
disabled: false,
checked: e.checked
}
}
}
});
});
}
}
})
}
... ...
... ... @@ -13,11 +13,11 @@
<div class="inline-half layui-inline">
<label class="layui-form-label">指令模板</label>
<div class="layui-input-inline">
<button class="layui-btn layui-btn-primary" id="btn-task-bindchecktemp-selecttemp"><i
<button class="layui-btn layui-btn-primary layui-btn-normal" id="btn-task-bindchecktemp-selecttemp"><i
class="layui-icon">&#xe654;</i>选择指令模板
</button>
<div class="hide"></div>
<button class="layui-btn layui-btn-primary hide" id="btn-task-bindchecktemp-unselecttemp"><i
<button class="layui-btn layui-btn-primary hide layui-btn-normal" id="btn-task-bindchecktemp-unselecttemp"><i
class="layui-icon">&#xe640;</i>取消选择
</button>
<label id="txt-task-bindchecktemp-checktemp"></label>
... ... @@ -26,11 +26,11 @@
<div class="inline-half layui-inline">
<label class="layui-form-label">资源</label>
<div class="layui-input-inline">
<button class="layui-btn layui-btn-primary" id="btn-task-bindchecktemp-selectres"><i
<button class="layui-btn layui-btn-primary layui-btn-normal" id="btn-task-bindchecktemp-selectres"><i
class="layui-icon">&#xe654;</i>选择资源
</button>
<div class="hide"></div>
<button class="layui-btn layui-btn-primary hide" id="btn-task-bindchecktemp-unselectres"><i
<button class="layui-btn layui-btn-primary hide layui-btn-normal" id="btn-task-bindchecktemp-unselectres"><i
class="layui-icon">&#xe640;</i>取消选择
</button>
<div id="txt-task-bindchecktemp-res"
... ...
... ... @@ -4,7 +4,7 @@
<div class="main">
<div class="layui-card">
<div class="layui-card-body collector-table">
<div id="transfer-user" style="padding-left: 25px"></div>
<div id="transfer-user" style="padding-left: 25px;display: flex;flex-wrap: nowrap;"></div>
</div>
</div>
</div>
... ... @@ -22,3 +22,10 @@
}
});
</script>
<style type="text/css">
.layui-transfer-active{
display: flex;
align-content: center;
flex-wrap: wrap;
}
</style>
... ...