Authored by 王涛

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

@@ -28,7 +28,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se @@ -28,7 +28,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
28 var oldBusTypeCode = data && data.busTypeCode ? data.busTypeCode : ''; 28 var oldBusTypeCode = data && data.busTypeCode ? data.busTypeCode : '';
29 29
30 var busType; 30 var busType;
31 - 31 +
32 // 父业务下拉框 32 // 父业务下拉框
33 admin.req({ 33 admin.req({
34 url: domainName + '/api-web/manage/bustype/page', 34 url: domainName + '/api-web/manage/bustype/page',
@@ -147,6 +147,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se @@ -147,6 +147,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
147 function initUserSelect() { 147 function initUserSelect() {
148 $.ajax({ 148 $.ajax({
149 url: domainName + '/api-user/users/getAll?access_token=' + accessToken, 149 url: domainName + '/api-user/users/getAll?access_token=' + accessToken,
  150 + async: false, // 接口请求导致,设置默认值出错
150 success: function (res) { 151 success: function (res) {
151 userSelect = xmSelect.render({ 152 userSelect = xmSelect.render({
152 el: '.adminUser', 153 el: '.adminUser',
@@ -165,4 +166,4 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se @@ -165,4 +166,4 @@ layui.define(['table', 'form', 'admin', 'layer', 'laytpl', 'common', 'view', 'se
165 }) 166 })
166 } 167 }
167 }); 168 });
168 -});  
  169 +});
@@ -237,10 +237,8 @@ global.openCmdbAssets = (resTypeId, resId, proxy) => { @@ -237,10 +237,8 @@ global.openCmdbAssets = (resTypeId, resId, proxy) => {
237 if (res && res.success) { 237 if (res && res.success) {
238 let obj = res.object; 238 let obj = res.object;
239 let cmdVal = obj.cmdbValue; 239 let cmdVal = obj.cmdbValue;
240 -  
241 - let url = `${preUrl}/#/CI/configuration-item/detail?objId=${cmdVal}&id=${resId}`  
242 -  
243 - //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}`); 240 + //let url = `${preUrl}/#/CI/configuration-item/detail?objId=${cmdVal}&ciId=${resId}`
  241 + let url = `${preUrl}/#/CI/configuration-item/detail/${resId}/${cmdVal}`
244 global.openBlankWindow(url, "80%", "90%"); 242 global.openBlankWindow(url, "80%", "90%");
245 } else { 243 } else {
246 proxy.$global.showMsg('没有查询到关联数据,请配置!', "error"); 244 proxy.$global.showMsg('没有查询到关联数据,请配置!', "error");