Compare commits

..

No commits in common. "87c0e061baee6b76dc3280b063f2a2285591766d" and "55aff6f3f84f779bab89793fd7acc39ace7cc0c7" have entirely different histories.

4 changed files with 8 additions and 14 deletions

View File

@ -89,7 +89,7 @@ git clone https://github.com/648540858/wvp-GB28181-pro.git
```shell script
cd wvp-GB28181-pro/web/
npm --registry=https://registry.npmmirror.com install
npm run build:prod
npm npm run build:prod
```
编译如果报错, 一般都是网络问题, 导致的依赖包下载失败

View File

@ -2,7 +2,7 @@ import request from '@/utils/request'
// 前端控制
export function setSpeedForScan([deviceId, channelDeviceId, scanId, speed]) {
export function setSpeedForScan(deviceId, channelDeviceId, scanId, speed) {
return request({
method: 'get',
url: `/api/front-end/scan/set/speed/${deviceId}/${channelDeviceId}`,

View File

@ -99,7 +99,7 @@ export default {
},
gotoPreset: function(preset) {
console.log(preset)
this.$store.dispatch('frontEnd/callPreset', [this.deviceId, this.channelDeviceId, preset.presetId])
this.$store.dispatch('frontEnd/callPreset', [this.deviceId, this.channelDeviceId, this.ptzPresetId])
.then(data => {
this.$message({
showClose: true,
@ -128,7 +128,7 @@ export default {
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
this.$store.dispatch('frontEnd/deletePreset', [this.deviceId, this.channelDeviceId, preset.presetId])
this.$store.dispatch('frontEnd/deletePreset', [this.deviceId, this.channelDeviceId, this.ptzPresetId])
.then(data => {
setTimeout(() => {
this.getPresetList()

View File

@ -1,15 +1,8 @@
<template>
<div id="devicePlayer" v-loading="isLoging">
<el-dialog
v-if="showVideoDialog"
v-el-drag-dialog
title="视频播放"
top="0"
:close-on-click-modal="false"
:visible.sync="showVideoDialog"
@close="close()"
>
<el-dialog v-el-drag-dialog v-if="showVideoDialog" title="视频播放" top="0" :close-on-click-modal="false"
:visible.sync="showVideoDialog" @close="close()">
<div style="width: 100%; height: 100%">
<el-tabs
v-if="Object.keys(this.player).length > 1"
@ -292,7 +285,7 @@
<div title="光圈+" @mousedown="irisCamera('in')" @mouseup="irisCamera('stop')">
<i class="iconfont icon-guangquan control-zoom-btn" style="font-size: 1.5rem;" />
</div>
<div title="光圈-" @mousedown="irisCamera('out')" @mouseup="irisCamera('stop')">
<div title="光圈-" @mousedown="pirisCamera('out')" @mouseup="irisCamera('stop')">
<i class="iconfont icon-guangquan- control-zoom-btn" style="font-size: 1.5rem;" />
</div>
</div>
@ -372,6 +365,7 @@ import ptzSwitch from '../common/ptzSwitch.vue'
import mediaInfo from '../common/mediaInfo.vue'
import H265web from '../common/h265web.vue'
export default {
name: 'DevicePlayer',
directives: { elDragDialog },