From 09d56091fa770000a3cf0ce4d0329b20355c6cff Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Thu, 27 Oct 2022 15:48:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/api/file.js | 31 +- front/src/views/home/infrastructurePage.vue | 3 +- .../views/home/videoSurveillance/index.vue | 4 +- .../components/AbilityApplication.vue | 1159 +++++++++-------- 4 files changed, 640 insertions(+), 557 deletions(-) diff --git a/front/src/api/file.js b/front/src/api/file.js index 19b43c8d..b4f0d1ce 100644 --- a/front/src/api/file.js +++ b/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 + ) } diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index eea54b44..b43fc8c8 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/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, diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue index 99cd9b4e..7f7c128a 100644 --- a/front/src/views/home/videoSurveillance/index.vue +++ b/front/src/views/home/videoSurveillance/index.vue @@ -66,7 +66,7 @@ > - + { diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue index 06b43157..954fa943 100644 --- a/front/src/views/personalCenter/components/AbilityApplication.vue +++ b/front/src/views/personalCenter/components/AbilityApplication.vue @@ -1,8 +1,8 @@