|
@@ -34,13 +34,17 @@
|
|
<div class="signal_item_bg">
|
|
<div class="signal_item_bg">
|
|
<div class="signal_item_bg_body">
|
|
<div class="signal_item_bg_body">
|
|
<div class="signal_item_bg_body_space">
|
|
<div class="signal_item_bg_body_space">
|
|
- <!--<div style="height:100%" v-show="item.preview" :ref="item.ID">
|
|
|
|
- <VideoPlayer
|
|
|
|
|
|
+ <div style="height:102px" :ref="item.ID" v-show="item.preview">
|
|
|
|
+ <!--<VideoPlayer
|
|
:options="videoPlayObj2[item.sourceId]"
|
|
:options="videoPlayObj2[item.sourceId]"
|
|
:playsinline="true"
|
|
:playsinline="true"
|
|
:style="scaleFun(item)"
|
|
:style="scaleFun(item)"
|
|
|
|
+ />-->
|
|
|
|
+
|
|
|
|
+ <ckplayer2
|
|
|
|
+ :previewUrl="item.previewUrl"
|
|
/>
|
|
/>
|
|
- </div>-->
|
|
|
|
|
|
+ </div>
|
|
</div>
|
|
</div>
|
|
<div class="signal_item_bg_body_font">{{item.deviceName}}</div>
|
|
<div class="signal_item_bg_body_font">{{item.deviceName}}</div>
|
|
</div>
|
|
</div>
|
|
@@ -54,6 +58,7 @@
|
|
import draggable from 'vuedraggable'
|
|
import draggable from 'vuedraggable'
|
|
import {getStaticFile} from "../../utils/tools"
|
|
import {getStaticFile} from "../../utils/tools"
|
|
import VideoPlayer from "./player"
|
|
import VideoPlayer from "./player"
|
|
|
|
+ import ckplayer2 from "./ckplayerSignalList"
|
|
|
|
|
|
export default {
|
|
export default {
|
|
data() {
|
|
data() {
|
|
@@ -65,7 +70,8 @@
|
|
|
|
|
|
components: {
|
|
components: {
|
|
draggable,
|
|
draggable,
|
|
- VideoPlayer
|
|
|
|
|
|
+ VideoPlayer,
|
|
|
|
+ ckplayer2
|
|
},
|
|
},
|
|
|
|
|
|
async beforeCreate() {
|
|
async beforeCreate() {
|
|
@@ -113,8 +119,6 @@
|
|
let len = bigscreenObj[evt.to.id] ? bigscreenObj[evt.to.id].signalArr.length : 0
|
|
let len = bigscreenObj[evt.to.id] ? bigscreenObj[evt.to.id].signalArr.length : 0
|
|
const count = evt.newIndex + 1 - len > 0 ? evt.newIndex + 1 - len : 1
|
|
const count = evt.newIndex + 1 - len > 0 ? evt.newIndex + 1 - len : 1
|
|
|
|
|
|
- console.log(evt,'-----------',count)
|
|
|
|
-
|
|
|
|
// 更新当前拖拽的位置
|
|
// 更新当前拖拽的位置
|
|
this.$store.dispatch('updatePositionNum', count)
|
|
this.$store.dispatch('updatePositionNum', count)
|
|
},
|
|
},
|