wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
gongjiale 2022-10-12 16:01:47 +08:00
parent e0ca9166e4 5f8659f7f4
commit fe17edeb39
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
front/public/static/config/basicConfig.js
View File

@ -61,6 +61,11 @@ var CONFIGITEM = {
userName: '', userName: '',
userPwd: '', userPwd: '',
}, },
// 获取摄像头的后端接口地址
camreaInfo: {
// cameraUrl: '10.134.135.92:9537', // 测试环境
cameraUrl: '10.134.135.9:9537', // 生产环境
},
backUrl: 'http://10.134.135.9:9797', backUrl: 'http://10.134.135.9:9797',
previewUrl: 'http://10.134.135.9:9796/', previewUrl: 'http://10.134.135.9:9796/',
// websocketURL: '10.134.135.9:8888/renren-admin', // 正式环境 // websocketURL: '10.134.135.9:8888/renren-admin', // 正式环境

7
front/src/api/file.js
View File

@ -97,13 +97,16 @@ export function getHls(params) {
config2 config2
) )
} }
// 西海岸--获取摄像头列表的后台地址 (测试环境地址：10.134.135.92:9537)
let _cameraUrl = _global && _global.config && _global.config.camreaInfo.cameraUrl || '10.134.135.92:9537';
//能力集市基础设施-左侧列表 //能力集市基础设施-左侧列表
export function getCameraInfoByAreaId(params) { 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 config2
) )
} }
//能力集市基础设施-摄像头 //能力集市基础设施-摄像头
export function getCameraByCondition(params) { 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)
} }