From f87ac46ddc9ede09dce3c547ed0afc760ea33adf Mon Sep 17 00:00:00 2001 From: vce Date: Fri, 22 Mar 2024 17:56:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9C=BA=E6=A2=B0?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=AE=9A=E4=BD=8D=E5=92=8C=E6=99=BA=E8=83=BD?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=B8=BD=E4=BA=BA=E5=91=98=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/config.js | 4 ++-- src/assets/js/http.js | 4 ++-- .../devicePosition/deviceCentral/equipmentCentral.vue | 3 ++- .../projectFront/smartSafeHat/deviceCentral/deviceCentral.vue | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/public/js/config.js b/public/js/config.js index fde19c6d..b5d0e08e 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -11,7 +11,7 @@ var COMPANY = '' //通用 // COMPANY = 'hengtong'//瑞士恒通 // COMPANY = 'yunlian'//云联万物 // COMPANY = 'neimenggu'//内蒙古项目 -COMPANY = 'zjsj'//中建四局 +// COMPANY = 'zjsj'//中建四局 // COMPANY = 'zjwj'//中建五局 // COMPANY = 'sccr'//四川成润 // COMPANY = 'pssh'//坪山沙湖项目 @@ -26,7 +26,7 @@ var PROJECT = { online_gxlt: 'gxlt', // 广西联通 } -var PROJECT_TYPE = PROJECT.online_zjsj +var PROJECT_TYPE = PROJECT.local_test var headerShow = true // 是否显示头部 var tabsShow = true // 是否显示tabs if (COMPANY == 'xingxuan') { diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 15309b9e..fd882353 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -88,8 +88,8 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // 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://125.88.207.86:8088/'//中建四局线上（最新）地址 + 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/'//中建四局(沙湖)线上（最新）地址 diff --git a/src/views/projectFront/devicePosition/deviceCentral/equipmentCentral.vue b/src/views/projectFront/devicePosition/deviceCentral/equipmentCentral.vue index a5ee6738..137eb33c 100644 --- a/src/views/projectFront/devicePosition/deviceCentral/equipmentCentral.vue +++ b/src/views/projectFront/devicePosition/deviceCentral/equipmentCentral.vue @@ -206,7 +206,8 @@ export default { // pageSize: this.pagInfo.pageSize, pageSize: 100000, projectSn: this.$store.state.projectSn, - personType: 1 + // personType: 1, + inserviceType: 1 }).then(result => { if (result.success) { this.workerList = result.result.records diff --git a/src/views/projectFront/smartSafeHat/deviceCentral/deviceCentral.vue b/src/views/projectFront/smartSafeHat/deviceCentral/deviceCentral.vue index ef81214e..1b5d9444 100644 --- a/src/views/projectFront/smartSafeHat/deviceCentral/deviceCentral.vue +++ b/src/views/projectFront/smartSafeHat/deviceCentral/deviceCentral.vue @@ -201,7 +201,8 @@ export default { // pageSize: this.pagInfo.pageSize, pageSize: 100000, projectSn: this.$store.state.projectSn, - personType: 1 + // personType: 1 + inserviceType: 1 }).then(result => { if (result.success) { this.workerList = result.result.records