XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化通道更新逻辑

Browse Source
This commit is contained in:
648540858
2021-12-28 18:54:50 +08:00
parent 7241e0d2d2
commit 726963ba77
12 changed files with 14444 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web_src/src/components/DeviceList.vue
View File

@@ -196,16 +196,16 @@
url: '/api/device/query/devices/' + itemData.deviceId + '/sync'
}).then(function(res) {
console.log("刷新设备结果："+JSON.stringify(res));
if (!res.data.deviceId) {
if (res.data.code !==0) {
that.$message({
showClose: true,
message: res.data,
message: res.data.msg,
type: 'error'
});
}else{
that.$message({
showClose: true,
message: '请求成功',
message: res.data.msg,
type: 'success'
});
}

2
web_src/src/components/PushVideoList.vue
View File

@@ -35,7 +35,7 @@
<el-table-column label="操作" width="360" align="center" fixed="right">
<template slot-scope="scope">
<el-button-group>
<el-button size="mini" icon="el-icon-video-play" v-if="scope.row.status" @click="playPuhsh(scope.row)">播放</el-button>
<el-button size="mini" icon="el-icon-video-play" v-if="(scope.row.status == false && scope.row.gbId == null) || scope.row.status" @click="playPuhsh(scope.row)">播放</el-button>
<el-button size="mini" icon="el-icon-switch-button" type="danger" @click="stopPuhsh(scope.row)">移除</el-button>
<el-button size="mini" icon="el-icon-position" type="primary" v-if="!!!scope.row.gbId" @click="addToGB(scope.row)">加入国标</el-button>
<el-button size="mini" icon="el-icon-position" type="primary" v-if="!!scope.row.gbId" @click="removeFromGB(scope.row)">移出国标</el-button>

12
web_src/src/components/dialog/chooseChannelForGb.vue
View File

@@ -71,7 +71,7 @@ export default {
channelType: "",
online: "",
choosed: "",
currentPage: 0,
currentPage: 1,
count: 10,
total: 0,
eventEnanle: false
@@ -82,7 +82,7 @@ export default {
platformId(newData, oldData){
console.log(newData)
this.initData()
},
},
methods: {
@@ -126,7 +126,7 @@ export default {
delete that.gbChoosechannel[key]
}
}
var oldKeys = Object.keys(that.gbChoosechannel);
if (oldKeys.length > 0) {
for (let i = 0; i < oldKeys.length; i++) {
@@ -134,7 +134,7 @@ export default {
delData.push(that.gbChoosechannel[key])
}
}
}else{
var oldKeys = Object.keys(that.gbChoosechannel);
if (oldKeys.length > 0) {
@@ -184,7 +184,7 @@ export default {
this.$axios({
method:"get",
url:`/api/platform/channel_list`,
url:`/api/platform/channel_list`,
params: {
page: that.currentPage,
count: that.count,
@@ -211,7 +211,7 @@ export default {
that.$refs.gbChannelsTable.toggleRowSelection(row, true);
chooseGBS.push(row)
that.gbChoosechannel[row.deviceId+ "_" + row.channelId] = row;
}
}
that.eventEnanle = true;

10
web_src/src/components/dialog/chooseChannelForStream.vue
View File

@@ -49,7 +49,7 @@ export default {
channelType: "",
online: "",
choosed: "",
currentPage: 0,
currentPage: 1,
count: 10,
total: 0,
eventEnanle: false
@@ -60,7 +60,7 @@ export default {
platformId(newData, oldData){
console.log(newData)
this.initData()
},
},
methods: {
@@ -104,7 +104,7 @@ export default {
delete that.gbChoosechannel[key]
}
}
var oldKeys = Object.keys(that.gbChoosechannel);
if (oldKeys.length > 0) {
for (let i = 0; i < oldKeys.length; i++) {
@@ -112,7 +112,7 @@ export default {
delData.push(that.gbChoosechannel[key])
}
}
}else{
var oldKeys = Object.keys(that.gbChoosechannel);
if (oldKeys.length > 0) {
@@ -191,7 +191,7 @@ export default {
that.$refs.gbStreamsTable.toggleRowSelection(row, true);
chooseGBS.push(row)
that.gbChoosechannel[row.app+ "_" + row.stream] = row;
}
}
that.eventEnanle = true;