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

front/src/api/file.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-20 17:16:35
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-08-25 14:13:30
+ * @LastEditTime: 2022-10-26 17:57:52
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -99,14 +99,37 @@ export function getHls(params) {
 }
 
 // 西海岸--获取摄像头列表的后台地址 (测试环境地址：10.134.135.92:9537)
-let _cameraUrl = _global && _global.config && _global.config.camreaInfo && _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}`,
+  return axios.get(
+    `http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`,
     config2
   )
 }
 //能力集市基础设施-摄像头
 export function getCameraByCondition(params) {
-  return axios.post(`http://${_cameraUrl}/data_service/getCamera/getCameraByCondition`, params, config2)
+  return axios.post(
+    `http://${_cameraUrl}/data_service/getCamera/getCameraByCondition`,
+    params,
+    config2
+  )
+}
+
+export function initiateMeet(data) {
+  // return request({
+  //   url: '/enke/initiateMeet',
+  //   method: 'post',
+  //   data: data,
+  // })
+  return axios.post(
+    'http://10.134.135.92:8888/renren-admin/enke/initiateMeet',
+    data,
+    config2
+  )
 }

front/src/views/home/infrastructurePage.vue

@@ -776,7 +776,8 @@
     defineExpose,
     computed,
   } from 'vue'
-  import { getUser, initiateMeet, getEnkeUsers } from '@/api/home'
+  import { getUser, getEnkeUsers } from '@/api/home'
+  import { initiateMeet } from '@/api/file'
   import {
     getCameraByParentId,
     getStreamByChannelCode,

front/src/views/home/videoSurveillance/index.vue

@@ -66,7 +66,7 @@
         ></path>
       </svg>
       <img class="icon-poylon" @click="areaMode()" src="~@/supermap/image/icon-poylon.png">
-      
+
     </div>
     <video-play
       v-if="openVideo"
@@ -197,7 +197,7 @@
         L.drawLocal.draw.handlers.polygon.tooltip.cont = '单击继续绘制形状'
         L.drawLocal.draw.handlers.polygon.tooltip.end =
           '单击继续绘制形状,双击结束绘制'
-          
+
         this.hiMap.mapObj.map.off('draw:created')
         this.hiMap.mapObj.drawPolygon.enable()
         this.hiMap.mapObj.map.once('draw:created', (e) => {