648540858
|
1179a7ad02
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
3 years ago |
|
648540858
|
92421b46cc
|
支持关闭地图功能，添加授权声明
|
3 years ago |
|
648540858
|
909d08a9d9
|
Merge pull request #446 from 648540858/map
Map
|
3 years ago |
|
648540858
|
1e2d207aea
|
添加优化后的地图页面，完全一处百度地图相关的api
|
3 years ago |
|
xiaoxie
|
fc97febe1d
|
全局布局调整补充：之前路由把两个播放器界面也加入全局样式，现在移出到一级路由
|
3 years ago |
|
648540858
|
190fc62b72
|
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
|
3 years ago |
|
648540858
|
3501046ebe
|
Merge pull request #443 from hotcoffie/wvp-28181-2.0
前端路由组件化，同时界面样式美化微调
|
3 years ago |
|
xiaoxie
|
2735a7a98b
|
全局样式适配三个隐藏页面
|
3 years ago |
|
xiaoxie
|
5623b5ee0f
|
通道页适配全局样式
|
3 years ago |
|
xiaoxie
|
fb843d41c1
|
1.重构全局页面结构，从之前每个页面独立绘制改为路由嵌套
2.全局页面样式优化，如滚动条、标题栏等
|
3 years ago |
|
648540858
|
d7bfd9bfa7
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
|
3 years ago |
|
648540858
|
a0462055de
|
Merge pull request #441 from hotcoffie/wvp-28181-2.0
修复前端一处v-for没有key的警告
|
3 years ago |
|
xiaoxie
|
3def634a27
|
修复实时监控页面，左侧菜单越界显示问题
|
3 years ago |
|
hotcoffie
|
acd767b47a
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
3 years ago |
|
xiaoxie
|
4dcc7df555
|
修复前端一处v-for没有key的警告
|
3 years ago |
|
648540858
|
f7236c4a90
|
添加公共组件设备树
|
3 years ago |
|
648540858
|
7145ce07e6
|
Merge pull request #439 from hotcoffie/wvp-28181-2.0
增强查询录像列表接口兼容性
|
3 years ago |
|
xiaoxie
|
f635f9c300
|
修复录像列表：实测部分厂家（TP-Link IPC43AW）录像列表接口，返回的xml报文数据中有多余的空格，导致解析String为Integer失败，增加trim修复这个问题
|
3 years ago |
|
648540858
|
088419b4d8
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
|
3 years ago |
|
648540858
|
4d975c21da
|
优化国标级联目录推送，支持zlm新特性ssrc校验
|
3 years ago |
|
648540858
|
9466bf5863
|
Merge pull request #437 from hotcoffie/wvp-28181-2.0
优化摄像头注册流程
|
3 years ago |
|
648540858
|
91515f1b05
|
添加行政区划功能，修复目录发送数量统计的BUG
|
3 years ago |
|
648540858
|
93d69d5476
|
添加国标级联目录分组分组加快通道传输速度
|
3 years ago |
|
xiaoxie
|
6bb8f45e27
|
优化摄像头注册流程
|
3 years ago |
|
648540858
|
20622d20d6
|
修复更新通道状态回复不准的问题
|
3 years ago |
|
648540858
|
596a633d2e
|
修复更新通道日志显示
|
3 years ago |
|
648540858
|
b8bb9c1b74
|
修复更新通道结束后释放慢的问题
|
3 years ago |
|
648540858
|
c1f6401598
|
修复级联编辑页面开关的重置
|
3 years ago |
|
648540858
|
d36920c699
|
添加自动拉起未推流设备的控制开关
|
3 years ago |
|
648540858
|
0dc1807f62
|
优化通道同步添加对SN的判断，精简代码
|
3 years ago |
|
648540858
|
25102229f6
|
接收所有notify请求，即使没有订阅
|
3 years ago |
|
648540858
|
40a806329c
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/SubscribeListenerForPlatform.java
|
3 years ago |
|
648540858
|
e6ee7fe747
|
优化级联移动位置订阅位置更新
|
3 years ago |
|
648540858
|
efc4a7bc8e
|
优化级联移动位置订阅位置更新
|
3 years ago |
|
648540858
|
3955e6ed53
|
异步通道刷新，优化ui效果
|
3 years ago |
|
648540858
|
c2e2e24551
|
优化通道刷新
|
3 years ago |
|
648540858
|
40fb794798
|
使用临时方案解决更新通道调用百度API问题
|
3 years ago |
|
648540858
|
fcf8c40150
|
默认推流通道始终在线
|
3 years ago |
|
648540858
|
ba8633e99a
|
优化地图-添加地图页面以及设备树
|
3 years ago |
|
648540858
|
81f1b8ee25
|
修复停止推流的参数组织方式
|
3 years ago |
|
648540858
|
f10b458fc9
|
优化订阅信息的发送与取消订阅
|
3 years ago |
|
648540858
|
f1c8ca602d
|
添加日志
|
3 years ago |
|
648540858
|
8553769e76
|
补充xml缺失的编码信息
|
3 years ago |
|
648540858
|
7ad28af0e3
|
补充xml缺失的编码信息
|
3 years ago |
|
648540858
|
76226c414d
|
补充建表sql
|
3 years ago |
|
648540858
|
f7e39141db
|
修复重启服务后拉流代理回复失败的问题
|
3 years ago |
|
648540858
|
c9f091d560
|
Merge pull request #419 from nikmu/wvp-28181-2.0
目录订阅推送问题，在线事件发送问题
|
3 years ago |
|
648540858
|
3eef73ecb6
|
修复实时监控无法播放问题 #427
|
3 years ago |
|
648540858
|
c3b47fa734
|
修复启动报错
|
3 years ago |
|
648540858
|
d42329a021
|
Merge pull request #426 from J1031/bugfix/map_modification_exception
修复ConcurrentModificationException
|
3 years ago |
