Authored by 王涛
... ... @@ -350,16 +350,20 @@ layui.define(['xmSelect', 'md5'], function (exports) {
}
});
},
menuXmSelect: function (xmSelectParams, done) {
menuXmSelect: function (xmSelectParams, done, username_, roleId_) {
var username = username_ ? username_ : '';
var roleId = roleId_ ? roleId_ : '';
admin.req({
url: `${obj.domainName}/api-user/menus/findMenus`,
url: `${obj.domainName}/api-user/menus/findMenus?username=` + username + '&roleIds=' + roleId,
success: function (res) {
// 菜单下拉框
var menuList = res.data;
menuList.forEach(item => {
item.disabled = item.isLeaf !== 'Y';
});
// menuList.forEach(item => {
// item.disabled = item.isLeaf !== 'Y';
// });
var menuTree = obj.pidToChildren(menuList, "id", "parentId");
//XuHaoJie 2021/10/21 添加是否是父节点
addProperty(menuTree);
var menuSelect = xmSelect.render(Object.assign({
el: '#',
tips: '=菜单=',
... ... @@ -392,6 +396,19 @@ layui.define(['xmSelect', 'md5'], function (exports) {
}
}
});
//添加是否是父节点的删除
function addProperty(list) {
list.forEach(item => {
if (item.children && item.children.length > 0) {
item['isParent'] = 1;
addProperty(item.children);
} else {
item['isParent'] = 0;
}
return item;
})
}
},
relationTypeXmSelect: function (xmSelectParams, done) {
admin.req({
... ...
... ... @@ -3084,13 +3084,13 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
common.openWin(url, name, params,null,null,null,['80%', '80%']);
});
//点击空白,关闭悬浮提示页
$(document).on('click',function (event) {
var _con = $('.layui-layer-tips'); // 设置目标区域
if(!_con.is(event.target) && _con.has(event.target).length === 0){
layer.close(detailTips);
}
})
// //点击空白,关闭悬浮提示页
// $(document).on('click',function (event) {
// var _con = $('.layui-layer-tips'); // 设置目标区域
// if(!_con.is(event.target) && _con.has(event.target).length === 0){
// layer.close(detailTips);
// }
// })
},
yes:function (index) {
layer.close(index);
... ... @@ -3177,15 +3177,22 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'echarts', 'sessions', 'xmSele
}
var $content = $(`#${targetId}`).clone();
$content.find('[lay-tips]').removeAttr('lay-tips');
detailTips = layer.tips($content.removeClass('hide').prop("outerHTML"), that,{id: 'base-info-tips', area:[w, 'auto'],time:0, tips: [direction], tipsMore: true});
// detailTips = layer.tips($content.removeClass('hide').prop("outerHTML"), that,{id: 'base-info-tips', area:[w, 'auto'],time:0, tips: [direction], tipsMore: true});
//xwx update 资源视图基本信息弹出框bug修改 2021-10-22 --start
detailTips = layer.tips($content.removeClass('hide').prop("outerHTML"), that,{
id: 'base-info-tips',
area:[w, 'auto'],
time:0,
tips: [direction],
tipsMore: true,
//添加遮罩层 默认透明度为0.3
shade: [0.1, '#00000000'],
//是否点击遮罩关闭
shadeClose: true
});
//xwx update 资源视图基本信息弹出框bug修改 2021-10-22 --end
window.detailTips = detailTips;
});
//xwx 2021/10/18 资源视图详情页基本信息悬浮提示无法关闭 --start
$(".detail_base_info").mouseleave(function () {
layer.close(detailTips);
})
//xwx 2021/10/18 资源视图详情页基本信息悬浮提示无法关闭 --end
// ,function () {
// layer.close(detailTips);
// }
... ...
... ... @@ -271,7 +271,9 @@ layui.define(['table', 'form', 'laydate', 'laytpl','common','sessions','xmSelect
function loadSelect(pollName,dom){
var url = domainName+'/inspection-report/dataSource/loadSelect?access_token='+accessToken;
$.get(url,function (res) {
$.ajax({url,
async: false,
success(res) {
$(dom).empty();
if(res.success){
let html ='';
... ... @@ -284,7 +286,7 @@ layui.define(['table', 'form', 'laydate', 'laytpl','common','sessions','xmSelect
}
form.render();
}
})
}})
}
function loadJLSelect($dom,pid,type){
$.ajax({
... ...
... ... @@ -110,7 +110,7 @@ layui.define(['table', 'form', 'laydate','treeTable', 'admin', 'layer', 'laytpl'
' <button role-data-menu="' + d.id + '" lay-tips="菜单授权" type="button" class="layui-btn layui-btn-xs layui-btn-normal delete-org-btn"><i class="layui-icon layui-icon-menu-fill"></i></button>' +
// ' <button role-data-query-menus="'+d.id+'" role-data-name="'+d.name+'" lay-tips="角色菜单查看" type="button" class="layui-btn layui-btn-xs layui-btn-normal delete-org-btn"><i class="layui-icon layui-icon-search"></i></button>'+
' <button role-data-oneKey="' + d.id + '" lay-tips="' + tips + '" type="button" class="layui-btn layui-btn-xs layui-btn-normal delete-org-btn"><i class="layui-icon layui-icon-auz"></i></button>' +
' <button data-code="' + d.code + '" lay-tips="配置默认首页" type="button" class="layui-btn layui-btn-xs layui-btn-normal config-default-index"><i class="layui-icon layui-icon-website"></i></button>' +
' <button data-code="' + d.code + '" data-id="'+d.id+'" lay-tips="配置默认首页" type="button" class="layui-btn layui-btn-xs layui-btn-normal config-default-index"><i class="layui-icon layui-icon-website"></i></button>' +
'</div>';
}}
]],
... ... @@ -176,6 +176,7 @@ layui.define(['table', 'form', 'laydate','treeTable', 'admin', 'layer', 'laytpl'
// 配置默认首页
$('.config-default-index').unbind('click').on('click', function () {
var roleCode = $(this).data('code');
var roleId =$(this).data('id');
layer.load(2);
admin.req({
url: domainName + '/api-web/defaultIndex/getDefaultIndex',
... ... @@ -231,8 +232,25 @@ layui.define(['table', 'form', 'laydate','treeTable', 'admin', 'layer', 'laytpl'
common.menuXmSelect({
el: '#slt-menu-tree',
radio: true,
prop: {
name: 'name',
value: 'id',
isParent: 'isParent',
},
clickClose: true,
on(data) {
//XuHaoJie 2021/10/21 添加是否是父节点
//arr: 当前多选已选中的数据
var arr = data.arr;
if (arr && arr.length > 0) {
if (arr[0].isParent == 1) {
layer.msg('父节点不能选', {icon: 7});
setTimeout(function () {
xmSelect.get('#slt-menu-tree', true).setValue([]);
},1000);
return false;
}
}
if (data.arr.length) {
switch (data.arr[0].moduleid) {
case 'index-topo': {
... ... @@ -285,7 +303,7 @@ layui.define(['table', 'form', 'laydate','treeTable', 'admin', 'layer', 'laytpl'
}
}, function (select) {
select.setValue([defaultIndex], null, true);
});
},null,roleId);
function reSetForm() {
... ...
... ... @@ -341,8 +341,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
common.menuXmSelect({
el: '#slt-menu-tree',
radio: true,
prop: {
name: 'name',
value: 'id',
isParent: 'isParent',
},
clickClose: true,
on(data) {
//XuHaoJie 2021/10/21 添加是否是父节点
//arr: 当前多选已选中的数据
var arr = data.arr;
if (arr && arr.length > 0) {
if (arr[0].isParent == 1) {
layer.msg('父节点不能选', {icon: 7});
setTimeout(function () {
xmSelect.get('#slt-menu-tree', true).setValue([]);
},1000);
return false;
}
}
if (data.arr.length) {
switch (data.arr[0].moduleid) {
case 'index-topo': {
... ... @@ -395,7 +412,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'upload', 'common', 'sessions',
}
}, function (select) {
select.setValue([defaultIndex], null, true);
});
},username);
function reSetForm() {
... ...
... ... @@ -855,7 +855,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
}).done(function (response) {
layer.close(loading);
if (response.success) {
layer.msg('添加绑定成功!此次添加了' + insertCount + '个新资源' + (isExistCount > 0 ? ',有' + isExistCount + '个已经存在。' : ''), {icon: 1, time: 5000});
layer.msg('添加绑定成功!此次添加了' + insertCount + '个新资源(父资源)' + (isExistCount > 0 ? ',有' + isExistCount + '个已经存在。' : ''), {icon: 1, time: 5000});
layer.close(addResLayerIndex);
reloadTable(resType,busId);
} else {
... ...
... ... @@ -135,6 +135,9 @@ export default {
if (res && res.data) {
dataList.value = res.data;
total.value = res.count;
} else {
dataList.value = []
total.value = 0;
}
});
}
... ...
... ... @@ -94,7 +94,6 @@ export default {
// 处理点击事件并且弹出数据名称
myChart.on('click', function (params) {
console.log(params);
detail(params);
});
}
... ... @@ -116,7 +115,6 @@ export default {
}
proxy.$http.post("/api-web/bOpsScoreDetails/page", params, function (res) {
if(res && res.code == 0){
// console.log(res)
closeDetail(true);
dataList.value = res.data;
}
... ...
... ... @@ -52,6 +52,8 @@ export default {
}, function (res) {
if (res && res.object) {
ruleForm.value = res.object
}else {
ruleForm.value = res.object
}
});
}
... ...
... ... @@ -84,8 +84,11 @@ export default {
proxy.$http.get(`/api-web/bOpsFile/fileCollect?projectId=${projectId}`, {}, function (res) {
if (res && res.data) {
dataList.value = res.data
dataList.value = res.data
total.value = res.count;
} else {
dataList.value = []
total.value = 0;
}
});
}
... ...