From f198ad5f5a336b87b7b4a3302c458c17cb30d3fe Mon Sep 17 00:00:00 2001 From: guoyue Date: Wed, 12 Oct 2022 16:00:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8:=20=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=91=84=E5=83=8F=E5=A4=B4=E5=88=97=E8=A1=A8=E7=9A=84?= =?UTF-8?q?api=E6=9B=B4=E6=94=B9=E4=B8=BA=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=BD=A2=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/public/static/config/basicConfig.js | 5 +++++ front/src/api/file.js | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/front/public/static/config/basicConfig.js b/front/public/static/config/basicConfig.js index ea1f9e0d..b07d4451 100644 --- a/front/public/static/config/basicConfig.js +++ b/front/public/static/config/basicConfig.js @@ -61,6 +61,11 @@ var CONFIGITEM = { userName: '', userPwd: '', }, + // 获取摄像头的后端接口地址 + camreaInfo: { + // cameraUrl: '10.134.135.92:9537', // 测试环境 + cameraUrl: '10.134.135.9:9537', // 生产环境 + }, backUrl: 'http://10.134.135.9:9797', previewUrl: 'http://10.134.135.9:9796/', // websocketURL: '10.134.135.9:8888/renren-admin', // 正式环境 diff --git a/front/src/api/file.js b/front/src/api/file.js index ccb2466b..9e4133e2 100644 --- a/front/src/api/file.js +++ b/front/src/api/file.js @@ -97,13 +97,16 @@ export function getHls(params) { config2 ) } + +// 西海岸--获取摄像头列表的后台地址 (测试环境地址：10.134.135.92:9537) +let _cameraUrl = _global && _global.config && _global.config.camreaInfo.cameraUrl || '10.134.135.92:9537'; //能力集市基础设施-左侧列表 export function getCameraInfoByAreaId(params) { - return axios.get(`http://10.134.135.92:9537/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`, + return axios.get(`http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`, config2 ) } //能力集市基础设施-摄像头 export function getCameraByCondition(params) { - return axios.post('http://10.134.135.92:9537/data_service/getCamera/getCameraByCondition', params, config2) + return axios.post(`http://${_cameraUrl}/data_service/getCamera/getCameraByCondition`, params, config2) }