From 4085540580145198252a8e73c42fbad567dae740 Mon Sep 17 00:00:00 2001 From: Vce Date: Tue, 4 Jun 2024 09:33:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 4 +-- src/store/index.js | 16 ++++++------ .../projectFront/specialWork/fireWork.vue | 25 ++++++++++++------- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 00f534d6..2aad7531 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -85,7 +85,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:9111/' //郭圣雄本地 - axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 + // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 @@ -95,7 +95,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用) - // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址 + axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址 // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址 diff --git a/src/store/index.js b/src/store/index.js index db49a372..5452158d 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -50,24 +50,24 @@ export default new Vuex.Store({ // FILEURL:' http://101.43.164.214:11111/image/',// 百色 // UPLOADURL:'http://182.90.224.237:51234/upload/image/', // FILEURL:'http://182.90.224.237:51234/image/', - UPLOADURL: "http://192.168.34.155:19111/upload/image/", // 洁本地 - FILEURL: "http://192.168.34.155:19111/image/", //洁本地 + // UPLOADURL: "http://192.168.34.155:19111/upload/image/", // 洁本地 + // FILEURL: "http://192.168.34.155:19111/image/", //洁本地 // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地 // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地 // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) - WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地) + // WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地) // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 // FILEURL:'http://42.180.188.17:11211/image/',//测试 - // BASEURL: baseUrl ? - // baseUrl : window.location.protocol + "//" + window.location.host + "/", //正式环境 - // UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境 - // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 + BASEURL: baseUrl ? + baseUrl : window.location.protocol + "//" + window.location.host + "/", //正式环境 + UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境 + 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; }