monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit 2baafa8b5aec296968d45f3d01bb2df4d77d69ce 2 parents fd94c8e2 fc086cea

Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w… 

…eb into master-500-dev-lushangqing
Inline Side-by-side
Showing 2 changed files with 5 additions and 5 deletions
... ... @@ -784,7 +784,7 @@ layui.define(['table', 'form', 'laydate','treeTable', 'admin', 'layer', 'laytpl'
function loadmenuTable(roleId,type) {
loading = layer.load(2)
// conditions.type = $('#condition-menu-name').val();
var url = domainName + '/api-user/menus/findMenus?type=noIndex&roleId='+roleId; //如果不传type,表示为菜单授权
var url = domainName + '/api-user/menus/findMenus?type=noIndex&roleId='+roleId+'&hidden=1'; //如果不传type,表示为菜单授权
if (type){ //如果传入type,表示为删除菜单，需要查询角色有权限的菜单,查询角色有权限菜单
url = domainName + '/api-user/menus/'+roleId+'/getByRoleId';
}
... ... @@ -871,4 +871,4 @@ layui.define(['table', 'form', 'laydate','treeTable', 'admin', 'layer', 'laytpl'
}
});
});
\ No newline at end of file
});
... ...
... ... @@ -390,7 +390,7 @@
<span>{{layui.util.toDateString(item.confirmTime)}}</span>
<ul>
<li>备注：{{item.remark}}</li>
<li>告警确认人：{{item.confirmUserId}}</li>
<li>告警确认人：{{item.confirmUserNickName}}</li>
<li>紧急程度：{{item.levelName}}</li>
</ul>
</div>
... ... @@ -405,7 +405,7 @@
<span>备注：{{item.remark}}</span>
<ul>
<li>告警关闭时间：{{layui.util.toDateString(item.closeTime)}}</li>
<li>告警关闭人：{{item.closeUserId}}</li>
<li>告警关闭人：{{item.closeUserNickName}}</li>
<li>关闭范围：{{closeTypeStr}}</li>
<li>关闭时长：{{item.closeDuration}}小时</li>
</ul>
... ... @@ -421,7 +421,7 @@
<span>备注：{{item.remark}}</span>
<ul>
<li>告警恢复时间：{{layui.util.toDateString(item.resumeTime)}}</li>
<li>告警恢复人：{{item.resumeUserId}}</li>
<li>告警恢复人：{{item.resumeUserNickName}}</li>
<li>恢复类型：{{resumeTypeStr}}</li>
</ul>
</div>
... ...