|
@@ -27,7 +27,9 @@
|
|
|
@dragstop="dragStop"
|
|
|
@resizestop="(obj) => reSizeSignal(obj,itemV)"
|
|
|
>
|
|
|
- <div ref="signal">
|
|
|
+ <div
|
|
|
+ ref="signal"
|
|
|
+ >
|
|
|
{{itemV.deviceID}}
|
|
|
<!--<div class="closeBtn" @click.stop="closeSignal(itemV)">×</div>
|
|
|
<video-player
|
|
@@ -101,7 +103,7 @@
|
|
|
aspectRatio: '200:93',
|
|
|
preload: 'auto',
|
|
|
notSupportedMessage: '此视频暂无法播放,请稍后再试',
|
|
|
- },
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
|
|
@@ -157,10 +159,10 @@
|
|
|
bigScreenId:this.currentBigshow[0].ID,
|
|
|
streamWindows
|
|
|
}
|
|
|
- // console.log(data)
|
|
|
this.streamWindows = streamWindows
|
|
|
// 调用大屏开窗接口
|
|
|
await reqRefreshView(data)
|
|
|
+ this.$store.dispatch('updateSignalPreList', streamWindows)
|
|
|
}
|
|
|
})
|
|
|
},
|
|
@@ -203,12 +205,12 @@
|
|
|
},
|
|
|
|
|
|
set(arr) {
|
|
|
- if (arr.length > 0){
|
|
|
+ if(arr.length>0){
|
|
|
const arr2 = []
|
|
|
arr.forEach(item => {
|
|
|
arr2.push(JSON.parse(JSON.stringify(item)))
|
|
|
})
|
|
|
- arr2.forEach(item => {
|
|
|
+ arr2.forEach((item,index) => {
|
|
|
item.Id = guId()
|
|
|
item.splitScreenStatus = this.$store.state.splitScreenStatus + 1
|
|
|
item.width = this.currentBigshow[0].Width * this.$store.state.bigScale / item.splitScreenStatus
|
|
@@ -216,9 +218,9 @@
|
|
|
item.widthScale = item.width / (this.currentBigshow[0].Width * this.$store.state.bigScale)
|
|
|
item.heightScale = item.height / (this.currentBigshow[0].Height * this.$store.state.bigScale)
|
|
|
})
|
|
|
- this.$store.dispatch('updateSignalPreList', arr2)
|
|
|
+ this.reqRefreshBigScreen(arr2)
|
|
|
}else {
|
|
|
- this.$store.dispatch('updateSignalPreList', arr)
|
|
|
+ this.reqRefreshBigScreen(arr)
|
|
|
}
|
|
|
}
|
|
|
},
|
|
@@ -248,9 +250,9 @@
|
|
|
|
|
|
watch: {
|
|
|
// 监视大屏中的信号源,只要变动,就调用回调函数
|
|
|
- signalPreList: function (arr) {
|
|
|
+ /* signalPreList: function (arr) {
|
|
|
this.reqRefreshBigScreen(arr)
|
|
|
- },
|
|
|
+ },*/
|
|
|
|
|
|
// 监视分屏的状态
|
|
|
splitScreenStatus: function(num) {
|