diff --git a/src/views/checkManage/Subsection.vue b/src/views/checkManage/Subsection.vue index 7268d1f..751a1b2 100644 --- a/src/views/checkManage/Subsection.vue +++ b/src/views/checkManage/Subsection.vue @@ -22,7 +22,8 @@ - + + 0 ? 1 : 0); }, random() { + return { + row: this.getRandomRow(this.select.row), column: this.getRandomColumn(this.select.column), } @@ -117,6 +120,9 @@ export default { destroyed() { }, methods: { + changeTab(){ + console.log("latticeRow"+this.latticeRow) + }, // 获取行或列的范围字符串 getRandom(index, lattice, num, total) { if(index !== lattice) { @@ -166,36 +172,41 @@ export default { // } }, async getStatus() { + console.log( "column"+this.latticeColumn) + console.log( "row"+this.latticeRow) // for(let i = 1 ; i++; i < this.latticeRow) { - // let rowColumn = this.getRandomRow(i); - // this.status.row[i] = this.fragmentStatus('row', i); + // let r = this.getRandomRow(i); + // console.log(r) + // //this.status.row[i] = this.fragmentStatus('row', i); // } - // + // for(let i = 1 ; i++; i < this.latticeColumn) { // let rowColumn = this.getRandomColumn(i); // this.status.column[i] = this.fragmentStatus('column', i); // } - for(let row = 1; row <= this.total.row; row++) { - for(let column = 1; column <= this.total.column; column++) { - let status = (this.stockInfo[`${row}-${column}`] || {}).status || 0; - if(status < 2) { - // 当前是在第几段 - let latticeRow = parseInt(row / this.nums.row) + (row % this.nums.row > 0 ? 1 : 0); - let latticeColumn = parseInt(column / this.nums.column) + (column % this.nums.column > 0 ? 1 : 0); - if(status === 1) { - console.log('第几段', latticeRow, latticeColumn); - console.log(row, column,status); - this.$set(this.status.row, latticeRow, status); - this.$set(this.status.column, latticeColumn, status); - }else { - if(!this.status.row[latticeRow]) this.$set(this.status.row, latticeRow, status); - if(!this.status.column[latticeColumn]) this.$set(this.status.column, latticeColumn, status); - } - } - } - } - console.log(this.status); + // for(let row = 1; row <= this.total.row; row++) { + + // for(let column = 1; column <= this.total.column; column++) { + + // let status = (this.stockInfo[`${row}-${column}`] || {}).status || 0; + // if(status < 2) { + // // 当前是在第几段 + // let latticeRow = parseInt(row / this.nums.row) + (row % this.nums.row > 0 ? 1 : 0); + // let latticeColumn = parseInt(column / this.nums.column) + (column % this.nums.column > 0 ? 1 : 0); + // if(status === 1) { + // console.log('第几段', latticeRow, latticeColumn); + // console.log(row, column,status); + // this.$set(this.status.row, latticeRow, status); + // this.$set(this.status.column, latticeColumn, status); + // }else { + // if(!this.status.row[latticeRow]) this.$set(this.status.row, latticeRow, status); + // if(!this.status.column[latticeColumn]) this.$set(this.status.column, latticeColumn, status); + // } + // } + // } + // } + // console.log(this.status); }, } } diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue index 72daccb..d031934 100644 --- a/src/views/checkManage/index.vue +++ b/src/views/checkManage/index.vue @@ -193,7 +193,7 @@ export default { }).then(res => { this.data = res.data.list; this.select = res.data.list[0].id - this.getStockList(res.data.list[0].id) + //this.getStockList(res.data.list[0].id) this.getStreetDetail(res.data.list[0].id); this.getStockRowColumn(); }).catch(err => { @@ -225,10 +225,10 @@ export default { leftShelveId, rightShelveId }; - this.$api.httpNodeApi.getStockRowColumnAPI({params}).then(({data})=>{ - this.$set(this, 'stockInfo', data); - // this.stockInfo = data; - }); + // this.$api.httpNodeApi.getStockRowColumnAPI({params}).then(({data})=>{ + // this.$set(this, 'stockInfo', data); + // // this.stockInfo = data; + // }); } this.timer && clearInterval(this.timer); init(); @@ -254,23 +254,23 @@ export default { }) }, //获取盘点列表 - getStockList(streetId) { - this.$api.httpApi.getStockList({ - params: { - streetId: streetId, - } - }).then(res => { - this.checkList = res.data - }).catch(err => { + // getStockList(streetId) { + // this.$api.httpApi.getStockList({ + // params: { + // streetId: streetId, + // } + // }).then(res => { + // this.checkList = res.data + // }).catch(err => { - }); - }, + // }); + // }, handleChange(value) { console.error('handleChange'); console.log(value) this.select = value this.getStreetDetail(value) - this.getStockList(value); + //this.getStockList(value); this.getStockRowColumn() }, tocheckOperation(checkObj, item) { diff --git a/src/views/realTimeMonitoring/VideoPlayer.vue b/src/views/realTimeMonitoring/VideoPlayer.vue deleted file mode 100644 index ac04300..0000000 --- a/src/views/realTimeMonitoring/VideoPlayer.vue +++ /dev/null @@ -1,157 +0,0 @@ - - - - - diff --git a/src/views/realTimeMonitoring/VideoPlayerBak.vue b/src/views/realTimeMonitoring/VideoPlayerBak.vue deleted file mode 100644 index cb3313b..0000000 --- a/src/views/realTimeMonitoring/VideoPlayerBak.vue +++ /dev/null @@ -1,157 +0,0 @@ - - - - - diff --git a/src/views/realTimeMonitoring/index.vue b/src/views/realTimeMonitoring/index.vue index bc1b10c..dfee5d4 100644 --- a/src/views/realTimeMonitoring/index.vue +++ b/src/views/realTimeMonitoring/index.vue @@ -11,6 +11,7 @@ :key="index" :style="{ height: videoHeight, + marginBottom: ((selectTab.videoStyleRow * selectTab.videoStyleColumn - index - 1) >= selectTab.videoStyleColumn) ? '20px': 0 }" > @@ -18,7 +19,7 @@ :style="{ height: videoHeight, }" - style="width: 100%;object-fit: cover;" + :id="`camera${item.id}`" autoplay muted > @@ -100,7 +101,10 @@ export default { tabsChange(key) { sessionStorage.setItem('tabKey', key) - this.autoPlay() + this.$nextTick(() => { + this.autoPlay() + }) + }, showModel(item) { this.$nextTick(() => { diff --git a/src/views/realTimeMonitoring/webrtcplayer.js b/src/views/realTimeMonitoring/webrtcplayer.js index f3e5260..a54e44f 100644 --- a/src/views/realTimeMonitoring/webrtcplayer.js +++ b/src/views/realTimeMonitoring/webrtcplayer.js @@ -54,14 +54,12 @@ class WebRtcPlayer { }); this.webrtc.onconnectionstatechange = () => { - if(this.webrtc.connectionState == 'connected' || this.webrtc.connectionState == 'connecting'){ - - }else{ - console.log(this.webrtc.connectionState) - this.load(this.uuid); - } - + if(this.webrtc.connectionState == 'connected' || this.webrtc.connectionState == 'connecting'){ + }else{ + console.log(this.webrtc.connectionState) + this.load(this.uuid); } + } } async handleNegotiationNeeded() {