Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev

西海岸: 获取摄像头列表的api更改为配置文件形式
2022-10-12 16:11:31 +08:00 · 2022-10-12 16:11:12 +08:00
1 changed files with 1 additions and 1 deletions
--- a/front/src/api/file.js
+++ b/front/src/api/file.js
@ -99,7 +99,7 @@ export function getHls(params) {
 }
 // 西海岸--获取摄像头列表的后台地址 (测试环境地址：10.134.135.92:9537)
-let _cameraUrl = _global && _global.config && _global.config.camreaInfo.cameraUrl || '10.134.135.92:9537';
+let _cameraUrl = _global && _global.config && _global.config.camreaInfo && _global.config.camreaInfo.cameraUrl || '10.134.135.92:9537';
 //能力集市基础设施-左侧列表
 export function getCameraInfoByAreaId(params) {
  return axios.get(`http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`,
Author	SHA1	Message	Date
guoyue	f2a6e2ffc9	Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev	2022-10-12 16:11:31 +08:00
guoyue	adcb0cdbf0	西海岸: 获取摄像头列表的api更改为配置文件形式	2022-10-12 16:11:12 +08:00