|
@@ -26,12 +26,12 @@
|
|
|
@resizestop="(size) => resizeSignal(size,itemV,bigScreenObj,curOpeBigscreenId)"
|
|
|
>
|
|
|
<div ref="signal" :id="itemV.ID">
|
|
|
- {{itemV.deviceID}}
|
|
|
- <!--<VideoPlayer
|
|
|
+ <!--{{itemV.deviceID}}-->
|
|
|
+ <VideoPlayer
|
|
|
ref="videoPlayer"
|
|
|
:options="playerOptions"
|
|
|
:playsinline="true"
|
|
|
- />-->
|
|
|
+ />
|
|
|
<div class="closeBtn" @click.stop="closeSignal(itemV)">×</div>
|
|
|
</div>
|
|
|
</VueDragResize>
|
|
@@ -127,8 +127,8 @@
|
|
|
if(Id){
|
|
|
const signals = obj[Id].signalArr
|
|
|
const streamWindows = signals.map((item,index) => ({
|
|
|
- left:item.left + this.screenPosition[Id].left,
|
|
|
- top:item.top + this.screenPosition[Id].top,
|
|
|
+ left:item.left,
|
|
|
+ top:item.top,
|
|
|
width:item.width,
|
|
|
height:item.height,
|
|
|
id:index,
|
|
@@ -137,10 +137,6 @@
|
|
|
heightScale:item.heightScale,
|
|
|
orginRect:{}
|
|
|
}))
|
|
|
- console.log({
|
|
|
- bigScreenId:Id,
|
|
|
- streamWindows
|
|
|
- })
|
|
|
await reqRefreshView({
|
|
|
bigScreenId:Id,
|
|
|
streamWindows
|
|
@@ -220,7 +216,7 @@
|
|
|
const positionInfo = elePosition(newObj[0].width,newObj[0].height,positionNum,this.screenPosition[bigscreenId].top,this.screenPosition[bigscreenId].left,bigScreenObj[bigscreenId].splitStatus+1)
|
|
|
newObj[0].top = positionInfo.top - this.screenPosition[bigscreenId].top
|
|
|
newObj[0].left = positionInfo.left - this.screenPosition[bigscreenId].left
|
|
|
- bigScreenObj[bigscreenId].signalArr = [...newObj,...otherSignals]
|
|
|
+ bigScreenObj[bigscreenId].signalArr = [...otherSignals,...newObj]
|
|
|
this.refreshBigScreen(bigScreenObj,bigscreenId)
|
|
|
})
|
|
|
}
|