Commit Graph

249 Commits

Author SHA1 Message Date
mrjackwang
6a77a7ded7 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-03-10 21:00:42 +08:00
dengming
1a1394bf9d 修复云端录像播放和下载路径错误的问题 2022-03-10 11:33:51 +08:00
mrjackwang
d58fd269e8 Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 2022-03-07 09:01:14 +08:00
李防
a1cb002609 修改3个小bug 2022-03-05 17:05:05 +08:00
mrjackwang
f1e5218a6a Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-03-04 20:37:17 +08:00
648540858
922d61c781 Merge remote-tracking branch 'origin/wvp-pro-record' into wvp-28181-2.0
# Conflicts:
#	web_src/src/components/control.vue
2022-03-04 15:29:56 +08:00
mrjackwang
0e4c22f72a Merge branch 'wvp-28181-2.0' into wvp-28181-2.0 2022-03-03 19:52:16 +08:00
648540858
1527b0e839 国标录像支持多端同时播放 2022-03-03 15:57:28 +08:00
panll
2f06d3152a !6 update web_src/src/components/dialog/changePassword.vue.
Merge pull request !6 from lanss/N/A
2022-03-02 06:27:57 +00:00
648540858
cf5a8515df Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0 2022-03-01 17:48:21 +08:00
648540858
ac56757291 支持删除在线设备 2022-02-28 17:56:27 +08:00
mrjackwang
fa9073d0f3 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-02-27 18:09:24 +08:00
wangyimeng
45ca3a6808 增加拉流代理修改功能 2022-02-26 11:14:56 +08:00
walkTtalk
9dcb270efd Fix issue #347: 修改前端启动报错 2022-02-26 00:01:35 +08:00
648540858
bd4f730d79 规范数据库,解决bug 2022-02-25 20:33:02 +08:00
648540858
48fac476dc 同步主线 2022-02-23 21:55:46 +08:00
648540858
b1ff3773a4 规范数据库,给各个标设置主键ID 2022-02-22 11:44:56 +08:00
648540858
479a07f879 兼容海康不规范的xml,大幅度提高通道分页查询速度,优化节点的保活。 2022-02-20 16:22:43 +08:00
648540858
016989d46a 优化级联平台删除 2022-02-17 15:33:25 +08:00
648540858
58f40d5963 添加通道导入实例文件 2022-02-15 17:52:37 +08:00
648540858
84bebc2bd1 优化级联添加通道流程 2022-02-15 17:41:09 +08:00
648540858
ba7a73a13f Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0 2022-02-15 09:13:16 +08:00
648540858
d8e8ff0da2 优化列表展示 2022-02-11 16:46:58 +08:00
648540858
4a6eed9459 推流导入支持添加平台信息与目录信息 2022-02-11 16:45:06 +08:00
朱俊杰
3789e8616f 新增实时监控功能
左边是设备通道树,右边是分屏预览
2022-02-10 14:45:33 +08:00
648540858
8cbbf1470b 为推流列表增加批量移除功能 2022-02-07 18:30:43 +08:00
648540858
d3d42ef9bd 为推流列表增加搜索功能 2022-02-07 14:12:34 +08:00
648540858
c494a7516b 优化媒体服务器配置展示界面 2022-01-30 16:39:15 +08:00
648540858
f3ab9b0b9c 优化信令配置展示界面 2022-01-30 15:58:15 +08:00
648540858
607b0f710e 添加重启后拉流代理自动恢复 2022-01-27 18:08:19 +08:00
lanss
8eca76a2bc update web_src/src/components/dialog/changePassword.vue. 2022-01-25 13:50:22 +00:00
648540858
cd422ddbe9 优化默认节点的展示 2022-01-25 20:21:36 +08:00
648540858
e57dc37e50 优化目录移除时默认目录的选择 2022-01-25 17:14:10 +08:00
648540858
b01b5540b5 修复候选通道查询bug 2022-01-25 12:20:52 +08:00
648540858
963cc1b4b3 优化通道选择是通道的查询 2022-01-21 18:00:15 +08:00
648540858
e1b91ad517 修改mysql脚本 2022-01-21 16:05:02 +08:00
648540858
4a87514e4a 目录默认节点被删除时,重置默认节点为根节点 2022-01-21 14:10:49 +08:00
648540858
63aa34be19 处理服务重启或设备重新上线时的订阅,优化通道导入重复的处理 2022-01-20 16:48:30 +08:00
648540858
41cec21a25 修复bug与目录订阅添加最小值60 2022-01-19 10:23:52 +08:00
648540858
6257644c73 优化级联选择通道页面目录Id在各个模块间的传递方式 2022-01-17 17:19:47 +08:00
648540858
194f901847 优化级联选择通道页面添加方式 2022-01-17 16:46:28 +08:00
648540858
88580908b1 优化通道选择页面样式和优化拉框放大与缩小的接口路径 2022-01-17 10:16:58 +08:00
648540858
aba2553f4a 优化通道选择页面样式 2022-01-17 09:41:43 +08:00
648540858
70c613e509 支持推流通道预导入 2022-01-16 10:40:57 +08:00
648540858
2661f47ca6 支持国标级联的目录订阅功能 2022-01-14 17:04:26 +08:00
648540858
0949c2f4cc 合并主分支 2022-01-13 16:39:32 +08:00
648540858
59890314e4 优化通道更新 2022-01-13 16:24:37 +08:00
lin
2c3611b436 添加接收redis订阅的GPS消息,为GPS订阅发送到级联平台做准备 2022-01-07 19:37:05 +08:00
648540858
0c964e9e70 为级联平台增加虚拟目录功能 2022-01-05 15:23:14 +08:00
648540858
f64016a6c7 优化通道更新逻辑 2021-12-28 18:54:50 +08:00