diff --git a/dist.zip b/dist.zip
index 7ad1f48..df8b640 100644
Binary files a/dist.zip and b/dist.zip differ
diff --git a/src/views/roadwayManage/index.vue b/src/views/roadwayManage/index.vue
index 4c30728..376a6f0 100644
--- a/src/views/roadwayManage/index.vue
+++ b/src/views/roadwayManage/index.vue
@@ -72,6 +72,10 @@ const columns = [
title: 'PLC-ID',
dataIndex: 'plcId',
},
+ {
+ title: '光源IP',
+ dataIndex: 'lightSourceIp',
+ },
{
title: '左货架类型',
dataIndex: 'leftType',
diff --git a/src/views/roadwayManage/model.vue b/src/views/roadwayManage/model.vue
index 2081ea8..dcb6d1b 100644
--- a/src/views/roadwayManage/model.vue
+++ b/src/views/roadwayManage/model.vue
@@ -38,6 +38,18 @@
/>
+
@@ -242,6 +254,8 @@ export default {
plcId: newVal.plcId,
plcIp: newVal.plcIp,
plcPort: newVal.plcPort,
+ lightSourceIp: newVal.lightSourceIp,
+ lightSourcePort: newVal.lightSourcePort,
leftType: newVal.leftType === null ? '' : newVal.leftType === 0 ? '单伸' : '双伸',
leftRow: newVal.leftRow,
leftColumn: newVal.leftColumn,
diff --git a/src/views/videoWall/index.vue b/src/views/videoWall/index.vue
index 14dc112..3b261ac 100644
--- a/src/views/videoWall/index.vue
+++ b/src/views/videoWall/index.vue
@@ -34,7 +34,8 @@ export default {
videoH: 0,
isFullscreen: false,
originHeight: 0,
- fullHeight: 0
+ fullHeight: 0,
+ players: []
}
},
//watch: {},
@@ -43,6 +44,9 @@ export default {
return( this.clientHeight/ this.row ) + 'px';
}
},
+ destroyed() {
+ this.destory()
+ },
mounted () {
this.getWallStyle();
@@ -111,14 +115,19 @@ export default {
console.log("idName:"+idName);
let video = document.getElementById(idName);
let player = new WebRtcPlayer(video,"camera"+cameras[i-1].id);
- //player.play('camera'+cameras[i-1].id);
-
+ this.players.push(player);
}
}
}).catch(err => {
console.log(err)
})
},
+ destory(){
+ for(let player of this.players){
+ console.log("stop")
+ player.destroy()
+ }
+ },
full () {
if(this.isFullscreen){