[1078] 适配新UI
This commit is contained in:
@@ -64,3 +64,27 @@ export function queryChannels(params) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function play(params) {
|
||||||
|
const { phoneNumber, channelId, type } = params
|
||||||
|
return request({
|
||||||
|
method: 'get',
|
||||||
|
url: '/api/jt1078/live/start',
|
||||||
|
params: {
|
||||||
|
phoneNumber: phoneNumber,
|
||||||
|
channelId: channelId,
|
||||||
|
type: type
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
export function stopPlay(params) {
|
||||||
|
const { phoneNumber, channelId } = params
|
||||||
|
return request({
|
||||||
|
method: 'get',
|
||||||
|
url: '/api/jt1078/live/stop',
|
||||||
|
params: {
|
||||||
|
phoneNumber: phoneNumber,
|
||||||
|
channelId: channelId
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ export const constantRoutes = [
|
|||||||
meta: { title: '部标设备', icon: 'jtDevice' }
|
meta: { title: '部标设备', icon: 'jtDevice' }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/jtDevice/record/:deviceId/:channelDeviceId',
|
path: '/jtDevice/record/:phoneNumber/:channelId',
|
||||||
name: 'JTDeviceRecord',
|
name: 'JTDeviceRecord',
|
||||||
component: () => import('@/views/jtDevice/channel/record'),
|
component: () => import('@/views/jtDevice/channel/record'),
|
||||||
meta: { title: '部标录像' }
|
meta: { title: '部标录像' }
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { deleteDeviceById, queryChannels, queryDeviceById, queryDevices } from '@/api/jtDevice'
|
import { deleteDeviceById, play, queryChannels, queryDeviceById, queryDevices, stopPlay } from '@/api/jtDevice'
|
||||||
import { add } from '@/api/user'
|
import { add } from '@/api/user'
|
||||||
import { update } from '@/api/group'
|
import { update } from '@/api/group'
|
||||||
|
|
||||||
@@ -62,6 +62,26 @@ const actions = {
|
|||||||
reject(error)
|
reject(error)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
},
|
||||||
|
play({ commit }, params) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
play(params).then(response => {
|
||||||
|
const { data } = response
|
||||||
|
resolve(data)
|
||||||
|
}).catch(error => {
|
||||||
|
reject(error)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
},
|
||||||
|
stopPlay({ commit }, params) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
stopPlay(params).then(response => {
|
||||||
|
const { data } = response
|
||||||
|
resolve(data)
|
||||||
|
}).catch(error => {
|
||||||
|
reject(error)
|
||||||
|
})
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -124,6 +124,7 @@
|
|||||||
<script>
|
<script>
|
||||||
import devicePlayer from '../jtDevicePlayer.vue'
|
import devicePlayer from '../jtDevicePlayer.vue'
|
||||||
import channelEdit from './edit.vue'
|
import channelEdit from './edit.vue'
|
||||||
|
import { play } from '@/api/jtDevice'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'ChannelList',
|
name: 'ChannelList',
|
||||||
@@ -131,11 +132,15 @@ export default {
|
|||||||
channelEdit,
|
channelEdit,
|
||||||
devicePlayer
|
devicePlayer
|
||||||
},
|
},
|
||||||
|
props: {
|
||||||
|
deviceId: {
|
||||||
|
type: String,
|
||||||
|
default: null
|
||||||
|
}
|
||||||
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
deviceService: new JTDeviceService(),
|
|
||||||
device: null,
|
device: null,
|
||||||
deviceId: this.$route.params.deviceId,
|
|
||||||
deviceChannelList: [],
|
deviceChannelList: [],
|
||||||
updateLooper: 0, // 数据刷新轮训标志
|
updateLooper: 0, // 数据刷新轮训标志
|
||||||
searchSrt: '',
|
searchSrt: '',
|
||||||
@@ -168,13 +173,12 @@ export default {
|
|||||||
this.deviceId = this.$route.params.deviceId
|
this.deviceId = this.$route.params.deviceId
|
||||||
this.currentPage = 1
|
this.currentPage = 1
|
||||||
this.count = 15
|
this.count = 15
|
||||||
this.deviceService.getDevice(this.deviceId, (result) => {
|
this.$store.dispatch('jtDevice/queryDeviceById', this.deviceId)
|
||||||
if (result.code === 0) {
|
.then(data => {
|
||||||
this.device = result.data
|
this.device = data
|
||||||
}
|
})
|
||||||
}, (error) => {
|
.catch(err => {
|
||||||
console.log('获取设备信息失败')
|
console.error(err)
|
||||||
console.error(error)
|
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
currentChange: function(val) {
|
currentChange: function(val) {
|
||||||
@@ -187,16 +191,19 @@ export default {
|
|||||||
},
|
},
|
||||||
getDeviceChannelList: function() {
|
getDeviceChannelList: function() {
|
||||||
if (typeof (this.deviceId) === 'undefined') return
|
if (typeof (this.deviceId) === 'undefined') return
|
||||||
this.deviceService.getAllChannel(this.currentPage, this.count, this.searchSrt, this.deviceId, (data) => {
|
this.$store.dispatch('jtDevice/queryChannels', {
|
||||||
console.log(data)
|
page: this.currentPage,
|
||||||
if (data.code === 0) {
|
count: this.count,
|
||||||
this.total = data.data.total
|
query: this.searchSrt,
|
||||||
this.deviceChannelList = data.data.list
|
deviceId: this.deviceId
|
||||||
|
})
|
||||||
|
.then(data => {
|
||||||
|
this.total = data.total
|
||||||
|
this.deviceChannelList = data.list
|
||||||
// 防止出现表格错位
|
// 防止出现表格错位
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.$refs.channelListTable.doLayout()
|
this.$refs.channelListTable.doLayout()
|
||||||
})
|
})
|
||||||
}
|
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -205,37 +212,32 @@ export default {
|
|||||||
this.isLoging = true
|
this.isLoging = true
|
||||||
const channelId = itemData.channelId
|
const channelId = itemData.channelId
|
||||||
console.log('通知设备推流1:' + this.device.phoneNumber + ' : ' + channelId)
|
console.log('通知设备推流1:' + this.device.phoneNumber + ' : ' + channelId)
|
||||||
this.$axios({
|
|
||||||
method: 'get',
|
this.$store.dispatch('jtDevice/play', {
|
||||||
url: '/api/jt1078/live/start',
|
|
||||||
params: {
|
|
||||||
phoneNumber: this.device.phoneNumber,
|
phoneNumber: this.device.phoneNumber,
|
||||||
channelId: channelId,
|
channelId: channelId,
|
||||||
type: 0
|
type: 0
|
||||||
}
|
})
|
||||||
}).then((res) => {
|
.then(data => {
|
||||||
this.isLoging = false
|
|
||||||
if (res.data.code === 0) {
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
const snapId = this.device.phoneNumber + '_' + channelId
|
const snapId = this.device.phoneNumber + '_' + channelId
|
||||||
this.loadSnap[this.device.phoneNumber + channelId] = 0
|
this.loadSnap[this.device.phoneNumber + channelId] = 0
|
||||||
this.getSnapErrorEvent(snapId)
|
this.getSnapErrorEvent(snapId)
|
||||||
}, 5000)
|
}, 5000)
|
||||||
itemData.streamId = res.data.data.stream
|
itemData.streamId = data.stream
|
||||||
this.$refs.devicePlayer.openDialog('media', this.device.phoneNumber, channelId, {
|
this.$refs.devicePlayer.openDialog('media', this.device.phoneNumber, channelId, {
|
||||||
streamInfo: res.data.data,
|
streamInfo: data,
|
||||||
hasAudio: itemData.hasAudio
|
hasAudio: itemData.hasAudio
|
||||||
})
|
})
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.initData()
|
this.initData()
|
||||||
}, 1000)
|
}, 1000)
|
||||||
} else {
|
})
|
||||||
this.$message.error(res.data.msg)
|
.catch(err => {
|
||||||
}
|
console.error(err)
|
||||||
}).catch((e) => {
|
})
|
||||||
console.error(e)
|
.finally(() => {
|
||||||
this.isLoging = false
|
this.isLoging = false
|
||||||
// that.$message.error("请求超时");
|
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
moreClick: function(command, itemData) {
|
moreClick: function(command, itemData) {
|
||||||
@@ -248,36 +250,28 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
queryRecords: function(itemData) {
|
queryRecords: function(itemData) {
|
||||||
this.$router.push(`/jtRecordDetail/${this.device.phoneNumber}/${itemData.channelId}`)
|
this.$router.push(`/jtDevice/record/${this.device.phoneNumber}/${itemData.channelId}`)
|
||||||
},
|
},
|
||||||
queryCloudRecords: function(itemData) {
|
queryCloudRecords: function(itemData) {
|
||||||
const deviceId = this.deviceId
|
const deviceId = this.device.phoneNumber
|
||||||
const channelId = itemData.channelId
|
const channelId = itemData.channelId
|
||||||
|
this.$router.push(`/cloudRecord/detail/rtp/${deviceId}_${channelId}`)
|
||||||
this.$router.push(`/cloudRecordDetail/rtp/${deviceId}_${channelId}`)
|
|
||||||
},
|
},
|
||||||
stopDevicePush: function(itemData) {
|
stopDevicePush: function(itemData) {
|
||||||
this.$axios({
|
this.$store.dispatch('jtDevice/stopPlay', {
|
||||||
method: 'get',
|
|
||||||
url: '/api/jt1078/live/stop',
|
|
||||||
params: {
|
|
||||||
phoneNumber: this.device.phoneNumber,
|
phoneNumber: this.device.phoneNumber,
|
||||||
channelId: itemData.channelId
|
channelId: itemData.channelId
|
||||||
}
|
})
|
||||||
}).then((res) => {
|
.then((data) => {
|
||||||
console.log(res)
|
|
||||||
if (res.data.code === 0) {
|
|
||||||
this.initData()
|
this.initData()
|
||||||
} else {
|
})
|
||||||
this.$message.error(res.data.msg)
|
.catch(function(error) {
|
||||||
}
|
|
||||||
}).catch(function(error) {
|
|
||||||
console.error(error)
|
console.error(error)
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
getSnap: function(row) {
|
getSnap: function(row) {
|
||||||
const baseUrl = window.baseUrl ? window.baseUrl : ''
|
const baseUrl = window.baseUrl ? window.baseUrl : ''
|
||||||
return ((process.env.NODE_ENV === 'development') ? process.env.BASE_API : baseUrl) + '/api/device/query/snap/' + this.device.phoneNumber + '/' + row.channelId
|
return ((process.env.NODE_ENV === 'development') ? process.env.VUE_APP_BASE_API : baseUrl) + '/api/device/query/snap/' + this.device.phoneNumber + '/' + row.channelId
|
||||||
},
|
},
|
||||||
getBigSnap: function(row) {
|
getBigSnap: function(row) {
|
||||||
return [this.getSnap(row)]
|
return [this.getSnap(row)]
|
||||||
@@ -290,17 +284,15 @@ export default {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
const url = (process.env.NODE_ENV === 'development' ? 'debug' : '') + '/api/device/query/snap/' + deviceId + '/' + channelId
|
const baseUrl = window.baseUrl ? window.baseUrl : ''
|
||||||
|
const url = (process.env.NODE_ENV === 'development' ? process.env.VUE_APP_BASE_API : baseUrl) + '/api/device/query/snap/' + deviceId + '/' + channelId
|
||||||
this.loadSnap[deviceId + channelId]++
|
this.loadSnap[deviceId + channelId]++
|
||||||
document.getElementById(deviceId + channelId).setAttribute('src', url + '?' + new Date().getTime())
|
document.getElementById(deviceId + channelId).setAttribute('src', url + '?' + new Date().getTime())
|
||||||
}, 1000)
|
}, 1000)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
showDevice: function() {
|
showDevice: function() {
|
||||||
this.$router.push(this.beforeUrl).then(() => {
|
this.$emit('show-device')
|
||||||
this.initParam()
|
|
||||||
this.initData()
|
|
||||||
})
|
|
||||||
},
|
},
|
||||||
search: function() {
|
search: function() {
|
||||||
this.currentPage = 1
|
this.currentPage = 1
|
||||||
@@ -308,6 +300,10 @@ export default {
|
|||||||
this.initData()
|
this.initData()
|
||||||
},
|
},
|
||||||
updateChannel: function(row) {
|
updateChannel: function(row) {
|
||||||
|
this.$store.dispatch('jtDevice/updateChannel', row)
|
||||||
|
.then(data => {
|
||||||
|
|
||||||
|
})
|
||||||
this.$axios({
|
this.$axios({
|
||||||
method: 'post',
|
method: 'post',
|
||||||
url: `/api/jt1078/terminal/channel/update`,
|
url: `/api/jt1078/terminal/channel/update`,
|
||||||
|
|||||||
@@ -1,68 +1,72 @@
|
|||||||
<template>
|
<template>
|
||||||
<div style="width: 100%">
|
<div style="width: 100%">
|
||||||
<div class="page-header" >
|
<div class="page-header">
|
||||||
<div class="page-title">
|
<div class="page-title">
|
||||||
<el-page-header @back="goBack" content="部标录像"></el-page-header>
|
<el-page-header content="部标录像" @back="goBack" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<el-container>
|
<el-container>
|
||||||
<el-aside width="300px">
|
<el-aside width="300px">
|
||||||
<div class="record-list-box-box">
|
<div class="record-list-box-box">
|
||||||
<el-date-picker size="mini" v-model="chooseDate" type="date" value-format="yyyy-MM-dd" placeholder="日期" @change="dateChange()"></el-date-picker>
|
<el-date-picker v-model="chooseDate" size="mini" type="date" value-format="yyyy-MM-dd" placeholder="日期" @change="dateChange()" />
|
||||||
<div class="record-list-box" v-loading="recordsLoading" :style="recordListStyle">
|
<div v-loading="recordsLoading" class="record-list-box" :style="recordListStyle">
|
||||||
<ul v-if="detailFiles.length >0" class="infinite-list record-list" >
|
<ul v-if="detailFiles.length >0" class="infinite-list record-list">
|
||||||
<li v-for="item in detailFiles" class="infinite-list-item record-list-item" >
|
<li v-for="item in detailFiles" class="infinite-list-item record-list-item">
|
||||||
|
|
||||||
<el-tag v-if="chooseFile !== item" @click="checkedFile(item)">
|
<el-tag v-if="chooseFile !== item" @click="checkedFile(item)">
|
||||||
<i class="el-icon-video-camera" ></i>
|
<i class="el-icon-video-camera" />
|
||||||
{{ moment(item.startTime).format('HH:mm:ss')}}-{{ moment(item.endTime).format('HH:mm:ss')}}
|
{{ moment(item.startTime).format('HH:mm:ss') }}-{{ moment(item.endTime).format('HH:mm:ss') }}
|
||||||
</el-tag>
|
</el-tag>
|
||||||
<el-tag v-if="chooseFile === item" type="danger" >
|
<el-tag v-if="chooseFile === item" type="danger">
|
||||||
<i class="el-icon-video-camera" ></i>
|
<i class="el-icon-video-camera" />
|
||||||
{{ moment(item.startTime).format('HH:mm:ss')}}-{{ moment(item.endTime).format('HH:mm:ss')}}
|
{{ moment(item.startTime).format('HH:mm:ss') }}-{{ moment(item.endTime).format('HH:mm:ss') }}
|
||||||
</el-tag>
|
</el-tag>
|
||||||
<i style="color: #409EFF;margin-left: 5px;" class="el-icon-download" @click="downloadRecord(item)" ></i>
|
<i style="color: #409EFF;margin-left: 5px;" class="el-icon-download" @click="downloadRecord(item)" />
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div size="mini" v-if="detailFiles.length ==0" class="record-list-no-val" >暂无数据</div>
|
<div v-if="detailFiles.length ==0" size="mini" class="record-list-no-val">暂无数据</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</el-aside>
|
</el-aside>
|
||||||
<el-main style="padding-bottom: 10px;">
|
<el-main style="padding-bottom: 10px;">
|
||||||
<div class="playBox" :style="playerStyle">
|
<div class="playBox" :style="playerStyle">
|
||||||
<player ref="recordVideoPlayer"
|
<player
|
||||||
:videoUrl="videoUrl"
|
ref="recordVideoPlayer"
|
||||||
|
:video-url="videoUrl"
|
||||||
:error="videoError"
|
:error="videoError"
|
||||||
:message="videoError"
|
:message="videoError"
|
||||||
:hasAudio="hasAudio"
|
:has-audio="hasAudio"
|
||||||
style="max-height: 100%"
|
style="max-height: 100%"
|
||||||
fluent autoplay live ></player>
|
fluent
|
||||||
|
autoplay
|
||||||
|
live
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="player-option-box">
|
<div class="player-option-box">
|
||||||
<div>
|
<div>
|
||||||
<el-button-group >
|
<el-button-group>
|
||||||
<el-time-picker
|
<el-time-picker
|
||||||
|
v-model="timeRange"
|
||||||
size="mini"
|
size="mini"
|
||||||
is-range
|
is-range
|
||||||
align="left"
|
align="left"
|
||||||
v-model="timeRange"
|
|
||||||
value-format="yyyy-MM-dd HH:mm:ss"
|
value-format="yyyy-MM-dd HH:mm:ss"
|
||||||
range-separator="至"
|
range-separator="至"
|
||||||
start-placeholder="开始时间"
|
start-placeholder="开始时间"
|
||||||
end-placeholder="结束时间"
|
end-placeholder="结束时间"
|
||||||
|
placeholder="选择时间范围"
|
||||||
@change="timePickerChange"
|
@change="timePickerChange"
|
||||||
placeholder="选择时间范围">
|
/>
|
||||||
</el-time-picker>
|
|
||||||
</el-button-group>
|
</el-button-group>
|
||||||
|
|
||||||
<el-button-group >
|
<el-button-group>
|
||||||
<el-button size="mini" class="iconfont icon-zanting" title="开始" @click="control(0, 0)"></el-button>
|
<el-button size="mini" class="iconfont icon-zanting" title="开始" @click="control(0, 0)" />
|
||||||
<el-button size="mini" class="iconfont icon-kaishi" title="暂停" @click="control(1, 0)"></el-button>
|
<el-button size="mini" class="iconfont icon-kaishi" title="暂停" @click="control(1, 0)" />
|
||||||
<el-button size="mini" class="iconfont icon-stop" title="结束" @click="control(2, 0)"></el-button>
|
<el-button size="mini" class="iconfont icon-stop" title="结束" @click="control(2, 0)" />
|
||||||
<el-dropdown size="mini" title="播放倍速" @command="scale">
|
<el-dropdown size="mini" title="播放倍速" @command="scale">
|
||||||
<el-button size="mini">
|
<el-button size="mini">
|
||||||
快进/快退 <i class="el-icon-arrow-down el-icon--right"></i>
|
快进/快退 <i class="el-icon-arrow-down el-icon--right" />
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-dropdown-menu slot="dropdown">
|
<el-dropdown-menu slot="dropdown">
|
||||||
<el-dropdown-item :command="[3, 1]">正常快进</el-dropdown-item>
|
<el-dropdown-item :command="[3, 1]">正常快进</el-dropdown-item>
|
||||||
@@ -77,25 +81,25 @@
|
|||||||
<el-dropdown-item :command="[4, 16]">16倍速快退</el-dropdown-item>
|
<el-dropdown-item :command="[4, 16]">16倍速快退</el-dropdown-item>
|
||||||
</el-dropdown-menu>
|
</el-dropdown-menu>
|
||||||
</el-dropdown>
|
</el-dropdown>
|
||||||
<el-button size="mini" class="iconfont icon-xiazai1" title="下载选定录像" @click="downloadRecord()"></el-button>
|
<el-button size="mini" class="iconfont icon-xiazai1" title="下载选定录像" @click="downloadRecord()" />
|
||||||
<el-button v-if="sliderMIn === 0 && sliderMax === 86400" size="mini" class="iconfont icon-slider" title="放大滑块" @click="setSliderFit()"></el-button>
|
<el-button v-if="sliderMIn === 0 && sliderMax === 86400" size="mini" class="iconfont icon-slider" title="放大滑块" @click="setSliderFit()" />
|
||||||
<el-button v-if="sliderMIn !== 0 || sliderMax !== 86400" size="mini" class="iconfont icon-slider-right" title="恢复滑块" @click="setSliderFit()"></el-button>
|
<el-button v-if="sliderMIn !== 0 || sliderMax !== 86400" size="mini" class="iconfont icon-slider-right" title="恢复滑块" @click="setSliderFit()" />
|
||||||
</el-button-group>
|
</el-button-group>
|
||||||
</div>
|
</div>
|
||||||
<el-slider
|
<el-slider
|
||||||
class="playtime-slider"
|
|
||||||
v-model="playTime"
|
|
||||||
id="playtimeSlider"
|
id="playtimeSlider"
|
||||||
|
v-model="playTime"
|
||||||
|
class="playtime-slider"
|
||||||
:disabled="detailFiles.length === 0"
|
:disabled="detailFiles.length === 0"
|
||||||
:min="sliderMIn"
|
:min="sliderMIn"
|
||||||
:max="sliderMax"
|
:max="sliderMax"
|
||||||
:range="true"
|
:range="true"
|
||||||
:format-tooltip="playTimeFormat"
|
:format-tooltip="playTimeFormat"
|
||||||
|
:marks="playTimeSliderMarks"
|
||||||
@change="playTimeChange"
|
@change="playTimeChange"
|
||||||
:marks="playTimeSliderMarks">
|
/>
|
||||||
</el-slider>
|
|
||||||
<div class="slider-val-box">
|
<div class="slider-val-box">
|
||||||
<div class="slider-val" v-for="item of detailFiles" :style="'width:' + getDataWidth(item) + '%; left:' + getDataLeft(item) + '%'"></div>
|
<div v-for="item of detailFiles" class="slider-val" :style="'width:' + getDataWidth(item) + '%; left:' + getDataLeft(item) + '%'" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -104,14 +108,13 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import uiHeader from '../layout/UiHeader.vue'
|
import uiHeader from '../layout/UiHeader.vue'
|
||||||
import player from './common/jessibuca.vue'
|
import player from './common/jessibuca.vue'
|
||||||
import moment from 'moment'
|
import moment from 'moment'
|
||||||
import JTDeviceService from "./service/JTDeviceService";
|
import JTDeviceService from './service/JTDeviceService'
|
||||||
export default {
|
export default {
|
||||||
name: 'app',
|
name: 'App',
|
||||||
components: {
|
components: {
|
||||||
uiHeader, player
|
uiHeader, player
|
||||||
},
|
},
|
||||||
@@ -121,7 +124,7 @@ export default {
|
|||||||
channelId: this.$route.params.channelId,
|
channelId: this.$route.params.channelId,
|
||||||
deviceService: new JTDeviceService(),
|
deviceService: new JTDeviceService(),
|
||||||
recordsLoading: false,
|
recordsLoading: false,
|
||||||
streamId: "",
|
streamId: '',
|
||||||
hasAudio: false,
|
hasAudio: false,
|
||||||
detailFiles: [],
|
detailFiles: [],
|
||||||
chooseDate: null,
|
chooseDate: null,
|
||||||
@@ -136,15 +139,15 @@ export default {
|
|||||||
sliderMax: 86400,
|
sliderMax: 86400,
|
||||||
autoPlay: true,
|
autoPlay: true,
|
||||||
taskUpdate: null,
|
taskUpdate: null,
|
||||||
tabVal: "running",
|
tabVal: 'running',
|
||||||
recordListStyle: {
|
recordListStyle: {
|
||||||
height: this.winHeight + "px",
|
height: this.winHeight + 'px',
|
||||||
overflow: "auto",
|
overflow: 'auto',
|
||||||
margin: "10px auto 10px auto"
|
margin: '10px auto 10px auto'
|
||||||
},
|
},
|
||||||
playerStyle: {
|
playerStyle: {
|
||||||
"margin": "0 auto 20px auto",
|
'margin': '0 auto 20px auto',
|
||||||
"height": this.winHeight + "px",
|
'height': this.winHeight + 'px'
|
||||||
},
|
},
|
||||||
winHeight: window.innerHeight - 240,
|
winHeight: window.innerHeight - 240,
|
||||||
playTime: null,
|
playTime: null,
|
||||||
@@ -152,57 +155,57 @@ export default {
|
|||||||
startTime: null,
|
startTime: null,
|
||||||
endTime: null,
|
endTime: null,
|
||||||
playTimeSliderMarks: {
|
playTimeSliderMarks: {
|
||||||
0: "00:00",
|
0: '00:00',
|
||||||
3600: "01:00",
|
3600: '01:00',
|
||||||
7200: "02:00",
|
7200: '02:00',
|
||||||
10800: "03:00",
|
10800: '03:00',
|
||||||
14400: "04:00",
|
14400: '04:00',
|
||||||
18000: "05:00",
|
18000: '05:00',
|
||||||
21600: "06:00",
|
21600: '06:00',
|
||||||
25200: "07:00",
|
25200: '07:00',
|
||||||
28800: "08:00",
|
28800: '08:00',
|
||||||
32400: "09:00",
|
32400: '09:00',
|
||||||
36000: "10:00",
|
36000: '10:00',
|
||||||
39600: "11:00",
|
39600: '11:00',
|
||||||
43200: "12:00",
|
43200: '12:00',
|
||||||
46800: "13:00",
|
46800: '13:00',
|
||||||
50400: "14:00",
|
50400: '14:00',
|
||||||
54000: "15:00",
|
54000: '15:00',
|
||||||
57600: "16:00",
|
57600: '16:00',
|
||||||
61200: "17:00",
|
61200: '17:00',
|
||||||
64800: "18:00",
|
64800: '18:00',
|
||||||
68400: "19:00",
|
68400: '19:00',
|
||||||
72000: "20:00",
|
72000: '20:00',
|
||||||
75600: "21:00",
|
75600: '21:00',
|
||||||
79200: "22:00",
|
79200: '22:00',
|
||||||
82800: "23:00",
|
82800: '23:00',
|
||||||
86400: "24:00",
|
86400: '24:00'
|
||||||
},
|
}
|
||||||
};
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.recordListStyle.height = this.winHeight + "px";
|
this.recordListStyle.height = this.winHeight + 'px'
|
||||||
this.playerStyle["height"] = this.winHeight + "px";
|
this.playerStyle['height'] = this.winHeight + 'px'
|
||||||
this.chooseDate = moment().format('YYYY-MM-DD')
|
this.chooseDate = moment().format('YYYY-MM-DD')
|
||||||
this.dateChange();
|
this.dateChange()
|
||||||
window.addEventListener('beforeunload', this.stopPlayRecord)
|
window.addEventListener('beforeunload', this.stopPlayRecord)
|
||||||
},
|
},
|
||||||
destroyed() {
|
destroyed() {
|
||||||
this.$destroy('recordVideoPlayer');
|
this.$destroy('recordVideoPlayer')
|
||||||
window.removeEventListener('beforeunload', this.stopPlayRecord)
|
window.removeEventListener('beforeunload', this.stopPlayRecord)
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
dateChange(){
|
dateChange() {
|
||||||
if (!this.chooseDate) {
|
if (!this.chooseDate) {
|
||||||
return;
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
this.setTime(this.chooseDate + " 00:00:00", this.chooseDate + " 23:59:59");
|
this.setTime(this.chooseDate + ' 00:00:00', this.chooseDate + ' 23:59:59')
|
||||||
this.recordsLoading = true;
|
this.recordsLoading = true
|
||||||
this.detailFiles = [];
|
this.detailFiles = []
|
||||||
this.$axios({
|
this.$axios({
|
||||||
method: 'get',
|
method: 'get',
|
||||||
url: '/api/jt1078/record/list',
|
url: '/api/jt1078/record/list',
|
||||||
@@ -210,54 +213,52 @@ export default {
|
|||||||
phoneNumber: this.phoneNumber,
|
phoneNumber: this.phoneNumber,
|
||||||
channelId: this.channelId,
|
channelId: this.channelId,
|
||||||
startTime: this.startTime,
|
startTime: this.startTime,
|
||||||
endTime: this.endTime,
|
endTime: this.endTime
|
||||||
}
|
}
|
||||||
}).then((res)=>{
|
}).then((res) => {
|
||||||
this.recordsLoading = false;
|
this.recordsLoading = false
|
||||||
if(res.data.code === 0) {
|
if (res.data.code === 0) {
|
||||||
// 处理时间信息
|
// 处理时间信息
|
||||||
this.detailFiles = res.data.data;
|
this.detailFiles = res.data.data
|
||||||
}else {
|
} else {
|
||||||
this.$message({
|
this.$message({
|
||||||
showClose: true,
|
showClose: true,
|
||||||
message: res.data.msg,
|
message: res.data.msg,
|
||||||
type: "error",
|
type: 'error'
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
|
}).catch((e) => {
|
||||||
}).catch((e)=> {
|
this.recordsLoading = false
|
||||||
this.recordsLoading = false;
|
|
||||||
// that.videoHistory.searchHistoryResult = falsificationData.recordData;
|
// that.videoHistory.searchHistoryResult = falsificationData.recordData;
|
||||||
});
|
})
|
||||||
},
|
},
|
||||||
moment: function (v) {
|
moment: function(v) {
|
||||||
return moment(v)
|
return moment(v)
|
||||||
},
|
},
|
||||||
setTime: function (startTime, endTime){
|
setTime: function(startTime, endTime) {
|
||||||
this.startTime = startTime;
|
this.startTime = startTime
|
||||||
this.endTime = endTime;
|
this.endTime = endTime
|
||||||
let start = (new Date(this.startTime).getTime() - new Date(this.chooseDate + " 00:00:00").getTime())/1000;
|
const start = (new Date(this.startTime).getTime() - new Date(this.chooseDate + ' 00:00:00').getTime()) / 1000
|
||||||
let end = (new Date(this.endTime).getTime() - new Date(this.chooseDate + " 00:00:00").getTime())/1000;
|
const end = (new Date(this.endTime).getTime() - new Date(this.chooseDate + ' 00:00:00').getTime()) / 1000
|
||||||
console.log(start)
|
console.log(start)
|
||||||
console.log(end)
|
console.log(end)
|
||||||
this.playTime = [start, end];
|
this.playTime = [start, end]
|
||||||
this.timeRange = [startTime, endTime];
|
this.timeRange = [startTime, endTime]
|
||||||
},
|
},
|
||||||
videoError: function (e) {
|
videoError: function(e) {
|
||||||
console.log("播放器错误:" + JSON.stringify(e));
|
console.log('播放器错误:' + JSON.stringify(e))
|
||||||
},
|
},
|
||||||
checkedFile(file){
|
checkedFile(file) {
|
||||||
this.chooseFile = file;
|
this.chooseFile = file
|
||||||
this.setTime(file.startTime, file.endTime);
|
this.setTime(file.startTime, file.endTime)
|
||||||
// 开始回放
|
// 开始回放
|
||||||
this.playRecord()
|
this.playRecord()
|
||||||
},
|
},
|
||||||
playRecord: function () {
|
playRecord: function() {
|
||||||
|
if (this.streamId !== '') {
|
||||||
if (this.streamId !== "") {
|
this.stopPlayRecord(() => {
|
||||||
this.stopPlayRecord(()=> {
|
this.streamId = ''
|
||||||
this.streamId = "";
|
this.playRecord()
|
||||||
this.playRecord();
|
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
this.$axios({
|
this.$axios({
|
||||||
@@ -273,35 +274,35 @@ export default {
|
|||||||
playbackType: 0,
|
playbackType: 0,
|
||||||
playbackSpeed: 0
|
playbackSpeed: 0
|
||||||
}
|
}
|
||||||
}).then((res)=> {
|
}).then((res) => {
|
||||||
if (res.data.code === 0) {
|
if (res.data.code === 0) {
|
||||||
this.streamInfo = res.data.data;
|
this.streamInfo = res.data.data
|
||||||
this.app = this.streamInfo.app;
|
this.app = this.streamInfo.app
|
||||||
this.streamId = this.streamInfo.stream;
|
this.streamId = this.streamInfo.stream
|
||||||
this.mediaServerId = this.streamInfo.mediaServerId;
|
this.mediaServerId = this.streamInfo.mediaServerId
|
||||||
this.ssrc = this.streamInfo.ssrc;
|
this.ssrc = this.streamInfo.ssrc
|
||||||
this.videoUrl = this.getUrlByStreamInfo();
|
this.videoUrl = this.getUrlByStreamInfo()
|
||||||
this.hasAudio = this.streamInfo.tracks && this.streamInfo.tracks.length > 1
|
this.hasAudio = this.streamInfo.tracks && this.streamInfo.tracks.length > 1
|
||||||
}else {
|
} else {
|
||||||
this.$message({
|
this.$message({
|
||||||
showClose: true,
|
showClose: true,
|
||||||
message: res.data.msg,
|
message: res.data.msg,
|
||||||
type: "error",
|
type: 'error'
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
gbPlay(){
|
gbPlay() {
|
||||||
console.log('前端控制:播放');
|
console.log('前端控制:播放')
|
||||||
this.$axios({
|
this.$axios({
|
||||||
method: 'get',
|
method: 'get',
|
||||||
url: '/api/playback/resume/' + this.streamId
|
url: '/api/playback/resume/' + this.streamId
|
||||||
}).then((res)=> {
|
}).then((res) => {
|
||||||
this.$refs["recordVideoPlayer"].play(this.videoUrl)
|
this.$refs['recordVideoPlayer'].play(this.videoUrl)
|
||||||
});
|
})
|
||||||
},
|
},
|
||||||
control(command, playbackSpeed, time){
|
control(command, playbackSpeed, time) {
|
||||||
this.$axios({
|
this.$axios({
|
||||||
method: 'get',
|
method: 'get',
|
||||||
url: '/api/jt1078/playback/control',
|
url: '/api/jt1078/playback/control',
|
||||||
@@ -312,44 +313,44 @@ export default {
|
|||||||
playbackSpeed: playbackSpeed,
|
playbackSpeed: playbackSpeed,
|
||||||
time: time
|
time: time
|
||||||
}
|
}
|
||||||
}).then(function (res) {});
|
}).then(function(res) {})
|
||||||
},
|
},
|
||||||
scale(command){
|
scale(command) {
|
||||||
this.control(command[0], command[1])
|
this.control(command[0], command[1])
|
||||||
},
|
},
|
||||||
downloadRecord: function (row) {
|
downloadRecord: function(row) {
|
||||||
let baseUrl = window.baseUrl ? window.baseUrl : "";
|
const baseUrl = window.baseUrl ? window.baseUrl : ''
|
||||||
let downloadFile = ((process.env.NODE_ENV === 'development') ? process.env.BASE_API : baseUrl) +
|
const downloadFile = ((process.env.NODE_ENV === 'development') ? process.env.BASE_API : baseUrl) +
|
||||||
`/api/jt1078/playback/download?phoneNumber=${this.phoneNumber}&channelId=${this.channelId}&startTime=${row.startTime}&endTime=${row.endTime}`+
|
`/api/jt1078/playback/download?phoneNumber=${this.phoneNumber}&channelId=${this.channelId}&startTime=${row.startTime}&endTime=${row.endTime}` +
|
||||||
`&alarmSign=${row.alarmSign}&mediaType=${row.mediaType}&streamType=${row.streamType}&storageType=${row.storageType}`
|
`&alarmSign=${row.alarmSign}&mediaType=${row.mediaType}&streamType=${row.streamType}&storageType=${row.storageType}`
|
||||||
console.log(downloadFile)
|
console.log(downloadFile)
|
||||||
let x = new XMLHttpRequest();
|
const x = new XMLHttpRequest()
|
||||||
x.open("GET", downloadFile, true);
|
x.open('GET', downloadFile, true)
|
||||||
x.responseType = 'blob';
|
x.responseType = 'blob'
|
||||||
x.onload=(e)=> {
|
x.onload = (e) => {
|
||||||
let url = window.URL.createObjectURL(x.response)
|
const url = window.URL.createObjectURL(x.response)
|
||||||
let a = document.createElement('a');
|
const a = document.createElement('a')
|
||||||
a.href = url
|
a.href = url
|
||||||
a.download = this.phoneNumber + "-" + this.channelId + ".mp4";
|
a.download = this.phoneNumber + '-' + this.channelId + '.mp4'
|
||||||
a.click()
|
a.click()
|
||||||
}
|
}
|
||||||
x.send();
|
x.send()
|
||||||
},
|
},
|
||||||
stopDownloadRecord: function (callback) {
|
stopDownloadRecord: function(callback) {
|
||||||
this.$refs["recordVideoPlayer"].pause();
|
this.$refs['recordVideoPlayer'].pause()
|
||||||
this.videoUrl = '';
|
this.videoUrl = ''
|
||||||
this.$axios({
|
this.$axios({
|
||||||
method: 'get',
|
method: 'get',
|
||||||
url: '/api/gb_record/download/stop/' + this.deviceId + "/" + this.channelId+ "/" + this.streamId
|
url: '/api/gb_record/download/stop/' + this.deviceId + '/' + this.channelId + '/' + this.streamId
|
||||||
}).then((res)=> {
|
}).then((res) => {
|
||||||
if (callback) callback(res)
|
if (callback) callback(res)
|
||||||
});
|
})
|
||||||
},
|
},
|
||||||
stopPlayRecord: function (callback) {
|
stopPlayRecord: function(callback) {
|
||||||
console.log("停止录像回放")
|
console.log('停止录像回放')
|
||||||
if (this.streamId !== "") {
|
if (this.streamId !== '') {
|
||||||
this.$refs["recordVideoPlayer"].pause();
|
this.$refs['recordVideoPlayer'].pause()
|
||||||
this.videoUrl = '';
|
this.videoUrl = ''
|
||||||
this.$axios({
|
this.$axios({
|
||||||
method: 'get',
|
method: 'get',
|
||||||
url: '/api/jt1078/playback/stop/',
|
url: '/api/jt1078/playback/stop/',
|
||||||
@@ -358,98 +359,96 @@ export default {
|
|||||||
channelId: this.channelId,
|
channelId: this.channelId,
|
||||||
streamId: this.streamId
|
streamId: this.streamId
|
||||||
}
|
}
|
||||||
}).then(function (res) {
|
}).then(function(res) {
|
||||||
if (callback) callback()
|
if (callback) callback()
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
getDataWidth(item){
|
getDataWidth(item) {
|
||||||
let timeForFile = this.getTimeForFile(item);
|
const timeForFile = this.getTimeForFile(item)
|
||||||
let result = (timeForFile[2])/((this.sliderMax - this.sliderMIn)*1000)
|
const result = (timeForFile[2]) / ((this.sliderMax - this.sliderMIn) * 1000)
|
||||||
return result*100
|
return result * 100
|
||||||
},
|
},
|
||||||
getDataLeft(item){
|
getDataLeft(item) {
|
||||||
let timeForFile = this.getTimeForFile(item);
|
const timeForFile = this.getTimeForFile(item)
|
||||||
let differenceTime = timeForFile[0].getTime() - new Date(this.chooseDate + " 00:00:00").getTime()
|
const differenceTime = timeForFile[0].getTime() - new Date(this.chooseDate + ' 00:00:00').getTime()
|
||||||
return parseFloat((differenceTime - this.sliderMIn * 1000)/((this.sliderMax - this.sliderMIn)*1000))*100 ;
|
return parseFloat((differenceTime - this.sliderMIn * 1000) / ((this.sliderMax - this.sliderMIn) * 1000)) * 100
|
||||||
},
|
},
|
||||||
getUrlByStreamInfo(){
|
getUrlByStreamInfo() {
|
||||||
if (location.protocol === "https:") {
|
if (location.protocol === 'https:') {
|
||||||
this.videoUrl = this.streamInfo["wss_flv"]
|
this.videoUrl = this.streamInfo['wss_flv']
|
||||||
}else {
|
} else {
|
||||||
this.videoUrl = this.streamInfo["ws_flv"]
|
this.videoUrl = this.streamInfo['ws_flv']
|
||||||
}
|
}
|
||||||
return this.videoUrl;
|
return this.videoUrl
|
||||||
|
|
||||||
},
|
},
|
||||||
timePickerChange: function (val){
|
timePickerChange: function(val) {
|
||||||
this.setTime(val[0], val[1])
|
this.setTime(val[0], val[1])
|
||||||
},
|
},
|
||||||
playTimeChange(val){
|
playTimeChange(val) {
|
||||||
console.log(val)
|
console.log(val)
|
||||||
|
|
||||||
let startTimeStr = moment(new Date(this.chooseDate + " 00:00:00").getTime() + val[0]*1000).format("YYYY-MM-DD HH:mm:ss");
|
const startTimeStr = moment(new Date(this.chooseDate + ' 00:00:00').getTime() + val[0] * 1000).format('YYYY-MM-DD HH:mm:ss')
|
||||||
let endTimeStr = moment(new Date(this.chooseDate + " 00:00:00").getTime() + val[1]*1000).format("YYYY-MM-DD HH:mm:ss");
|
const endTimeStr = moment(new Date(this.chooseDate + ' 00:00:00').getTime() + val[1] * 1000).format('YYYY-MM-DD HH:mm:ss')
|
||||||
|
|
||||||
this.setTime(startTimeStr, endTimeStr)
|
this.setTime(startTimeStr, endTimeStr)
|
||||||
|
|
||||||
this.playRecord();
|
this.playRecord()
|
||||||
},
|
},
|
||||||
setSliderFit() {
|
setSliderFit() {
|
||||||
if (this.sliderMIn === 0 && this.sliderMax === 86400) {
|
if (this.sliderMIn === 0 && this.sliderMax === 86400) {
|
||||||
if (this.detailFiles.length > 0){
|
if (this.detailFiles.length > 0) {
|
||||||
let timeForFile = this.getTimeForFile(this.detailFiles[0]);
|
const timeForFile = this.getTimeForFile(this.detailFiles[0])
|
||||||
let lastTimeForFile = this.getTimeForFile(this.detailFiles[this.detailFiles.length - 1]);
|
const lastTimeForFile = this.getTimeForFile(this.detailFiles[this.detailFiles.length - 1])
|
||||||
let timeNum = timeForFile[0].getTime() - new Date(this.chooseDate + " " + "00:00:00").getTime()
|
const timeNum = timeForFile[0].getTime() - new Date(this.chooseDate + ' ' + '00:00:00').getTime()
|
||||||
let lastTimeNum = lastTimeForFile[1].getTime() - new Date(this.chooseDate + " " + "00:00:00").getTime()
|
const lastTimeNum = lastTimeForFile[1].getTime() - new Date(this.chooseDate + ' ' + '00:00:00').getTime()
|
||||||
|
|
||||||
this.playTime = parseInt(timeNum/1000)
|
this.playTime = parseInt(timeNum / 1000)
|
||||||
this.sliderMIn = parseInt(timeNum/1000 - timeNum/1000%(60*60))
|
this.sliderMIn = parseInt(timeNum / 1000 - timeNum / 1000 % (60 * 60))
|
||||||
this.sliderMax = parseInt(lastTimeNum/1000 - lastTimeNum/1000%(60*60)) + 60*60
|
this.sliderMax = parseInt(lastTimeNum / 1000 - lastTimeNum / 1000 % (60 * 60)) + 60 * 60
|
||||||
|
|
||||||
this.playTime = [this.sliderMIn, this.sliderMax];
|
this.playTime = [this.sliderMIn, this.sliderMax]
|
||||||
}
|
}
|
||||||
}else {
|
} else {
|
||||||
this.sliderMIn = 0;
|
this.sliderMIn = 0
|
||||||
this.sliderMax = 86400;
|
this.sliderMax = 86400
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
getTimeForFile(file){
|
getTimeForFile(file) {
|
||||||
let startTime = new Date(file.startTime);
|
const startTime = new Date(file.startTime)
|
||||||
let endTime = new Date(file.endTime);
|
const endTime = new Date(file.endTime)
|
||||||
return [startTime, endTime, endTime.getTime() - startTime.getTime()];
|
return [startTime, endTime, endTime.getTime() - startTime.getTime()]
|
||||||
},
|
},
|
||||||
playTimeFormat(val){
|
playTimeFormat(val) {
|
||||||
let h = parseInt(val/3600);
|
const h = parseInt(val / 3600)
|
||||||
let m = parseInt((val - h*3600)/60);
|
const m = parseInt((val - h * 3600) / 60)
|
||||||
let s = parseInt(val - h*3600 - m*60);
|
const s = parseInt(val - h * 3600 - m * 60)
|
||||||
|
|
||||||
let hStr = h;
|
let hStr = h
|
||||||
let mStr = m;
|
let mStr = m
|
||||||
let sStr = s;
|
let sStr = s
|
||||||
if (h < 10) {
|
if (h < 10) {
|
||||||
hStr = "0" + hStr;
|
hStr = '0' + hStr
|
||||||
}
|
}
|
||||||
if (m < 10) {
|
if (m < 10) {
|
||||||
mStr = "0" + mStr;s
|
mStr = '0' + mStr; s
|
||||||
}
|
}
|
||||||
if (s < 10) {
|
if (s < 10) {
|
||||||
sStr = "0" + sStr;
|
sStr = '0' + sStr
|
||||||
}
|
}
|
||||||
return hStr + ":" + mStr + ":" + sStr
|
return hStr + ':' + mStr + ':' + sStr
|
||||||
},
|
},
|
||||||
goBack(){
|
goBack() {
|
||||||
// 如果正在进行录像回放则,发送停止
|
// 如果正在进行录像回放则,发送停止
|
||||||
if (this.streamId !== "") {
|
if (this.streamId !== '') {
|
||||||
this.stopPlayRecord(()=> {
|
this.stopPlayRecord(() => {
|
||||||
this.streamId = "";
|
this.streamId = ''
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
window.history.go(-1);
|
window.history.go(-1)
|
||||||
},
|
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
|
|||||||
Reference in New Issue
Block a user