wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

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

This commit is contained in:
chenchenzai 2022-11-22 19:49:47 +08:00
parent dbdd8243cb c08980a531
commit 6cfde21605
2 changed files with 83 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
front/src/api/file.js
View File

@ -109,7 +109,7 @@ export function getListForPOI(params) {
//西海岸 获取左侧标签树 //西海岸 获取左侧标签树
export function getPlaceType() { export function getPlaceType() {
return axios.get( return axios.get(
'http://10.134.135.92:9537/data_service/placeTypes/getPlaceType', `http://${_cameraUrl}/data_service/placeTypes/getPlaceType`,
config2 config2
) )
} }
@ -117,7 +117,7 @@ export function getPlaceType() {
//西海岸 根据标签树查询视频列表 //西海岸 根据标签树查询视频列表
export function CameraConditionPlaceType(params) { export function CameraConditionPlaceType(params) {
return axios.post( return axios.post(
'http://10.134.135.92:9537/data_service/getCamera/CameraConditionPlaceType' , `http://${_cameraUrl}/data_service/getCamera/CameraConditionPlaceType'`,
params, params,
config2 config2
) )
@ -126,7 +126,7 @@ export function CameraConditionPlaceType(params) {
// 西海岸视频wss流获取 // 西海岸视频wss流获取
export function getCameraLiveStream(params) { export function getCameraLiveStream(params) {
return axios.get( return axios.get(
'http://10.134.135.92:9537/data_service/getCamera/getCameraLiveStream?cameraIndexCode=' + `http://${_cameraUrl}/data_service/getCamera/getCameraLiveStream?cameraIndexCode=` +
params.channelId + params.channelId +
'&protocol=' + '&protocol=' +
'wss' + '&transmode=1&streamType=1', 'wss' + '&transmode=1&streamType=1',

146
front/src/views/home/infrastructureApplication.vue
View File

@ -2,7 +2,7 @@
* @Author: Light * @Author: Light
* @Date: 2022-11-18 11:53:43 * @Date: 2022-11-18 11:53:43
* @LastEditors: Light * @LastEditors: Light
* @LastEditTime: 2022-11-22 14:50:32 * @LastEditTime: 2022-11-22 19:28:55
* @Description: 告诉大家这是什么 * @Description: 告诉大家这是什么
--> -->
<template> <template>
@ -39,14 +39,18 @@
<a-list size="small" bordered :data-source="dataList.requested"> <a-list size="small" bordered :data-source="dataList.requested">
<template #renderItem="{ item }"> <template #renderItem="{ item }">
<a-list-item> <a-list-item>
<div class="name" @click="selectItem(item)"> <div class="name">
<a-tooltip> <a-tooltip>
<template #title>{{ item.cameraInfo.channelName }}</template> <template #title>{{ item.cameraInfo.channelName }}</template>
{{ item.cameraInfo.channelName }} {{ item.cameraInfo.channelName }}
</a-tooltip> </a-tooltip>
</div> </div>
<a-tag color="cyan" style="margin-right: 0"> <a-tag
{{ item.approveStatus }} color="cyan"
style="margin-right: 0"
@click="selectItem(item)"
>
{{ item.approveStatus == '通过' ? '预览' : item.approveStatus }}
</a-tag> </a-tag>
<a-popconfirm <a-popconfirm
v-if="item.approveStatus == '通过'" v-if="item.approveStatus == '通过'"
@ -69,7 +73,10 @@
</a-list-item> </a-list-item>
</template> </template>
<template #header> <template #header>
<div class="title">已申请列表</div> <div class="title">
已申请列表
<a-button type="link" @click="goToApply">详情</a-button>
</div>
</template> </template>
</a-list> </a-list>
</div> </div>
@ -103,24 +110,23 @@
:footer="null" :footer="null"
@cancel="clear" @cancel="clear"
> >
<div style="width: 100%; display: flex; justify-content: center"> <div style="width: 100%; display: flex; justify-content: center">
<div <div style="width: 100%; height: 100%; position: relative">
style="width: 100%; height: 100%; position: relative"> <div class="waterMark waterMark-left-top">
<div class="waterMark waterMark-left-top"> {{ userInfo.usernameShow }}
{{ userInfo.usernameShow }}
</div>
<div class="waterMark waterMark-right-top">
{{ userInfo.realNameShow }}
</div>
<div class="waterMark waterMark-left-bottom">
{{ userInfo.usernameShow }}
</div>
<div class="waterMark waterMark-right-bottom">
{{ userInfo.realNameShow }}
</div>
<h5-player :video-url="videoUrl"></h5-player>
</div>
</div> </div>
<div class="waterMark waterMark-right-top">
{{ userInfo.realNameShow }}
</div>
<div class="waterMark waterMark-left-bottom">
{{ userInfo.usernameShow }}
</div>
<div class="waterMark waterMark-right-bottom">
{{ userInfo.realNameShow }}
</div>
<h5-player :video-url="videoUrl"></h5-player>
</div>
</div>
</a-modal> </a-modal>
</template> </template>
<script setup> <script setup>
@ -137,7 +143,7 @@
import mybus from '@/myplugins/mybus' import mybus from '@/myplugins/mybus'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import H5Player from '@/views/home/components/H5Player.vue' import H5Player from '@/views/home/components/H5Player.vue'
import {getCameraLiveStream} from '@/api/file' import { getCameraLiveStream } from '@/api/file'
const dataList = reactive({ toBeApplied: [], requested: [], selectItem: {} }) const dataList = reactive({ toBeApplied: [], requested: [], selectItem: {} })
const showVisible = ref(false) const showVisible = ref(false)
// 待办 // 待办
@ -243,10 +249,18 @@
} }
} }
} }
const goToApply = () => {
router.push({
path: '/personalCenter',
query: {
type: 'apply',
},
})
}
const selectItem = (item) => { const selectItem = (item) => {
if (item.approveStatus == '通过') { if (item.approveStatus == '通过') {
dataList.selectItem = item dataList.selectItem = item
getVideoUrl(item.cameraInfo); getVideoUrl(item.cameraInfo)
} else { } else {
dataList.selectItem = {} dataList.selectItem = {}
showVisible.value = false showVisible.value = false
@ -302,16 +316,16 @@
initApply() initApply()
const videoUrl = ref('') const videoUrl = ref('')
//获取视频控件所需播放地址 //获取视频控件所需播放地址
const getVideoUrl = (data) =>{ const getVideoUrl = (data) => {
let param = data; let param = data
getCameraLiveStream(param).then((res) => { getCameraLiveStream(param).then((res) => {
//console.log('555555rrrrr',res) //console.log('555555rrrrr',res)
if(res.data.data){ if (res.data.data) {
videoUrl.value = res.data.data.url; videoUrl.value = res.data.data.url
}
showVisible.value = true
})
} }
showVisible.value = true
})
}
mybus.on('selectCamera', (obj) => { mybus.on('selectCamera', (obj) => {
// 判断最多10条 // 判断最多10条
if (dataList.toBeApplied.length + dataList.requested.length >= 10) { if (dataList.toBeApplied.length + dataList.requested.length >= 10) {
@ -392,43 +406,43 @@
height: 3rem; height: 3rem;
} }
.waterMark { .waterMark {
position: absolute; position: absolute;
z-index: 99999999; z-index: 99999999;
color: #0058e1; color: #0058e1;
font-size: 22px; font-size: 22px;
font-weight: bold; font-weight: bold;
opacity: 0.4; opacity: 0.4;
transform: rotate(-25deg); transform: rotate(-25deg);
width: 470px; width: 470px;
} }
// 左上 // 左上
.waterMark-left-top { .waterMark-left-top {
left: 50px; left: 50px;
top: 100px; top: 100px;
text-align: left; text-align: left;
} }
// 右上 // 右上
.waterMark-right-top { .waterMark-right-top {
right: 50px; right: 50px;
top: 100px; top: 100px;
text-align: right; text-align: right;
} }
// 左下 // 左下
.waterMark-left-bottom { .waterMark-left-bottom {
left: 50px; left: 50px;
bottom: 100px; bottom: 100px;
text-align: left; text-align: left;
} }
// 右下 // 右下
.waterMark-right-bottom { .waterMark-right-bottom {
right: 50px; right: 50px;
bottom: 100px; bottom: 100px;
text-align: right; text-align: right;
} }
} }
</style> </style>