From 713da236ff2aeff2abfc4b857f2c8d3412fccc1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Thu, 3 Apr 2025 15:18:15 +0800 Subject: [PATCH] =?UTF-8?q?task=2042621=20=E5=89=8D=E7=AB=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- newBusinessEntities/static/js/project/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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') ; }