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

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', // 正式环境

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)
 }