648540858
|
a8097c35da
|
更新readme
|
2022-05-07 14:44:00 +08:00 |
|
mk1990
|
88db57697a
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-07 11:25:13 +08:00 |
|
648540858
|
523139143f
|
Merge pull request #468 from TristingChen/resetQuery--add
开发----增加预置位查询接口开发
|
2022-05-07 09:00:22 +08:00 |
|
mk1990
|
a2182b5a7b
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-06 17:46:01 +08:00 |
|
chenjialing
|
cc63a52884
|
开发----增加预置位查询接口开发
|
2022-05-06 17:44:56 +08:00 |
|
648540858
|
e218553685
|
去除多与引用
|
2022-05-06 17:29:24 +08:00 |
|
648540858
|
afe2450a14
|
优化地图功能的开关
|
2022-05-06 16:01:36 +08:00 |
|
648540858
|
ee62f17170
|
统一userAgent
|
2022-05-06 15:55:32 +08:00 |
|
wangyimeng
|
04f938ef62
|
Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0
# Conflicts:
# bootstrap.sh
# web_src/package-lock.json
# web_src/static/js/jessibuca/decoder.wasm
|
2022-05-06 12:19:44 +08:00 |
|
wangyimeng
|
3469694ed1
|
1
|
2022-05-06 12:05:12 +08:00 |
|
wangyimeng
|
c8831bc58f
|
更新同步wvp
|
2022-05-06 11:56:29 +08:00 |
|
hotcoffie
|
bfaa519e49
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-06 10:59:33 +08:00 |
|
648540858
|
5d901b5e3f
|
使用阿里代码规范。规范代码写法
|
2022-05-06 10:12:34 +08:00 |
|
648540858
|
c286ecb455
|
使用阿里代码规范。规范代码写法
|
2022-05-05 17:07:16 +08:00 |
|
648540858
|
7f0ca85850
|
规范代码写法
|
2022-05-05 14:36:27 +08:00 |
|
648540858
|
ff3c30f32e
|
优化收到心跳设置设备上线的逻辑
|
2022-05-05 14:26:42 +08:00 |
|
mk1990
|
05a324a07a
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-05 08:43:10 +08:00 |
|
xiaoxie
|
c592740efa
|
升级shelljs，解决较高版本node打包时的警告
|
2022-05-01 21:33:56 +08:00 |
|
xiaoxie
|
260bfd5935
|
替换一个过时的API，解决maven打包警告
|
2022-05-01 21:32:43 +08:00 |
|
648540858
|
db865cc9cc
|
#453
|
2022-04-28 18:18:09 +08:00 |
|
648540858
|
c4a2854e1b
|
修复添加/修改节点页面的BUG
|
2022-04-28 17:58:47 +08:00 |
|
648540858
|
d679a9fcf8
|
添加对点播时设备自定义ssrc的支持
|
2022-04-28 17:28:51 +08:00 |
|
mk1990
|
a0537d74df
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-28 16:32:09 +08:00 |
|
648540858
|
f6fa1eed6c
|
Merge pull request #462 from hotcoffie/wvp-28181-2.0
多屏界面，切换分屏数时播放器正确调整尺寸
|
2022-04-28 14:43:07 +08:00 |
|
xiaoxie
|
e0d641064a
|
多屏界面，切换分屏数时播放器正确调整尺寸
|
2022-04-28 14:23:17 +08:00 |
|
648540858
|
2e90c7e7fe
|
Merge pull request #461 from hotcoffie/wvp-28181-2.0
修复多屏播放时播放器样式错位
|
2022-04-28 14:03:37 +08:00 |
|
648540858
|
a53fe7761f
|
Merge pull request #457 from J1031/bugfix/transaction_is_null
修复ServerTransaction空指针异常
|
2022-04-28 14:02:18 +08:00 |
|
xiaoxie
|
35b3d7618d
|
修复多屏播放时播放器样式错位
|
2022-04-28 13:40:26 +08:00 |
|
648540858
|
420a87cfd7
|
优化对Parental字段的判断
|
2022-04-28 10:05:56 +08:00 |
|
648540858
|
4e0a463f88
|
优化对Parental字段的判断
|
2022-04-28 09:47:46 +08:00 |
|
quangz
|
effe71640d
|
修复ServerTransaction空指针异常
|
2022-04-27 18:51:47 +08:00 |
|
648540858
|
102aad1f5d
|
判空
|
2022-04-26 18:46:18 +08:00 |
|
648540858
|
363606d845
|
优化级联目录发送
|
2022-04-26 18:29:47 +08:00 |
|
648540858
|
9ce22eba3c
|
行政区划作为级联数据的处理,修复设备树的显示
|
2022-04-26 17:24:41 +08:00 |
|
648540858
|
6c719556f5
|
Merge pull request #451 from itouxin/patch-1
修复docker运行配置WVP_CONFIG后，相关配置未生效的问题
|
2022-04-26 17:18:57 +08:00 |
|
648540858
|
62f5b3dfdd
|
Merge pull request #452 from hotcoffie/wvp-28181-2.0
优化播放器尺寸调节逻辑：
|
2022-04-26 17:18:45 +08:00 |
|
mk1990
|
c88b0a8bd6
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-26 15:32:23 +08:00 |
|
xiaoxie
|
5c1a5f7931
|
优化播放器尺寸调节逻辑：
1.播放器不会大于屏幕高度
2.增加灰色背景色区分播放区域
3.播放器居中
|
2022-04-26 15:03:44 +08:00 |
|
TouXin
|
1484c14130
|
Update DOCKERFILE
修复docker运行配置WVP_CONFIG后，相关配置未生效的问题
|
2022-04-26 14:32:02 +08:00 |
|
648540858
|
0b6b72ae44
|
多级虚拟组织处理修复
|
2022-04-25 17:13:22 +08:00 |
|
648540858
|
a012007f36
|
多级虚拟组织处理修复
|
2022-04-25 17:12:29 +08:00 |
|
648540858
|
26c3ca6a21
|
对于虚拟目录中出现多级虚拟组织的情况进行处理
|
2022-04-25 16:55:38 +08:00 |
|
648540858
|
d4b05c11c0
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-24 16:34:21 +08:00 |
|
648540858
|
5dc08a45f8
|
增加redis通知方式向设备/平台发送报警消息功能
|
2022-04-24 16:33:59 +08:00 |
|
648540858
|
9fb7246fec
|
Merge pull request #449 from hotcoffie/wvp-28181-2.0
修复一处日志打印错误
|
2022-04-24 14:52:01 +08:00 |
|
xiaoxie
|
bea61f909d
|
修复一处日志打印错误
|
2022-04-24 09:51:54 +08:00 |
|
648540858
|
7f965a6922
|
Merge pull request #448 from hotcoffie/wvp-28181-2.0
1.修正了播放地址无法正常播放视频的问题，包含两个错误：
|
2022-04-24 09:30:16 +08:00 |
|
xiaoxie
|
b81660536c
|
live页面,删除一个不再使用的一些变量和函数
|
2022-04-24 00:36:18 +08:00 |
|
xiaoxie
|
6e7cd084ee
|
live页面适配palyer组件的修改
|
2022-04-24 00:30:31 +08:00 |
|
xiaoxie
|
44b7f67a20
|
在1e2d207aea24b5956d5ece95ed4a9db0f59f34d7这个版本中，作者删除了initData函数，但是忘记删除mounted中的this.mounted() 导致console报错
|
2022-04-23 23:54:49 +08:00 |
|