diff --git a/src/store/index.js b/src/store/index.js index 61ec57b5..69baba11 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -67,7 +67,7 @@ export default new Vuex.Store({ // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 // // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用) - // // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址 + // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址 // WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl diff --git a/src/views/projectFront/specialWork/fireWork.vue b/src/views/projectFront/specialWork/fireWork.vue index 02639b8c..b71738d0 100644 --- a/src/views/projectFront/specialWork/fireWork.vue +++ b/src/views/projectFront/specialWork/fireWork.vue @@ -674,15 +674,22 @@ export default { if (res.result) { console.log(res.result.records, 1); this.tableData = res.result.records.map((item) => { - const firemanAndCertificateNo = - item.firemanAndCertificateNo.includes("[") && - item.firemanAndCertificateNo.includes("]") - ? JSON.parse(item.firemanAndCertificateNo).join("、") - : item.firemanAndCertificateNo; - return { - ...item, - firemanAndCertificateNo, - }; + if(item.firemanAndCertificateNo){ + const firemanAndCertificateNo = + item.firemanAndCertificateNo.includes("[") && + item.firemanAndCertificateNo.includes("]") + ? JSON.parse(item.firemanAndCertificateNo).join("、") + : item.firemanAndCertificateNo; + return { + ...item, + firemanAndCertificateNo, + }; + }else{ + return { + ...item, + firemanAndCertificateNo: '' + } + } }); this.total = res.result.total; }