|
@@ -28,24 +28,25 @@
|
|
|
@resizestop="(obj) => reSizeSignal(obj,itemV)"
|
|
|
>
|
|
|
<div ref="signal">
|
|
|
- <div class="closeBtn" @click.stop="closeSignal(itemV)">×</div>
|
|
|
+ {{itemV.deviceID}}
|
|
|
+ <!--<div class="closeBtn" @click.stop="closeSignal(itemV)">×</div>
|
|
|
<video-player
|
|
|
ref="videoPlayer"
|
|
|
:options="playerOptions"
|
|
|
:playsinline="true"
|
|
|
>
|
|
|
- </video-player>
|
|
|
+ </video-player>-->
|
|
|
</div>
|
|
|
</VueDragResize>
|
|
|
|
|
|
- <div v-for="itemD in divArr" :key="itemD" class="sitem2">
|
|
|
+ <div v-for="itemD in bindList" :key="itemD" class="sitem2">
|
|
|
{{itemD}}
|
|
|
</div>
|
|
|
|
|
|
- <!--<div v-for="item in [...signalPreList,...divArr]">
|
|
|
+ <!--<div v-for="item in [...signalPreList,...bindList]">
|
|
|
<VueDragResize
|
|
|
- v-if="item.deviceID" :key="item" class="sitem"
|
|
|
- :w="item.Width*bigScale/item.splitdeviceIDScreenStatus" :h="item.Height*bigScale/item.splitScreenStatus"
|
|
|
+ v-if="item.deviceID" :key="item.Id" class="sitem"
|
|
|
+ :w="item.Width*bigScale/item.splitScreenStatus" :h="item.Height*bigScale/item.splitScreenStatus"
|
|
|
@dragstop="dragStop"
|
|
|
@resizestop="(obj) => reSizeSignal(obj,item)"
|
|
|
>
|
|
@@ -83,7 +84,7 @@
|
|
|
data() {
|
|
|
return {
|
|
|
isDragging: false, // 是否可拖动标志
|
|
|
- divArr:[],// 默认大屏中盒子的数组
|
|
|
+ bindList:[], // 拼接屏的数量
|
|
|
streamWindows:[], // 传递出去的信号源位置信息
|
|
|
bigScreenJson:[], // 大屏配置json文件
|
|
|
playerOptions: { // rtmp视频流配置
|
|
@@ -101,7 +102,6 @@
|
|
|
preload: 'auto',
|
|
|
notSupportedMessage: '此视频暂无法播放,请稍后再试',
|
|
|
},
|
|
|
- allDiv:[], // 大屏中所有的盒子(包括普通div和信号源列表)
|
|
|
}
|
|
|
},
|
|
|
|
|
@@ -114,6 +114,11 @@
|
|
|
async beforeCreate() {
|
|
|
this.bigScreenJson = await getStaticFile('EnityBigScreen.Data')
|
|
|
this.currentBigshow = this.bigScreenJson.filter(item => item.IsVisibility === true)
|
|
|
+ const num = this.currentBigshow[0].BindList.length
|
|
|
+ for(let i=0;i<num;i++){
|
|
|
+ this.$data.bindList.push(i+1)
|
|
|
+ }
|
|
|
+ this.$store.dispatch('splitScreen', Math.sqrt(num)-1)
|
|
|
},
|
|
|
|
|
|
methods: {
|
|
@@ -249,9 +254,9 @@
|
|
|
|
|
|
// 监视分屏的状态
|
|
|
splitScreenStatus: function(num) {
|
|
|
- this.$data.divArr = []
|
|
|
+ this.$data.bindList = []
|
|
|
for (let i=0;i<(num+1)*(num+1);i++){
|
|
|
- this.$data.divArr.push(i+1)
|
|
|
+ this.$data.bindList.push(i+1)
|
|
|
}
|
|
|
this.reqRefreshBigScreen(this.$data.streamWindows)
|
|
|
}
|