diff --git a/newBusinessEntities/static/js/project/index.js b/newBusinessEntities/static/js/project/index.js index 4a5e846..306bbd1 100644 --- a/newBusinessEntities/static/js/project/index.js +++ b/newBusinessEntities/static/js/project/index.js @@ -108,7 +108,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit); - content[i].supplyMasterMap = serverApi + content[i].supplyMasterMap ; + content[i].supplyMasterMap = serverApi + serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ; } @@ -127,7 +127,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit); - content[i].supplyMasterMap = serverApi + content[i].supplyMasterMap ; + content[i].supplyMasterMap = serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ; } @@ -146,7 +146,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa content[i].unit = module.selectDictLabel(module.data.unitOptions,content[i].unit); - content[i].supplyMasterMap = serverApi + content[i].supplyMasterMap ; + content[i].supplyMasterMap = serverApi + ((content[i].supplyMasterMap || content[i].supplyMasterMap != '')?content[i].supplyMasterMap: 'null') ; } @@ -171,7 +171,7 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa content[i].industryClassificationType = secondArray; } console.log(content[i].industryClassificationType) - content[i].masterMap = serverApi + content[i].masterMap ; + content[i].masterMap = serverApi + ((content[i].masterMap || content[i].masterMap != '')?content[i].masterMap: 'null') ; }