From 5c3e64c7faa6a258b6bcee868e03f28af333eada Mon Sep 17 00:00:00 2001 From: Rain <904416525@qq.com> Date: Fri, 27 Sep 2024 20:44:15 +0800 Subject: [PATCH] =?UTF-8?q?2024-9-27=20=E6=B5=8B=E9=80=9F=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E8=A1=A5=E5=85=85?= 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 | 2 +- .../carManage/carCamervelocity.vue | 39 ++++++++++++------- .../projectFront/carManage/vehicleReal.vue | 2 +- 4 files changed, 30 insertions(+), 17 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 33abc5a2..4b00b471 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -176,12 +176,12 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://192.168.34.221:28890/' //郭圣雄本地 // axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 // axios.defaults.baseURL = "http://192.168.34.221:19112/"; //郭圣雄本地 - 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/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 - // axios.defaults.baseURL = 'http://101.43.164.214:11111/' // 百色三标段项目 + axios.defaults.baseURL = 'http://101.43.164.214:11111/' // 百色三标段项目 // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 diff --git a/src/store/index.js b/src/store/index.js index cd6f56f0..eb881bc2 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -64,7 +64,7 @@ export default new Vuex.Store({ // FILEURL: "http://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://101.43.164.214:11111/#/workspace/forms", //jiayu工作流地址(本地) + WORKFLOWURL: "http://101.43.164.214:11129/#/workspace/forms", //jiayu工作流地址(本地) // WORKFLOWURL: "http://192.168.34.216:88/#/workspace/forms", //jiayu工作流地址(本地) // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) // WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地) diff --git a/src/views/equipmentCenter/carManage/carCamervelocity.vue b/src/views/equipmentCenter/carManage/carCamervelocity.vue index 694180a7..b472a150 100644 --- a/src/views/equipmentCenter/carManage/carCamervelocity.vue +++ b/src/views/equipmentCenter/carManage/carCamervelocity.vue @@ -401,11 +401,19 @@ export default { if (valid) { let params = this.addEditForm; // 处理信息 - this.addEditForm.alarmPusher = this.addEditForm.alarmPusher.join(","); - this.addEditForm.camera = this.addEditForm.camera.join(","); - this.addEditForm.enterpriseIds = this.addEditForm.enterpriseIds.join( - "," - ); + if (this.addEditForm.alarmPusher) { + this.addEditForm.alarmPusher = this.addEditForm.alarmPusher.join( + "," + ); + } + if (this.addEditForm.camera) { + this.addEditForm.camera = this.addEditForm.camera.join(","); + } + if (this.addEditForm.enterpriseIds) { + this.addEditForm.enterpriseIds = this.addEditForm.enterpriseIds.join( + "," + ); + } params.projectSn = this.$store.state.projectSn; if (this.Popup.type === "add") { carMeasureSpeedAddApi(params).then(result => { @@ -449,14 +457,19 @@ export default { if (result.success) { console.log("设备测试-单条", result.result); this.addEditForm = result.result; - - this.addEditForm.alarmPusher = this.addEditForm.alarmPusher.split( - "," - ); - this.addEditForm.camera = this.addEditForm.camera.split(","); - this.addEditForm.enterpriseIds = this.addEditForm.enterpriseIds.split( - "," - ); + if (this.addEditForm.alarmPusher) { + this.addEditForm.alarmPusher = this.addEditForm.alarmPusher.split( + "," + ); + } + if (this.addEditForm.camera) { + this.addEditForm.camera = this.addEditForm.camera.split(","); + } + if (this.addEditForm.enterpriseIds) { + this.addEditForm.enterpriseIds = this.addEditForm.enterpriseIds.split( + "," + ); + } } }); }, diff --git a/src/views/projectFront/carManage/vehicleReal.vue b/src/views/projectFront/carManage/vehicleReal.vue index 64041e91..29c7c0b3 100644 --- a/src/views/projectFront/carManage/vehicleReal.vue +++ b/src/views/projectFront/carManage/vehicleReal.vue @@ -62,7 +62,7 @@