Authored by xwx

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

…eb into master-500-dev-xwx
Showing 22 changed files with 113 additions and 46 deletions
... ... @@ -228,15 +228,28 @@ layui.define(['sessions', 'form', 'common'],function (exports) {
sessionStorage.setItem('roles',roles);
sessionStorage.setItem('user_id',data.id); //保存用户id joke add 20211206
// Start Wang 2022/2/8 15:37 用户登录后,获取用户信息时,增加获取用户扩展信息
var up = data.userProperty;
if(up){
up.map(function (v) {
sessionStorage.setItem(v.property, v.value);
function initUserProperty() {
debugger
$.ajax({
type : 'post',
sync:false,
url :common.domainName + '/api-web/manage/ddic/findSucDdics/user_property?access_token='+localStorage.getItem("access_token"),
success : function(resUp) {
resUp.data.filter(v => {
debugger
let code = v.ddicCode;
let val = '';
data.userProperty.filter(v1 => {
if(v1.property == code ){
val = v1.value;
}
});
sessionStorage.setItem(code, val);
})
} else {
// 兼容没有用户扩展属性时,清空布局设置
sessionStorage.setItem("userLayout", '');
}
});
}
initUserProperty();
// End Wang 2022/2/8 15:37
}
});
... ...
... ... @@ -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, {
... ...
... ... @@ -99,13 +99,17 @@
</a>
</li>-->
<li class="layui-nav-item" lay-unselect>
<li class="layui-nav-item" lay-unselect id="systems-select">
<script type="text/html" template lay-url="{{sessionStorage.getItem('domainName')}}/api-web/manage/ddic/list?ddicCategory=systems"
lay-done="layui.element.render('nav', 'layadmin-systems');">
<a href="javascript:;" title="第三方系统">
<span class="layui-icon layui-icon-slider"></span>
</a>
<dl class="layui-nav-child">
{{# if(d.data && d.data.length == 0){ }}
{{# var sysObj = document.querySelector('#systems-select'); }}
{{# sysObj != null ? sysObj.remove() :''; }}
{{# } }}
{{# layui.each(d.data, function(index, item){ }}
<dd style="text-align: left;" lay-filter="layadmin-systems">
<a href="javascript:;" layadmin-event="openOtherSystem" data-code="{{item.ddicCode}}" title="{{item.ddicName}}">
... ...
... ... @@ -43,6 +43,9 @@
<div class="layui-form-item">
<span style="color: red;word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;" class="login-tips-span"></span>
</div>
<div style="font-size: 12px;text-align: center;color: #c1c1c1">
技术支持:北京鸿果秋实科技有限公司
</div>
</div>
</div>
... ...
... ... @@ -43,6 +43,10 @@
<div class="layui-form-item">
<span style="color: red;word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;" class="login-tips-span"></span>
</div>
<div style="font-size: 12px;text-align: center;color: #c1c1c1">
技术支持:北京鸿果秋实科技有限公司
</div>
</div>
</div>
... ...
... ... @@ -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,6 +44,9 @@
<div class="layui-form-item">
<span style="color: red;word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;" class="login-tips-span"></span>
</div>
<div style="font-size: 12px;text-align: center;color: #c1c1c1">
技术支持:北京鸿果秋实科技有限公司
</div>
</div>
</div>
... ...
... ... @@ -90,13 +90,17 @@
<i class="layui-icon layui-icon-theme"></i>
</a>
</li>-->
<li class="layui-nav-item" lay-unselect>
<li class="layui-nav-item" lay-unselect id="systems-select">
<script type="text/html" template lay-url="{{sessionStorage.getItem('domainName')}}/api-web/manage/ddic/list?ddicCategory=systems"
lay-done="layui.element.render('nav', 'layadmin-systems');">
<a href="javascript:;" title="第三方系统">
<span class="layui-icon layui-icon-slider"></span>
</a>
<dl class="layui-nav-child">
{{# if(d.data && d.data.length == 0){ }}
{{# var sysObj = document.querySelector('#systems-select'); }}
{{# sysObj != null ? sysObj.remove() :''; }}
{{# } }}
{{# layui.each(d.data, function(index, item){ }}
<dd style="text-align: left;" lay-filter="layadmin-systems">
<a href="javascript:;" layadmin-event="openOtherSystem" data-code="{{item.ddicCode}}" title="{{item.ddicName}}">
... ...
... ... @@ -44,9 +44,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
//回显用户属性
evaluation(res.userProperty);
//用户扩展属性展开
$("#user_property_html_id").removeClass('hide');
$("#userPropertyBelow").addClass('hide');
$("#userPropertyUP").removeClass('hide');
// $("#user_property_html_id").removeClass('hide');
$("#userPropertyUP").addClass('hide');
$("#userPropertyBelow").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"
... ...
... ... @@ -91,13 +91,17 @@
<i class="layui-icon layui-icon-theme"></i>
</a>
</li>-->
<li class="layui-nav-item" lay-unselect>
<li class="layui-nav-item" lay-unselect id="systems-select">
<script type="text/html" template lay-url="{{sessionStorage.getItem('domainName')}}/api-web/manage/ddic/list?ddicCategory=systems"
lay-done="layui.element.render('nav', 'layadmin-systems');">
<a href="javascript:;" title="第三方系统">
<span class="layui-icon layui-icon-slider"></span>
</a>
<dl class="layui-nav-child">
{{# if(d.data && d.data.length == 0){ }}
{{# var sysObj = document.querySelector('#systems-select'); }}
{{# sysObj != null ? sysObj.remove() :''; }}
{{# } }}
{{# layui.each(d.data, function(index, item){ }}
<dd style="text-align: left;" lay-filter="layadmin-systems">
<a href="javascript:;" layadmin-event="openOtherSystem" data-code="{{item.ddicCode}}" title="{{item.ddicName}}">
... ...
... ... @@ -76,11 +76,14 @@
.yfyw-user .zc-view .zc-info {
width: calc(100% - 120px);
text-align: left;
display: flex;
justify-content: space-between;
}
.yfyw-user .zc-view .zc-item {
display: flex;
flex-wrap: wrap
flex-wrap: wrap;
flex: 1;
}
.yfyw-user .zc-view .zc-item .zc-item-label {
... ... @@ -102,7 +105,9 @@
.yfyw-user .zc-view .zc-info .zc-item-tools {
text-align: right;
padding: 3px
padding: 3px;
display: flex;
align-items: end;
}
/*-------------------------------------*/
... ...
... ... @@ -46,14 +46,25 @@ export default {
let init = () => {
//如果是日常资料,不能点击
if("TWO_DAY_MATERIAL"== props.treeNode.map.nodeType.code){
if ("TWO_DAY_MATERIAL" == props.treeNode.map.nodeType.code) {
return true;
}
let code = '';
let personId = '';
//点击运维人员或项目
if ('COLLECT_ALL' == props.treeNode.map.nodeType.view.code || ('COLLECT_USER' == props.treeNode.map.nodeType.view.code && props.treeNode.map.nodeType.code == "ONE_USER")) {
code = props.docType;
}
//点击用户
if ('COLLECT_USER' == props.treeNode.map.nodeType.view.code && 'TWO_SPECIFIC' == props.treeNode.map.nodeType.code) {
code = props.docType;
personId = props.treeNode.id
}
// 查询绑定的文件列表
let params = {
opsId: props.projectId,
personId: props.parentNode.id,
code: props.treeNode.map.nodeType.code
personId: personId,
code: code ? code : props.treeNode.map.nodeType.code
}
proxy.$http.get('/api-web/bOpsFile/search', params, function (res) {
if (res && res.code == 0 && res.data && res.data.length > 0) {
... ... @@ -74,11 +85,11 @@ export default {
* @param docIds 文档id集合
*/
let delDocRel = (docIds) => {
console.log("delDocRel",docIds)
let param={
id:docIds.join(','),
console.log("delDocRel", docIds)
let param = {
id: docIds.join(','),
}
proxy.$http.get('/api-web/bOpsFile/deleteSearch',param, function (res){
proxy.$http.get('/api-web/bOpsFile/deleteSearch', param, function (res) {
})
}
... ... @@ -102,7 +113,6 @@ export default {
}
// 监听编辑状态
Vue.watch(() => props.treeNode, (newValue, oldVlaue) => {
initFlg.value = false;
... ...
... ... @@ -46,31 +46,14 @@ export default {
let init = () => {
//如果是日常资料,不能点击
if ("TWO_DAY_MATERIAL" == props.treeNode.map.nodeType.code) {
if("TWO_DAY_MATERIAL"== props.treeNode.map.nodeType.code){
return true;
}
let code = '';
let personId = '';
//项目统计
if ('COLLECT_ALL' == props.treeNode.map.nodeType.view.code) {
code = props.docType;
// personId = '';
}
//用户统计
if('COLLECT_USER'== props.treeNode.map.nodeType.view.code){
code = props.docType;
// props.treeNode.children.forEach(item => {
// personId += item.id +',';
// });
// if();
}
// 查询绑定的文件列表
let params = {
opsId: props.projectId,
personId: props.parentNode.id,
code: code? code:props.treeNode.map.nodeType.code
// code: "THREE_PERSONAGE_NDA" != props.docType?props.treeNode.map.nodeType.code:"THREE_PERSONAGE_NDA"
//code: props.treeNode.map.nodeType.view.code
code: props.treeNode.map.nodeType.code
}
proxy.$http.get('/api-web/bOpsFile/search', params, function (res) {
if (res && res.code == 0 && res.data && res.data.length > 0) {
... ... @@ -119,6 +102,7 @@ export default {
}
// 监听编辑状态
Vue.watch(() => props.treeNode, (newValue, oldVlaue) => {
initFlg.value = false;
... ...