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 @@ @@ -52,18 +52,31 @@ {{ item.name }} - + " + > 子单号:{{ item.instanceId }} - + 修改 - + 撤回申请 @@ -72,29 +85,36 @@ - - + + @@ -102,25 +122,25 @@ {{ val.name }} {{ - val.type == '应用资源' - ? '应用资源' - : val.infoList.filter( - (val2) => val2.attrType == '组件类型' - )[0].attrValue == '智能算法' - ? '智能算法' - : val.infoList.filter( - (val2) => val2.attrType == '组件类型' - )[0].attrValue == '图层服务' - ? '图层服务' - : val.infoList.filter( - (val2) => val2.attrType == '组件类型' - )[0].attrValue == '开发组件' - ? '开发组件' - : val.infoList.filter( - (val2) => val2.attrType == '组件类型' - )[0].attrValue == '业务组件' - ? '业务组件' - : '--' + val.type == '应用资源' + ? '应用资源' + : val.infoList.filter( + (val2) => val2.attrType == '组件类型' + )[0].attrValue == '智能算法' + ? '智能算法' + : val.infoList.filter( + (val2) => val2.attrType == '组件类型' + )[0].attrValue == '图层服务' + ? '图层服务' + : val.infoList.filter( + (val2) => val2.attrType == '组件类型' + )[0].attrValue == '开发组件' + ? '开发组件' + : val.infoList.filter( + (val2) => val2.attrType == '组件类型' + )[0].attrValue == '业务组件' + ? '业务组件' + : '--' }} @@ -132,17 +152,25 @@ 资源描述:{{ val.description }} 申请结果:{{ - item.ended ? item.approveStatus || '审核完成' : '审核中' + item.ended ? item.approveStatus || '审核完成' : '审核中' }} - + 附件下载 - + 查看详情 @@ -160,31 +188,49 @@ 基础设施 - + 视频预览 - 该流程已终止 - + 位置:{{ val.nodeName }} 申请结果: - 列表地址:{{ - backUrl + - 'resource/getApplyCameraList/' + - item.instanceId }} + 列表地址: + + {{ + backUrl + 'resource/getApplyCameraList/' + item.instanceId + }} + 视频流地址: - {{ - backUrl + - 'resource/hls/getHls/?key=' + - val.channelId}} + + {{ backUrl + 'resource/hls/getHls/?key=' + val.channelId }} + @@ -194,435 +240,488 @@ - + - + - {{userInfo.usernameShow}} - {{userInfo.realNameShow}} - {{userInfo.usernameShow}} - {{userInfo.realNameShow}} + + {{ userInfo.usernameShow }} + + + {{ userInfo.realNameShow }} + + + {{ userInfo.usernameShow }} + + + {{ userInfo.realNameShow }} + -