monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit a03edd04a659fe93651c939ffca6e50b9616f187 2 parents fe309b8c 9ad2dd3a

Merge branch 'master-mj-yjp' into 'master-mj' 

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



See merge request !1188
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 @@ -96,6 +96,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
96 var url = domainName + '/cmdb-CI/supplier/find/'+d.manufacturerId+'?accessToken='+accessToken 96 var url = domainName + '/cmdb-CI/supplier/find/'+d.manufacturerId+'?accessToken='+accessToken
97 $.ajax({ 97 $.ajax({
98 url: url, 98 url: url,
  99 + async: false,
99 success: function(res){ 100 success: function(res){
100 if(res.data.cmdbSupplier){ 101 if(res.data.cmdbSupplier){
101 manufacturerName = res.data.cmdbSupplier.shortName; 102 manufacturerName = res.data.cmdbSupplier.shortName;
@@ -257,6 +258,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function @@ -257,6 +258,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
257 var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`; 258 var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
258 $.ajax({ 259 $.ajax({
259 url: url, 260 url: url,
  261 + async: false,
260 success: function (res) { 262 success: function (res) {
261 $.each(res.data, function (i, v) { 263 $.each(res.data, function (i, v) {
262 var obj = {}; 264 var obj = {};
@@ -263,28 +263,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -263,28 +263,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
263 }, { 263 }, {
264 field: 'createUserNickName', title: '汇报人', align: 'center', 264 field: 'createUserNickName', title: '汇报人', align: 'center',
265 }, { 265 }, {
266 - field: 'manufacturerName', title: '厂商', align: 'center',templet: function (d) {  
267 - var manufacturerName = '';  
268 - if(manufactureArr && manufactureArr.length>0){  
269 - $.each(manufactureArr, function (i, v) {  
270 - if(d.manufacturerId==v.id) {  
271 - manufacturerName = v.name;  
272 - }  
273 - })  
274 - }else{  
275 - var url = domainName + '/cmdb-CI/supplier/find/'+d.manufacturerId+'?accessToken='+accessToken  
276 - $.ajax({  
277 - url: url,  
278 - success: function(res){  
279 - if(res.data.cmdbSupplier){  
280 - manufacturerName = res.data.cmdbSupplier.shortName;  
281 - }  
282 - }  
283 - });  
284 - }  
285 -  
286 - return '<div><span>'+manufacturerName+'</span></div>';  
287 - } 266 + field: 'manufacturerName', title: '厂商', align: 'center'
288 }, { 267 }, {
289 field: 'createTime', title: '上报时间', align: 'center', 268 field: 'createTime', title: '上报时间', align: 'center',
290 }]], 269 }]],
@@ -330,6 +309,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat @@ -330,6 +309,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
330 var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`; 309 var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
331 $.ajax({ 310 $.ajax({
332 url: url, 311 url: url,
  312 + async: false,
333 success: function (res) { 313 success: function (res) {
334 var options = "<option value=''>=选择厂商=</option>"; 314 var options = "<option value=''>=选择厂商=</option>";
335 $.each(res.data, function (i, v) { 315 $.each(res.data, function (i, v) {