monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 袁晋鹏
Commit 9ad2dd3a8372c471b01cb286d87990596643e4e5 1 parent 1776381d

fix:工作日志厂商展示问题处理

Inline Side-by-side
Showing 2 changed files with 4 additions and 22 deletions
... ... @@ -96,6 +96,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
var url = domainName + '/cmdb-CI/supplier/find/'+d.manufacturerId+'?accessToken='+accessToken
$.ajax({
url: url,
async: false,
success: function(res){
if(res.data.cmdbSupplier){
manufacturerName = res.data.cmdbSupplier.shortName;
... ... @@ -257,6 +258,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
$.ajax({
url: url,
async: false,
success: function (res) {
$.each(res.data, function (i, v) {
var obj = {};
... ...
... ... @@ -263,28 +263,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
}, {
field: 'createUserNickName', title: '汇报人', align: 'center',
}, {
field: 'manufacturerName', title: '厂商', align: 'center',templet: function (d) {
var manufacturerName = '';
if(manufactureArr && manufactureArr.length>0){
$.each(manufactureArr, function (i, v) {
if(d.manufacturerId==v.id) {
manufacturerName = v.name;
}
})
}else{
var url = domainName + '/cmdb-CI/supplier/find/'+d.manufacturerId+'?accessToken='+accessToken
$.ajax({
url: url,
success: function(res){
if(res.data.cmdbSupplier){
manufacturerName = res.data.cmdbSupplier.shortName;
}
}
});
}
return '<div><span>'+manufacturerName+'</span></div>';
}
field: 'manufacturerName', title: '厂商', align: 'center'
}, {
field: 'createTime', title: '上报时间', align: 'center',
}]],
... ... @@ -330,6 +309,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
$.ajax({
url: url,
async: false,
success: function (res) {
var options = "<option value=''>=选择厂商=</option>";
$.each(res.data, function (i, v) {
... ...