kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
kubbo
2022-04-24 10:12:27 +08:00
parent 5ea1728dbb 53a4e5ea27
commit 722d861dfd
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/IntelligentSecurity/components/AiSlwVideo.vue
View File

@@ -42,12 +42,12 @@
</div>
</div>
<div class="play-status">
<div class="live" v-if="isLiveing">
<span class="label"></span>
<i>直播中</i>
<div class="live">
<span class="label" v-if="isLiveing"></span>
<i v-if="isLiveing">直播中</i>
<em>{{ date }}</em>
</div>
<div v-else class="back-btn" @click="backLiveing">回到直播</div>
<div v-if="!isLiveing" class="back-btn" @click="backLiveing">回到直播</div>
</div>
</div>
<div class="right">
@@ -154,6 +154,7 @@
},
mounted () {
this.date = this.$moment(new Date()).format('YYYY-MM-DD')
this.form.date = this.$moment(new Date()).format('YYYY-MM-DD')
this.$nextTick(() => {
this.width = document.querySelector(`#${this.videoId}`).offsetWidth + 'px'
@@ -221,8 +222,8 @@
this.instance.post(`/app/appzyvideoequipment/getSlwPlaybackTime`, null, {
params: {
ids: this.id,
startTime: this.form.date + ' 00:00:00',
endTime: this.form.date + ' 23:59:59',
startTime: this.date + ' 00:00:00',
endTime: this.date + ' 23:59:59',
}
}).then(res => {
if (res.code == 0) {
@@ -230,8 +231,8 @@
const times = res.data[0].times
this.times = times.map(item => {
const startTime = (item.startTime - new Date(this.form.date + ' 00:00:00').getTime()) / 1000
const endTime = (item.endTime - new Date(this.form.date + ' 00:00:00').getTime()) / 1000
const startTime = (item.startTime - new Date(this.date + ' 00:00:00').getTime()) / 1000
const endTime = (item.endTime - new Date(this.date + ' 00:00:00').getTime()) / 1000
return {
startTime: Number(startTime.toFixed(0)),
@@ -467,6 +468,7 @@
.live {
display: flex;
align-items: center;
line-height: 1;
padding: 2px 5px;
color: rgba(0,255,0,.8);

11
packages/IntelligentSecurity/components/Synergy.vue
View File

@@ -34,12 +34,12 @@
</div>
</div> -->
<div class="play-status">
<div class="live" v-if="isLiveing">
<span class="label"></span>
<i>直播中</i>
<div class="live">
<span class="label" v-if="isLiveing"></span>
<i v-if="isLiveing">直播中</i>
<em>{{ date }}</em>
</div>
<div v-else class="back-btn" @click="backLiveing">回到直播</div>
<div v-if="!isLiveing" class="back-btn" @click="backLiveing">回到直播</div>
</div>
</div>
<div class="right">
@@ -295,8 +295,6 @@
const date = new Date()
const seconds = date.getHours() * 3600 + date.getMinutes() * 60 + date.getSeconds()
console.log(this.canvasWidth)
this.x = seconds / (24 * 60 * 60) * this.canvasWidth + 100
},
@@ -564,6 +562,7 @@
.live {
display: flex;
align-items: center;
line-height: 1;
padding: 2px 5px;
color: rgba(0,255,0,.8);