xiaoxie
|
b20081ba74
|
全局布局调整补充：之前路由把两个播放器界面也加入全局样式，现在移出到一级路由
|
2022-04-21 13:46:16 +08:00 |
|
mk1990
|
c417adbc24
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-21 13:34:50 +08:00 |
|
648540858
|
c9909c4bc2
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
# Conflicts:
# web_src/src/components/UiHeader.vue
# web_src/src/components/devicePosition.vue
# web_src/src/components/live.vue
# web_src/src/router/index.js
|
2022-04-21 13:01:02 +08:00 |
|
648540858
|
3207f82308
|
Merge pull request #443 from hotcoffie/wvp-28181-2.0
前端路由组件化，同时界面样式美化微调
|
2022-04-21 12:52:36 +08:00 |
|
xiaoxie
|
fd1256acb1
|
全局样式适配三个隐藏页面
|
2022-04-21 12:45:27 +08:00 |
|
xiaoxie
|
5d8f68ede7
|
通道页适配全局样式
|
2022-04-21 12:39:09 +08:00 |
|
xiaoxie
|
7f62101dd3
|
1.重构全局页面结构，从之前每个页面独立绘制改为路由嵌套
2.全局页面样式优化，如滚动条、标题栏等
|
2022-04-21 12:33:10 +08:00 |
|
648540858
|
9cc875a0f8
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
|
2022-04-21 10:30:46 +08:00 |
|
648540858
|
aaaf1f89a9
|
Merge pull request #441 from hotcoffie/wvp-28181-2.0
修复前端一处v-for没有key的警告
|
2022-04-21 10:29:44 +08:00 |
|
xiaoxie
|
778aa4fb0c
|
修复实时监控页面，左侧菜单越界显示问题
|
2022-04-21 10:11:08 +08:00 |
|
hotcoffie
|
a9ba4d79c0
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-21 10:04:50 +08:00 |
|
xiaoxie
|
d6c11e5aa6
|
修复前端一处v-for没有key的警告
|
2022-04-21 10:03:21 +08:00 |
|
648540858
|
4a7a51cedf
|
添加公共组件设备树
|
2022-04-20 18:21:18 +08:00 |
|
648540858
|
702729b3d2
|
Merge pull request #439 from hotcoffie/wvp-28181-2.0
增强查询录像列表接口兼容性
|
2022-04-20 14:16:10 +08:00 |
|
xiaoxie
|
0ee1eb4274
|
修复录像列表：实测部分厂家（TP-Link IPC43AW）录像列表接口，返回的xml报文数据中有多余的空格，导致解析String为Integer失败，增加trim修复这个问题
|
2022-04-20 13:56:30 +08:00 |
|
648540858
|
57fc99f7de
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
|
2022-04-20 09:38:09 +08:00 |
|
648540858
|
fbd693faa5
|
优化国标级联目录推送，支持zlm新特性ssrc校验
|
2022-04-19 11:52:03 +08:00 |
|
648540858
|
d43050bee9
|
Merge pull request #437 from hotcoffie/wvp-28181-2.0
优化摄像头注册流程
|
2022-04-19 10:36:21 +08:00 |
|
648540858
|
1f25cabc83
|
添加行政区划功能，修复目录发送数量统计的BUG
|
2022-04-18 17:38:49 +08:00 |
|
648540858
|
4f2c6c9fc1
|
添加国标级联目录分组分组加快通道传输速度
|
2022-04-18 16:16:49 +08:00 |
|
xiaoxie
|
f83123f868
|
优化摄像头注册流程
|
2022-04-18 15:04:22 +08:00 |
|
648540858
|
2d7a571832
|
修复更新通道状态回复不准的问题
|
2022-04-18 12:55:54 +08:00 |
|
648540858
|
15b36e7be6
|
修复更新通道日志显示
|
2022-04-18 12:45:19 +08:00 |
|
648540858
|
4e49266020
|
修复更新通道结束后释放慢的问题
|
2022-04-18 12:42:58 +08:00 |
|
648540858
|
ab98fd60d9
|
修复级联编辑页面开关的重置
|
2022-04-18 11:45:53 +08:00 |
|
648540858
|
b63310c3cf
|
添加自动拉起未推流设备的控制开关
|
2022-04-18 10:52:38 +08:00 |
|
mk1990
|
bdba2b8f5a
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-04-18 09:32:20 +08:00 |
|
648540858
|
c0149f7bb4
|
优化通道同步添加对SN的判断，精简代码
|
2022-04-17 19:48:05 +08:00 |
|
648540858
|
35b0f46bb4
|
接收所有notify请求，即使没有订阅
|
2022-04-15 18:04:19 +08:00 |
|
mk1990
|
7ee33172a5
|
同步使用临时方案解决更新通道调用百度API问题之前的内容
|
2022-04-15 17:05:26 +08:00 |
|
648540858
|
7e35b85d91
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/SubscribeListenerForPlatform.java
|
2022-04-15 09:37:33 +08:00 |
|
648540858
|
8115b025c6
|
优化级联移动位置订阅位置更新
|
2022-04-14 16:52:48 +08:00 |
|
648540858
|
a0769da07c
|
优化级联移动位置订阅位置更新
|
2022-04-13 17:59:21 +08:00 |
|
648540858
|
7026d76310
|
异步通道刷新，优化ui效果
|
2022-04-12 21:06:21 +08:00 |
|
648540858
|
624975bc85
|
优化通道刷新
|
2022-04-12 11:04:08 +08:00 |
|
648540858
|
fd8c4146e1
|
使用临时方案解决更新通道调用百度API问题
|
2022-04-11 15:30:49 +08:00 |
|
648540858
|
dc1b11895e
|
默认推流通道始终在线
|
2022-04-11 14:59:31 +08:00 |
|
648540858
|
2bed57fe02
|
优化地图-添加地图页面以及设备树
|
2022-04-08 18:09:23 +08:00 |
|
648540858
|
504e99869a
|
修复停止推流的参数组织方式
|
2022-04-08 16:30:39 +08:00 |
|
648540858
|
4acd622933
|
优化订阅信息的发送与取消订阅
|
2022-04-08 14:44:49 +08:00 |
|
648540858
|
24b1c28efd
|
添加日志
|
2022-04-07 15:41:46 +08:00 |
|
648540858
|
8913b2022b
|
补充xml缺失的编码信息
|
2022-04-07 14:22:41 +08:00 |
|
648540858
|
7227e33099
|
补充xml缺失的编码信息
|
2022-04-07 14:21:21 +08:00 |
|
648540858
|
897db7c042
|
补充建表sql
|
2022-04-06 11:18:35 +08:00 |
|
648540858
|
605aa9c7f9
|
修复重启服务后拉流代理回复失败的问题
|
2022-04-06 11:07:42 +08:00 |
|
648540858
|
18447bc941
|
Merge pull request #419 from nikmu/wvp-28181-2.0
目录订阅推送问题，在线事件发送问题
|
2022-04-02 18:23:50 +08:00 |
|
648540858
|
2b77f5585b
|
修复实时监控无法播放问题 #427
|
2022-04-02 18:19:12 +08:00 |
|
648540858
|
1f8015e8a2
|
修复启动报错
|
2022-04-02 17:09:33 +08:00 |
|
648540858
|
db0044ec4c
|
Merge pull request #426 from J1031/bugfix/map_modification_exception
修复ConcurrentModificationException
|
2022-04-02 14:34:41 +08:00 |
|
648540858
|
68dd698d99
|
支持级联云台控制
|
2022-04-02 14:13:32 +08:00 |
|