From c79b7a97434ae4694c176ca81b532d24052099b0 Mon Sep 17 00:00:00 2001 From: lin <648540858@qq.com> Date: Thu, 3 Jul 2025 06:45:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0README=E5=92=8C=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + doc/_content/ability/push.md | 3 +++ 2 files changed, 4 insertions(+) diff --git a/README.md b/README.md index 725a2b0ef..df790af01 100644 --- a/README.md +++ b/README.md @@ -132,6 +132,7 @@ https://gitee.com/pan648540858/wvp-GB28181-pro.git - [X] 支持电子地图。支持展示通道位置，支持在地图上修改通道位置。可扩展接入高德地图API，支持搜索位置，附近设备。 - [X] 支持表格导出 - [X] 拉流代理支持按照品牌拼接url。 + - [X] 播放鉴权，更加安全。 - [X] 功能持续扩展，可根据用户需要增加支持。 diff --git a/doc/_content/ability/push.md b/doc/_content/ability/push.md index cc568b3c8..8998a4b75 100644 --- a/doc/_content/ability/push.md +++ b/doc/_content/ability/push.md @@ -18,6 +18,9 @@ WVP支持三种图像输入方式，直播，[拉流代理](_content/ability/pro 1. 默认情况下WVP收到推流信息后，列表中出现这条推流信息，如果你需要共享推流信息到其他国标平台,那么你需要编辑/国标通道配置,配置国标编码. 2. WVP也支持推流前导入大量通道直接推送给上级，点击“下载模板”按钮，根据示例修改模板后，点击“通道导入”按钮导入通道数据. +## 生成推流地址 +可以在推流列表里点击‘生成推流地址’按钮，得到新地址后直接复制到推流设备。 + ## 推拉流鉴权规则 为了保护服务器的WVP默认开启推流鉴权（目前不支持关闭此功能） From eddf20e62aa013d1a06673f3ccf62ad178baae64 Mon Sep 17 00:00:00 2001 From: lin <648540858@qq.com> Date: Fri, 4 Jul 2025 14:21:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=88=86=E7=BB=84=E5=8F=B3=E9=94=AE=E6=B7=BB=E5=8A=A0=E8=AE=BE?= =?UTF-8?q?=E5=A4=87BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/views/common/GroupTree.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/views/common/GroupTree.vue b/web/src/views/common/GroupTree.vue index 2179a81ed..d22c09a02 100755 --- a/web/src/views/common/GroupTree.vue +++ b/web/src/views/common/GroupTree.vue @@ -339,7 +339,7 @@ export default { for (let i = 0; i < rows.length; i++) { deviceIds.push(rows[i].id) } - this.$store.dispatch('group/add', { + this.$store.dispatch('commonChanel/addDeviceToGroup', { parentId: node.data.deviceId, businessGroup: node.data.businessGroup, deviceIds: deviceIds From 51cd14e02efb2526d2bf84105debda68390d4750 Mon Sep 17 00:00:00 2001 From: lin <648540858@qq.com> Date: Fri, 4 Jul 2025 14:36:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92?= =?UTF-8?q?=E6=88=96=E8=80=85=E4=B8=9A=E5=8A=A1=E5=88=86=E7=BB=84=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=80=9A=E9=81=93=E5=90=8E=E6=9B=B4=E6=96=B0=E5=8F=B3?= =?UTF-8?q?=E8=BE=B9=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/views/channel/group/index.vue | 7 +++++-- web/src/views/channel/region/index.vue | 6 ++++-- web/src/views/common/GroupTree.vue | 15 ++++----------- web/src/views/common/RegionTree.vue | 11 ++++------- 4 files changed, 17 insertions(+), 22 deletions(-) diff --git a/web/src/views/channel/group/index.vue b/web/src/views/channel/group/index.vue index 256171cec..1484b6031 100755 --- a/web/src/views/channel/group/index.vue +++ b/web/src/views/channel/group/index.vue @@ -5,7 +5,7 @@ :show-header="true" :edit="true" @clickEvent="treeNodeClickEvent" - :on-channel-change="onChannelChange" + @onChannelChange="onChannelChange" :enable-add-channel="true" :add-channel-to-group="addChannelToGroup" /> @@ -306,7 +306,10 @@ export default { }) }, onChannelChange: function(deviceId) { - // + + if (this.groupDeviceId === deviceId) { + this.getChannelList() + } }, showUnusualChanel: function() { this.$refs.unusualGroupChannelSelect.openDialog() diff --git a/web/src/views/channel/region/index.vue b/web/src/views/channel/region/index.vue index 367b6d335..9a846c65b 100755 --- a/web/src/views/channel/region/index.vue +++ b/web/src/views/channel/region/index.vue @@ -5,7 +5,7 @@ :show-header="true" :edit="true" @clickEvent="treeNodeClickEvent" - :on-channel-change="onChannelChange" + @onChannelChange="onChannelChange" :enable-add-channel="true" :add-channel-to-civil-code="addChannelToCivilCode" /> @@ -296,7 +296,9 @@ export default { console.log(selectedData) }, onChannelChange: function(deviceId) { - // + if (this.regionDeviceId === deviceId) { + this.getChannelList() + } } } } diff --git a/web/src/views/common/GroupTree.vue b/web/src/views/common/GroupTree.vue index d22c09a02..cb336db06 100755 --- a/web/src/views/common/GroupTree.vue +++ b/web/src/views/common/GroupTree.vue @@ -130,7 +130,7 @@ export default { GbChannelSelect, VueEasyTree, groupEdit, gbDeviceSelect }, - props: ['edit', 'enableAddChannel', 'onChannelChange', 'showHeader', 'hasChannel', 'addChannelToGroup', 'treeHeight'], + props: ['edit', 'enableAddChannel', 'showHeader', 'hasChannel', 'addChannelToGroup', 'treeHeight'], data() { return { props: { @@ -328,9 +328,7 @@ export default { .then(data => { node.parent.loaded = false node.parent.expand() - if (this.onChannelChange) { - this.onChannelChange(node.data.deviceId) - } + this.$emit('onChannelChange', node.data.deviceId) }) }, addChannelFormDevice: function(id, node) { @@ -349,10 +347,7 @@ export default { showClose: true, message: '保存成功' }) - if (this.onChannelChange) { - this.onChannelChange() - } - console.log(node) + this.$emit('onChannelChange', node.data.deviceId) node.loaded = false node.expand() }).finally(() => { @@ -372,9 +367,7 @@ export default { showClose: true, message: '保存成功' }) - if (this.onChannelChange) { - this.onChannelChange() - } + this.$emit('onChannelChange', node.data.deviceId) node.loaded = false node.expand() }).finally(() => { diff --git a/web/src/views/common/RegionTree.vue b/web/src/views/common/RegionTree.vue index 991396825..e51019059 100755 --- a/web/src/views/common/RegionTree.vue +++ b/web/src/views/common/RegionTree.vue @@ -131,7 +131,7 @@ export default { GbChannelSelect, VueEasyTree, regionEdit, gbDeviceSelect }, - props: ['edit', 'enableAddChannel', 'onChannelChange', 'showHeader', 'hasChannel', 'addChannelToCivilCode', 'treeHeight'], + props: ['edit', 'enableAddChannel', 'showHeader', 'hasChannel', 'addChannelToCivilCode', 'treeHeight'], data() { return { props: { @@ -331,6 +331,7 @@ export default { this.$store.dispatch('region/deleteRegion', node.data.id) .then((data) => { console.log('移除成功') + this.$emit('onChannelChange', node.data.deviceId) node.parent.loaded = false node.parent.expand() }).catch(function(error) { @@ -351,9 +352,7 @@ export default { showClose: true, message: '保存成功' }) - if (this.onChannelChange) { - this.onChannelChange() - } + this.$emit('onChannelChange', node.data.deviceId) node.loaded = false node.expand() }).catch(function(error) { @@ -375,9 +374,7 @@ export default { showClose: true, message: '保存成功' }) - if (this.onChannelChange) { - this.onChannelChange(node.data.deviceId) - } + this.$emit('onChannelChange', node.data.deviceId) node.loaded = false node.expand() }).catch(function(error) {