monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by XuHaoJie
Commit 12d67268b149de021896e00c8df91e4d6082d385 2 parents 552acbde a05cdb6b

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

…eb into master-500-dev-XuHaoJie
Inline Side-by-side
Showing 6 changed files with 38 additions and 5 deletions
... ... @@ -63,6 +63,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
// data.orgId = orgSelect.getValue('valueStr')
data.roleId = roleSelect.getValue('valueStr')
delete data['select']
var reloadFlg = false;
if(data.userProperty){
data.userProperty.forEach(function (v){
if(v.username != '' && v.value != ''){
sessionStorage.setItem(v.property, v.value);
reloadFlg = true;
}
})
}
$.ajax({
url: domainName + '/api-user/users/saveOrUpdate?access_token=' + accessToken,
data: JSON.stringify(data),
... ... @@ -70,7 +79,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
contentType: "application/json; charset=utf-8",
success: function (res) {
if (res.resp_code == 0) {
layer.msg(res.resp_msg, {
var msg = res.resp_msg;
if(reloadFlg){
msg += "，扩展信息更新，即将刷新页面！";
}
layer.msg(msg, {
offset: '15px',
icon: 1,
time: 2000,
... ... @@ -78,6 +91,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
layer.closeAll()
table.reload('user_table', {});
form.render();
if(reloadFlg){
window.location.reload();
}
})
} else {
layer.msg(res.resp_msg, {
... ...
... ... @@ -9,7 +9,7 @@
</div>
<div class="layadmin-user-login-main">
<img src="/src/style/img/login/skin/2/22.png" style="border: none;position: absolute;margin-left: calc(100% - 663px);margin-top: 145px;">
<img src="/src/style/img/login/skin/2/22.png" style="border: none;position: absolute;margin-left: calc(100% - 650px);margin-top: 175px;width: 500px;">
<div class="layadmin-user-login-box layadmin-user-login-body layui-form">
<div class="layui-form-item" style="color: #2887FD;font-weight: bold;text-align: center;font-size: 18px;">
<h2>用户登录</h2>
... ...
... ... @@ -44,7 +44,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
//回显用户属性
evaluation(res.userProperty);
//用户扩展属性展开
$("#user_property_html_id").removeClass('hide');
// $("#user_property_html_id").removeClass('hide');
$("#userPropertyBelow").addClass('hide');
$("#userPropertyUP").removeClass('hide');
form.render();
... ... @@ -69,6 +69,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
return false;
}
delete data['select']
var reloadFlg = false;
if(data.userProperty){
data.userProperty.forEach(function (v){
if(v.username != '' && v.value != ''){
sessionStorage.setItem(v.property, v.value);
reloadFlg = true;
}
})
}
$.ajax({
url: domainName + '/api-user/users/saveOrUpdate?access_token=' + accessToken,
data: JSON.stringify(data),
... ... @@ -76,7 +85,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
contentType: "application/json; charset=utf-8",
success: function (res) {
if (res.resp_code == 0) {
layer.msg(res.resp_msg, {
var msg = res.resp_msg;
if(reloadFlg){
msg += "，扩展信息更新，即将刷新页面！";
}
layer.msg(msg, {
offset: '15px',
icon: 1,
time: 2000,
... ... @@ -84,6 +97,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
layer.closeAll()
table.reload('user_table', {});
form.render();
if(reloadFlg){
window.location.reload();
}
})
} else {
layer.msg(res.resp_msg, {
... ...
... ... @@ -73,7 +73,7 @@
<button type="submit" lay-submit class="layui-btn hide" lay-filter="user_form_save_id" id="user_form_save_id">保存
</button>
</form>
<fieldset class="layui-elem-field layui-field-title hide" style="margin-top: 10px;min-width: 200px">
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;min-width: 200px">
<legend>
扩展信息 &nbsp;
<a href="javascript:void(0);" class="layui-btn layui-btn-normal layui-btn-xs" id="addUserProperty"
... ...