Authored by 王涛

获取用户信息设置为同步;跳转cmdb页面地址变更;

... ... @@ -28,7 +28,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
var oldBusTypeCode = data && data.busTypeCode ? data.busTypeCode : '';
var busType;
// 父业务下拉框
admin.req({
url: domainName + '/api-web/manage/bustype/page',
... ... @@ -147,6 +147,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
function initUserSelect() {
$.ajax({
url: domainName + '/api-user/users/getAll?access_token=' + accessToken,
async: false, // 接口请求导致,设置默认值出错
success: function (res) {
userSelect = xmSelect.render({
el: '.adminUser',
... ... @@ -165,4 +166,4 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
})
}
});
});
\ No newline at end of file
});
... ...
... ... @@ -237,10 +237,8 @@ global.openCmdbAssets = (resTypeId, resId, proxy) => {
if (res && res.success) {
let obj = res.object;
let cmdVal = obj.cmdbValue;
let url = `${preUrl}/#/CI/configuration-item/detail?objId=${cmdVal}&id=${resId}`
//window.open(url, "_blank", `left=100,fullscreen,toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, copyhistory=no, width=${width}, height=${height}`);
//let url = `${preUrl}/#/CI/configuration-item/detail?objId=${cmdVal}&ciId=${resId}`
let url = `${preUrl}/#/CI/configuration-item/detail/${resId}/${cmdVal}`
global.openBlankWindow(url, "80%", "90%");
} else {
proxy.$global.showMsg('没有查询到关联数据,请配置!', "error");
... ...