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
... ... @@ -187,7 +187,7 @@ layui.define(['form', 'table', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
})
}
function savemenu(id) {
function savemenu(id,type) {
layer.open({
type: 1
, title: '<a class="layui-icon layui-icon-edit win_title_icon"></a>' + id ? "编辑" : "新增"
... ... @@ -196,6 +196,11 @@ layui.define(['form', 'table', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
, content: $('#menuEdit').html()
, btn: ["保存", "取消"]
, success: function (layero, index) {
if(type==1 || type==2 ||type==3 ||type==4 ||type==5 ||type==6){
$('.layui-layer-btn0').show();
}else{
$('.layui-layer-btn0').hide();
}
var selectdata = menuTable.options.data;
parentSelect = xmSelect.render({
el: '#rt_menu_pid',
... ... @@ -375,6 +380,7 @@ layui.define(['form', 'table', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
'<div>' +
' <span' +
' data-id="{{d.id}}" ' +
' data-type="{{d.type}}" ' +
' class="layui-table-link btn-menu-edit">{{d.name}}' +
' </span>' +
'</div>'
... ... @@ -427,12 +433,27 @@ layui.define(['form', 'table', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
}
, {
title: '操作', align: 'center', width: '5%'
, toolbar:
'<div class="layui-row">' +
' <div>' +
' <button data-id="{{d.id}}" data-isLeaf="{{d.isLeaf}}" lay-tips="删除" type="button" class="layui-btn layui-btn-xs layui-btn-normal delete-menu-btn"><i class="layui-icon layui-icon-delete"></i></button>' +
' </div>' +
'</div>'
, templet:function(d){
//lsq 菜单类型,1:监控菜单,2:巡检菜单,3:个人工作台,4:系统菜单,5:跳转菜单,6:报表菜单 可以删除和编辑 2022-08-26
let str='';
if(d.type==1 || d.type==2 ||d.type==3 ||d.type==4 ||d.type==5 ||d.type==6){
str='<div class="layui-row">' +-
' <div>' +
' <button data-id="{{d.id}}" data-isLeaf="{{d.isLeaf}}" lay-tips="删除" type="button" class="layui-btn layui-btn-xs layui-btn-normal delete-menu-btn"><i class="layui-icon layui-icon-delete"></i></button>' +
' </div>' +
'</div>'
}else{
str='<div>' +
' <span' +
' data-id="'+d.id+'" ' +
' data-type="'+d.type+'" ' +
' class="layui-table-link btn-menu-edit">查看' +
' </span>' +
'</div>';
}
return str;
}
}
]
});
... ... @@ -523,7 +544,7 @@ layui.define(['form', 'table', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
layer.msg('暂无权限', {icon: 7, time: 3000})
return false;
}
savemenu($(this).data("id"))
savemenu($(this).data("id"),$(this).data('type'))
})
}
, error(error) {
... ...
<title>CMDB数据同步</title>
<title>资产数据同步</title>
<iframe class="layadmin-iframe" frameborder="0" src="/vue3/index.html#/cmdbdatasync" style="height: 99.5%!important;"/>
... ...
<div class="layadmin-user-login layadmin-user-display-show setting">
<div class="layadmin-user-login-main">
<div class="layadmin-user-login-box layadmin-user-login-body layui-form">
<div class="layui-form-item hide">
<label class="layadmin-user-login-icon layui-icon layui-icon-password"></label>
<input type="text" name="username" lay-verify="required" placeholder="监控账号" class="layui-input">
</div>
<div class="layui-form-item">
<div class="">
<select id="refSystem" name="refSystem" lay-filter="refSystem" lay-verify="required" class="layui-select layui-input"></select>
</div>
</div>
<div class="layui-form-item">
<label class="layadmin-user-login-icon"></label>
<input type="text" name="account" lay-verify="required" placeholder="系统账号" class="layui-input">
</div>
<div class="layui-form-item">
<label class="layadmin-user-login-icon"></label>
<input type="password" name="password" lay-verify="required" placeholder="系统密码" class="layui-input">
</div>
<div class="layui-form-item">
<div class="setting-btn">
<button class="layui-btn" id="setCommit" lay-submit lay-filter="setAccount">保存</button>
<button class="layui-btn layui-btn-primary" id="setClose">取消</button>
</div>
</div>
</div>
</div>
</div>
<script>
layui.use(['admin', 'form','common','sessions'], function () {
var $ = layui.$;
var admin = layui.admin;
var form = layui.form;
var common = layui.common;
var sessions = layui.sessions;
var accessToken = sessions.getToken().access_token;
form.render();
//填充用户监控账号
var username = localStorage.getItem("lgn");
$('input[name="username"]').val(username);
//第三方系统下拉框切换事件监听
form.on('select(refSystem)', function(data){
if (data.value != ''){
getOldAccountAndPwd(username,data.value);
}
});
//第三方系统下拉框数据填充 //lsq 重新更换第三方系统数据字典 2022-08-26
common.ddicSelect('refSystem','account_binding',function (datalist) {
if (datalist.length == 1){
$('#refSystem').val(datalist[0].ddicCode);
getOldAccountAndPwd(username,datalist[0].ddicCode);
}
form.render('select');
});
$('#setClose').on('click',function () {
layer.closeAll();
});
//保存点击事件
form.on('submit(setAccount)', function (obj) {
var userRefSystem = {};
//修改密码
userRefSystem.username = $('input[name="username"]').val();
userRefSystem.refSystem = $('#refSystem').val();
userRefSystem.account = $('input[name="account"]').val();
userRefSystem.password = $('input[name="password"]').val();
saveOrUpdate(userRefSystem);
});
//增加或更细第三方账号关联信息
function saveOrUpdate(data) {
admin.req({
url: common.domainName + '/api-web/userRefSystem/saveOrUpdate?access_token='+accessToken,
type: "POST",
dataType: "json",
contentType: 'application/json; charset=utf-8',
data: JSON.stringify(data),
success: function (res) {
if (res){
var icon = 7;
if (res.success){
icon = 1;
}
layer.msg(res.msg, { offset: '15px' , icon: icon , time: 1000 },function (){
if (res.success){
layer.closeAll();
}
});
}
}
})
}
//根据监控账号及第三方系统,查找关联信息
function getOldAccountAndPwd(username,refSystem) {
admin.req({
url: common.domainName + '/api-web/userRefSystem/getByUsernameAndSystem',
type: "GET",
dataType: "json",
data:{
username: username,
refSystem: refSystem
},
success: function (res) {
if (res && res.success){
if (res.object){ //如果有绑定
$('#resSystem').val(res.object.refSystem);
$('input[name="account"]').val(res.object.account);
$('input[name="password"]').val(common.Base64.decode(res.object.password));
}else{ //如果未绑定
$('input[name="account"]').val(localStorage.getItem("lgn"));
}
}
form.render();
},
error: function () {
layer.msg('获取第三方账号异常', { offset: '15px' , icon: 1 , time: 1000 },function (){
});
}
})
}
});
</script>
\ No newline at end of file
... ...
... ... @@ -1927,7 +1927,8 @@ layui.define(['xmSelect', 'md5'], function (exports) {
url = url.replace('{USERNAME}', res.object.account).replace('{PASSWORD}', obj.Base64.decode(res.object.password))
window.open(url);
} else {
layer.alert('请先绑定科来账号');
// layer.alert('请先绑定科来账号');
admin.events.setAccount();
}
}
})
... ...