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