Commit d68f9c813341afa82726e6182cca8af61248fc5e
1 parent
5b0b17d7
修复选择直播通道缺失了通道类型的问题
Showing
2 changed files
with
2 additions
and
1 deletions
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
| @@ -84,6 +84,7 @@ public class StreamPushServiceImpl implements IStreamPushService { | @@ -84,6 +84,7 @@ public class StreamPushServiceImpl implements IStreamPushService { | ||
| 84 | streamPushItem.setCreateStamp(item.getCreateStamp()); | 84 | streamPushItem.setCreateStamp(item.getCreateStamp()); |
| 85 | streamPushItem.setAliveSecond(item.getAliveSecond()); | 85 | streamPushItem.setAliveSecond(item.getAliveSecond()); |
| 86 | streamPushItem.setStatus(true); | 86 | streamPushItem.setStatus(true); |
| 87 | + streamPushItem.setStreamType("push"); | ||
| 87 | streamPushItem.setVhost(item.getVhost()); | 88 | streamPushItem.setVhost(item.getVhost()); |
| 88 | return streamPushItem; | 89 | return streamPushItem; |
| 89 | } | 90 | } |
web_src/src/components/PushVideoList.vue
| @@ -35,7 +35,7 @@ | @@ -35,7 +35,7 @@ | ||
| 35 | <el-table-column label="操作" width="360" align="center" fixed="right"> | 35 | <el-table-column label="操作" width="360" align="center" fixed="right"> |
| 36 | <template slot-scope="scope"> | 36 | <template slot-scope="scope"> |
| 37 | <el-button-group> | 37 | <el-button-group> |
| 38 | - <el-button size="mini" icon="el-icon-video-play" @click="playPuhsh(scope.row)">播放</el-button> | 38 | + <el-button size="mini" icon="el-icon-video-play" v-if="scope.row.status" @click="playPuhsh(scope.row)">播放</el-button> |
| 39 | <el-button size="mini" icon="el-icon-switch-button" type="danger" @click="stopPuhsh(scope.row)">移除</el-button> | 39 | <el-button size="mini" icon="el-icon-switch-button" type="danger" @click="stopPuhsh(scope.row)">移除</el-button> |
| 40 | <el-button size="mini" icon="el-icon-position" type="primary" v-if="!!!scope.row.gbId" @click="addToGB(scope.row)">加入国标</el-button> | 40 | <el-button size="mini" icon="el-icon-position" type="primary" v-if="!!!scope.row.gbId" @click="addToGB(scope.row)">加入国标</el-button> |
| 41 | <el-button size="mini" icon="el-icon-position" type="primary" v-if="!!scope.row.gbId" @click="removeFromGB(scope.row)">移出国标</el-button> | 41 | <el-button size="mini" icon="el-icon-position" type="primary" v-if="!!scope.row.gbId" @click="removeFromGB(scope.row)">移出国标</el-button> |