admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

flx:提交大华icc

Browse Source
This commit is contained in:
Rain_ 2025-07-24 16:53:08 +08:00
parent 7f1129e30a
commit 98aebe4fc7
4 changed files with 322 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/my-player-m3u8/my-player-m3u8.vue
View File

@ -119,7 +119,7 @@
// #ifdef H5
return true;
// #endif
// #ifndef H5
// #ifdef APP-PLUS
return false;
// #endif
}

1
main.js
View File

@ -56,6 +56,7 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.url_config = 'http://192.168.34.221:28890/' //郭圣雄本地
// Vue.prototype.url_config = 'http://192.168.34.221:28888/' //郭圣雄本地
Vue.prototype.url_config = 'http://192.168.34.221:8111/' //郭圣雄本地
Vue.prototype.url_config = 'http://192.168.34.221:19112/' //郭圣雄本地
// Vue.prototype.url_config = 'http://182.90.224.237:51234/' //郭圣雄本地
// Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地
// Vue.prototype.url_config = 'http://183.249.224.118:9000/'// 嘉兴项目

6
pages/projectEnd/workTicketManage/workTicketDetail.vue
View File

@ -16,7 +16,7 @@
<!-- 'https://gcalic.v.myalicdn.com/gc/wgw05_1/index.m3u8' -->
<my-player-m3u8 v-if="videoItemInfo.url" :src="videoItemInfo.url" :showMask="stateShow"
:autoplay="true" />
<video v-else :src="videoItemInfo.url"></video>
<video class="player-m3u8" v-else :src="videoItemInfo.url"></video>
</view>
<u-tabs :bar-height="4" :font-size="28" active-color="#498CEC" inactive-color="#B3B3B3" :bar-width="375"
@ -523,7 +523,9 @@
height: 5rpx !important;
}
/deep/ .m3u8-player {
/deep/ .m3u8-player,
.player-m3u8 {
width: 100%;
height: 420rpx;
}

94
pages/videoManage/playVideo.vue
View File

@ -6,7 +6,15 @@
</view>
</headers>
<!-- <video class="videoBox" id="myVideo" :custom-cache="false" :src="url" controls autoplay></video> -->
<video v-if="!isYsy" class="videoBox" id="myVideo" :custom-cache="false" :src="playUrlFilter" controls autoplay></video>
<!-- APP环境使用web-view -->
<!-- #ifdef APP-PLUS -->
<video v-if="!isYsy" class="videoBox" id="myVideo" :custom-cache="false"
:src="playUrlFilter" controls autoplay></video>
<!-- #endif -->
<!-- H5环境使用ezuikit -->
<!-- #ifdef H5 -->
<my-player-m3u8 v-if="!isYsy && playUrlFilter" :showMask="true" :src="playUrlFilter" :autoplay="true" />
<!-- #endif -->
<view v-if="isYsy && playUrlFilter && accessToken" :style="{width: '100%', height: '225px'}">
<!-- H5环境使用ezuikit -->
<!-- #ifdef H5 -->
@ -14,30 +22,39 @@
<!-- #endif -->
<!-- APP环境使用web-view -->
<!-- #ifdef APP-PLUS -->
<web-view
:src="ysyPlayUrl"
:style="webviewStyles"
:webview-styles="webviewConfig"
></web-view>
<web-view :src="ysyPlayUrl" :style="webviewStyles" :webview-styles="webviewConfig"></web-view>
<!-- #endif -->
</view>
<view class="videoName">
{{videoInfo.videoName}}
<button v-if="videoInfo.videoType==3" type="primary" class="changeBtn btn" @click="changeStreamFn">{{streamType==1?'切换到主码流':'切换到子码流'}}</button>
<button v-if="videoInfo.videoType==3" type="primary" class="changeBtn btn"
@click="changeStreamFn">{{streamType==1?'切换到主码流':'切换到子码流'}}</button>
</view>
<view class="videoOperateBox">
<text class="desc">当前云台速度：{{ this.opSize }}</text>
<view class="box">
<image src="../../static/videoControlIcon/bg.png" class="bg"></image>
<view class="pic top" :style="{backgroundImage: typeName == 'UP' && videoFlag?'url(../../static/videoControlIcon/top-active.png)':'url(../../static/videoControlIcon/top.png)'}" @click="controlVideoFn(0,0.2,0,'UP')"></view>
<view class="pic left" :style="{backgroundImage: typeName == 'LEFT' && videoFlag?'url(../../static/videoControlIcon/left-active.png)':'url(../../static/videoControlIcon/left.png)'}" @click="controlVideoFn(-0.2,0,0,'LEFT')"></view>
<view class="pic bottom" :style="{backgroundImage: typeName == 'DOWN' && videoFlag?'url(../../static/videoControlIcon/bottom-active.png)':'url(../../static/videoControlIcon/bottom.png)'}" @click="controlVideoFn(0,-0.2,0,'DOWN')"></view>
<view class="pic right" :style="{backgroundImage: typeName == 'RIGHT' && videoFlag?'url(../../static/videoControlIcon/right-active.png)':'url(../../static/videoControlIcon/right.png)'}" @click="controlVideoFn(0.2,0,0,'RIGHT')"></view>
<view class="pic top"
:style="{backgroundImage: typeName == 'UP' && videoFlag?'url(../../static/videoControlIcon/top-active.png)':'url(../../static/videoControlIcon/top.png)'}"
@click="controlVideoFn(0,0.2,0,'UP')"></view>
<view class="pic left"
:style="{backgroundImage: typeName == 'LEFT' && videoFlag?'url(../../static/videoControlIcon/left-active.png)':'url(../../static/videoControlIcon/left.png)'}"
@click="controlVideoFn(-0.2,0,0,'LEFT')"></view>
<view class="pic bottom"
:style="{backgroundImage: typeName == 'DOWN' && videoFlag?'url(../../static/videoControlIcon/bottom-active.png)':'url(../../static/videoControlIcon/bottom.png)'}"
@click="controlVideoFn(0,-0.2,0,'DOWN')"></view>
<view class="pic right"
:style="{backgroundImage: typeName == 'RIGHT' && videoFlag?'url(../../static/videoControlIcon/right-active.png)':'url(../../static/videoControlIcon/right.png)'}"
@click="controlVideoFn(0.2,0,0,'RIGHT')"></view>
<!-- <view class="pic center" @click="stop()"></view> -->
</view>
<view class="box2">
<view class="zoom zoomin" :style="{backgroundImage: typeName == 'ZOOM_OUT' && videoFlag?'url(../../static/videoControlIcon/2.png)':'url(../../static/videoControlIcon/1.png)'}" @click="controlVideoFn(0,0,-0.2,'ZOOM_OUT')"></view>
<view class="zoom zoomout" :style="{backgroundImage: typeName == 'ZOOM_IN' && videoFlag?'url(../../static/videoControlIcon/4.png)':'url(../../static/videoControlIcon/3.png)'}" @click="controlVideoFn(0,0,0.2,'ZOOM_IN')"></view>
<view class="zoom zoomin"
:style="{backgroundImage: typeName == 'ZOOM_OUT' && videoFlag?'url(../../static/videoControlIcon/2.png)':'url(../../static/videoControlIcon/1.png)'}"
@click="controlVideoFn(0,0,-0.2,'ZOOM_OUT')"></view>
<view class="zoom zoomout"
:style="{backgroundImage: typeName == 'ZOOM_IN' && videoFlag?'url(../../static/videoControlIcon/4.png)':'url(../../static/videoControlIcon/3.png)'}"
@click="controlVideoFn(0,0,0.2,'ZOOM_IN')"></view>
</view>
<view class="video-playback" v-if="videoConfig.videoType != 1" @click="toBackList">
视频回放
@ -59,12 +76,20 @@
<script>
import headers from '../../components/headers/headers.vue'
import UNumberBox from "../../components/u-number-box/u-number-box.vue"
import MyPlayerM3u8 from '@/components/my-player-m3u8/my-player-m3u8.vue';
export default {
components:{headers, UNumberBox},
components: {
headers,
UNumberBox,
MyPlayerM3u8
},
data() {
return {
url: '', //rtsp://admin:jxj12345@192.168.0.64:554/h264/ch1/main/av_stream
videoInfo:{videoName:'',videoType:null},
videoInfo: {
videoName: '',
videoType: null
},
streamType: 1, //1是子码流 2是主码流
opSize: 20,
videoResponseInfo: {},
@ -90,9 +115,9 @@
this.getUseProjectVideoConfig();
},
onReady() {
this.$nextTick(() => {
this.setHeight()
})
// this.$nextTick(() => {
// this.setHeight()
// })
},
computed: {
playUrlFilter() {
@ -147,7 +172,10 @@
// 跳转到录像回放列表
toBackList() {
uni.navigateTo({
url: './playBackList?obj=' + JSON.stringify({...this.videoResponseInfo,...this.videoInfo})
url: './playBackList?obj=' + JSON.stringify({
...this.videoResponseInfo,
...this.videoInfo
})
})
},
changeStreamFn() {
@ -160,7 +188,9 @@
},
getPlayUrl() {
var that = this
var json ={itemId:this.videoInfo.itemId}
var json = {
itemId: this.videoInfo.itemId
}
if (this.videoInfo.videoType == 3) {
json.streamType = this.streamType
json.type = 'rtsp' //rtsp或者hls
@ -181,7 +211,10 @@
break;
}
// console.log(that.url,res.result.videoInfo.hdFlvAddress,that.videoInfo.videoType,res.result.projectVideoConfig.videoType)
that.videoResponseInfo = {...res.result.projectVideoConfig,...res.result.videoInfo};
that.videoResponseInfo = {
...res.result.projectVideoConfig,
...res.result.videoInfo
};
for (let i in that.videoResponseInfo) {
if (!that.videoResponseInfo[i]) {
delete that.videoResponseInfo[i]
@ -285,11 +318,18 @@
</script>
<style lang="scss" scoped>
/deep/ .m3u8-player,
.player-m3u8{
width: 100%;
height: 420rpx;
}
/* #ifdef H5 */
.fullHeight {
background-color: #F4F5FD;
height: 100vh;
}
/* #endif */
/* #ifdef MP-WEIXIN */
@ -297,6 +337,7 @@
background-color: #F4F5FD;
height: 100vh;
}
/* #endif */
/* #ifdef APP-PLUS */
@ -305,16 +346,19 @@
height: auto;
padding-bottom: 60rpx;
}
/* #endif */
.videoBox {
width: 100%;
}
.videoName {
font-size: 16px;
color: $uni-text-color;
font-weight: bold;
margin: 10px 15px;
position: relative;
.changeBtn {
position: absolute;
right: 0;
@ -322,10 +366,12 @@
font-size: 12px;
}
}
.set-speed {
margin: 48rpx 96rpx;
height: 108rpx;
}
.video-playback {
width: 454rpx;
height: 108rpx;
@ -343,10 +389,12 @@
// bottom: 80rpx;
// left: 145rpx;
}
.videoOperateBox {
position: relative;
text-align: center;
padding-top: 10px;
.bg {
width: 220px;
height: 220px;
@ -460,6 +508,7 @@
font-size: 32rpx;
left: 28rpx;
}
.speed_wrap {
width: 550rpx;
height: 300rpx;
@ -469,6 +518,7 @@
flex-direction: column;
align-items: center;
justify-content: space-between;
.s_title {
color: #000;
font-weight: 600;
@ -476,8 +526,10 @@
font-size: 36rpx;
margin: 24rpx 0;
}
.s_btn {
width: 100%;
&:after {
border-radius: 0;
}