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
commit
6cfde21605
|
|
@ -109,7 +109,7 @@ export function getListForPOI(params) {
|
|||
//西海岸 获取左侧标签树
|
||||
export function getPlaceType() {
|
||||
return axios.get(
|
||||
'http://10.134.135.92:9537/data_service/placeTypes/getPlaceType',
|
||||
`http://${_cameraUrl}/data_service/placeTypes/getPlaceType`,
|
||||
config2
|
||||
)
|
||||
}
|
||||
|
|
@ -117,7 +117,7 @@ export function getPlaceType() {
|
|||
//西海岸 根据标签树查询视频列表
|
||||
export function CameraConditionPlaceType(params) {
|
||||
return axios.post(
|
||||
'http://10.134.135.92:9537/data_service/getCamera/CameraConditionPlaceType' ,
|
||||
`http://${_cameraUrl}/data_service/getCamera/CameraConditionPlaceType'`,
|
||||
params,
|
||||
config2
|
||||
)
|
||||
|
|
@ -126,7 +126,7 @@ export function CameraConditionPlaceType(params) {
|
|||
// 西海岸视频wss流获取
|
||||
export function getCameraLiveStream(params) {
|
||||
return axios.get(
|
||||
'http://10.134.135.92:9537/data_service/getCamera/getCameraLiveStream?cameraIndexCode=' +
|
||||
`http://${_cameraUrl}/data_service/getCamera/getCameraLiveStream?cameraIndexCode=` +
|
||||
params.channelId +
|
||||
'&protocol=' +
|
||||
'wss' + '&transmode=1&streamType=1',
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* @Author: Light
|
||||
* @Date: 2022-11-18 11:53:43
|
||||
* @LastEditors: Light
|
||||
* @LastEditTime: 2022-11-22 14:50:32
|
||||
* @LastEditTime: 2022-11-22 19:28:55
|
||||
* @Description: 告诉大家这是什么
|
||||
-->
|
||||
<template>
|
||||
|
|
@ -39,14 +39,18 @@
|
|||
<a-list size="small" bordered :data-source="dataList.requested">
|
||||
<template #renderItem="{ item }">
|
||||
<a-list-item>
|
||||
<div class="name" @click="selectItem(item)">
|
||||
<div class="name">
|
||||
<a-tooltip>
|
||||
<template #title>{{ item.cameraInfo.channelName }}</template>
|
||||
{{ item.cameraInfo.channelName }}
|
||||
</a-tooltip>
|
||||
</div>
|
||||
<a-tag color="cyan" style="margin-right: 0">
|
||||
{{ item.approveStatus }}
|
||||
<a-tag
|
||||
color="cyan"
|
||||
style="margin-right: 0"
|
||||
@click="selectItem(item)"
|
||||
>
|
||||
{{ item.approveStatus == '通过' ? '预览' : item.approveStatus }}
|
||||
</a-tag>
|
||||
<a-popconfirm
|
||||
v-if="item.approveStatus == '通过'"
|
||||
|
|
@ -69,7 +73,10 @@
|
|||
</a-list-item>
|
||||
</template>
|
||||
<template #header>
|
||||
<div class="title">已申请列表</div>
|
||||
<div class="title">
|
||||
已申请列表
|
||||
<a-button type="link" @click="goToApply">详情</a-button>
|
||||
</div>
|
||||
</template>
|
||||
</a-list>
|
||||
</div>
|
||||
|
|
@ -103,24 +110,23 @@
|
|||
:footer="null"
|
||||
@cancel="clear"
|
||||
>
|
||||
<div style="width: 100%; display: flex; justify-content: center">
|
||||
<div
|
||||
style="width: 100%; height: 100%; position: relative">
|
||||
<div class="waterMark waterMark-left-top">
|
||||
{{ 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 style="width: 100%; display: flex; justify-content: center">
|
||||
<div style="width: 100%; height: 100%; position: relative">
|
||||
<div class="waterMark waterMark-left-top">
|
||||
{{ 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>
|
||||
</a-modal>
|
||||
</template>
|
||||
<script setup>
|
||||
|
|
@ -137,7 +143,7 @@
|
|||
import mybus from '@/myplugins/mybus'
|
||||
import { useRouter } from 'vue-router'
|
||||
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 showVisible = ref(false)
|
||||
// 待办
|
||||
|
|
@ -243,10 +249,18 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
const goToApply = () => {
|
||||
router.push({
|
||||
path: '/personalCenter',
|
||||
query: {
|
||||
type: 'apply',
|
||||
},
|
||||
})
|
||||
}
|
||||
const selectItem = (item) => {
|
||||
if (item.approveStatus == '通过') {
|
||||
dataList.selectItem = item
|
||||
getVideoUrl(item.cameraInfo);
|
||||
getVideoUrl(item.cameraInfo)
|
||||
} else {
|
||||
dataList.selectItem = {}
|
||||
showVisible.value = false
|
||||
|
|
@ -302,16 +316,16 @@
|
|||
initApply()
|
||||
const videoUrl = ref('')
|
||||
//获取视频控件所需播放地址
|
||||
const getVideoUrl = (data) =>{
|
||||
let param = data;
|
||||
getCameraLiveStream(param).then((res) => {
|
||||
const getVideoUrl = (data) => {
|
||||
let param = data
|
||||
getCameraLiveStream(param).then((res) => {
|
||||
//console.log('555555rrrrr',res)
|
||||
if(res.data.data){
|
||||
videoUrl.value = res.data.data.url;
|
||||
}
|
||||
showVisible.value = true
|
||||
})
|
||||
if (res.data.data) {
|
||||
videoUrl.value = res.data.data.url
|
||||
}
|
||||
showVisible.value = true
|
||||
})
|
||||
}
|
||||
mybus.on('selectCamera', (obj) => {
|
||||
// 判断最多10条
|
||||
if (dataList.toBeApplied.length + dataList.requested.length >= 10) {
|
||||
|
|
@ -392,43 +406,43 @@
|
|||
height: 3rem;
|
||||
}
|
||||
|
||||
.waterMark {
|
||||
position: absolute;
|
||||
z-index: 99999999;
|
||||
color: #0058e1;
|
||||
font-size: 22px;
|
||||
font-weight: bold;
|
||||
opacity: 0.4;
|
||||
transform: rotate(-25deg);
|
||||
width: 470px;
|
||||
}
|
||||
.waterMark {
|
||||
position: absolute;
|
||||
z-index: 99999999;
|
||||
color: #0058e1;
|
||||
font-size: 22px;
|
||||
font-weight: bold;
|
||||
opacity: 0.4;
|
||||
transform: rotate(-25deg);
|
||||
width: 470px;
|
||||
}
|
||||
|
||||
// 左上
|
||||
.waterMark-left-top {
|
||||
left: 50px;
|
||||
top: 100px;
|
||||
text-align: left;
|
||||
}
|
||||
// 左上
|
||||
.waterMark-left-top {
|
||||
left: 50px;
|
||||
top: 100px;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
// 右上
|
||||
.waterMark-right-top {
|
||||
right: 50px;
|
||||
top: 100px;
|
||||
text-align: right;
|
||||
}
|
||||
// 右上
|
||||
.waterMark-right-top {
|
||||
right: 50px;
|
||||
top: 100px;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
// 左下
|
||||
.waterMark-left-bottom {
|
||||
left: 50px;
|
||||
bottom: 100px;
|
||||
text-align: left;
|
||||
}
|
||||
// 左下
|
||||
.waterMark-left-bottom {
|
||||
left: 50px;
|
||||
bottom: 100px;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
// 右下
|
||||
.waterMark-right-bottom {
|
||||
right: 50px;
|
||||
bottom: 100px;
|
||||
text-align: right;
|
||||
}
|
||||
// 右下
|
||||
.waterMark-right-bottom {
|
||||
right: 50px;
|
||||
bottom: 100px;
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
Loading…
Reference in New Issue