diff --git a/public/js/config.js b/public/js/config.js index ab981bdc..2bd01352 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -1,4 +1,4 @@ -// var COMPANY = ''; //通用 +var COMPANY = ''; //通用 // var COMPANY='zhongjian'; //中建,和沃尔对接的插件版用这个企业 // var COMPANY='hezhan'; //合展-宿迁 // var COMPANY='nanchang'; //南昌地铁、衢州 @@ -8,7 +8,7 @@ // COMPANY = 'henan' // 河南春笋 // COMPANY = 'xingxuan' // COMPANY = 'hengtong'//瑞士恒通 -COMPANY = 'yunlian'//云联万物 +// COMPANY = 'yunlian'//云联万物 diff --git a/src/assets/js/api/zhongjianFourth.js b/src/assets/js/api/zhongjianFourth.js index 00896989..1145895b 100644 --- a/src/assets/js/api/zhongjianFourth.js +++ b/src/assets/js/api/zhongjianFourth.js @@ -85,6 +85,7 @@ export const getDeclareAgeApi = data => get('/xmgl/workerInfo/getDeclareAge',dat //分页查询临边防护-设备实时数据 export const getFpdcdSelectPageApi = data => get('/xmgl/fpdcd/selectPage',data) export const getPersonnelSituationApi = data => get('/xmgl/workerInfo/getPersonnelSituation',data) +export const getHighFormworkApi = data => post('/xmgl/highFormworkMeasureCurrentData/big/screen/list',data) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index b2085fab..1a1d6b26 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -75,8 +75,10 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://182.90.224.147:18170' //瑞士恒通线上 // axios.defaults.baseURL = 'http://58.250.210.9:9090' //深汕线上 // axios.defaults.baseURL = 'http://192.168.34.221:8088' //郭圣雄本地 - // axios.defaults.baseURL = 'http://192.168.34.221:8188' //郭圣雄本地 - axios.defaults.baseURL = 'http://192.168.34.221:8210' //郭圣雄本地 + axios.defaults.baseURL = 'http://192.168.34.221:8188' //郭圣雄本地 + // axios.defaults.baseURL = 'http://192.168.34.221:8210' //郭圣雄本地 + // axios.defaults.baseURL = 'http://192.168.34.221:8199' //郭圣雄本地 + // axios.defaults.baseURL = 'http://192.169.34.133:8070' //彭洁本地 } else if (process.env.NODE_ENV == 'debug') { axios.defaults.baseURL = 'https://www.ceshi.com' diff --git a/src/views/projectAdmin/fourEngin/security/centerBottom.vue b/src/views/projectAdmin/fourEngin/security/centerBottom.vue index 53291726..a5df1bfa 100644 --- a/src/views/projectAdmin/fourEngin/security/centerBottom.vue +++ b/src/views/projectAdmin/fourEngin/security/centerBottom.vue @@ -128,28 +128,94 @@