Skip to content

Commit

Permalink
Merge pull request #8 from bosscheng/master
Browse files Browse the repository at this point in the history
fix bug
  • Loading branch information
bosscheng authored Nov 20, 2020
2 parents a758a77 + 2d61fc6 commit 70f2c64
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 61 deletions.
56 changes: 30 additions & 26 deletions ui/dist/plugin-gb28181.common.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ui/dist/plugin-gb28181.common.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ui/dist/plugin-gb28181.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 30 additions & 26 deletions ui/dist/plugin-gb28181.umd.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ui/dist/plugin-gb28181.umd.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ui/dist/plugin-gb28181.umd.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ui/dist/plugin-gb28181.umd.min.js.map

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions ui/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,14 @@
this.Devices.sort((a, b) => (a.ID > b.ID ? 1 : -1));
let channelList =[]
this.Devices.forEach((device)=>{
const channels = device.Channels;
channelList = channelList.concat(channels);
const channels = device.Channels || [];
if(channels.length > 0){
channelList = channelList.concat(channels);
}
});
this.channelList = channelList;
if(channelList.length > 0){
this.channelList = channelList;
}
};
this.$once("hook:destroyed", () => listES.close());
},
Expand Down

0 comments on commit 70f2c64

Please sign in to comment.