648540858
|
3ffe205082
|
首页改造,完成cpu,内存,网络图
|
2022-10-20 18:03:40 +08:00 |
648540858
|
b6bcb5f2f4
|
隐藏liveplayer
|
2022-10-19 10:28:51 +08:00 |
648540858
|
b64d701f37
|
隐藏liveplayer
|
2022-10-19 10:07:47 +08:00 |
648540858
|
c5b16e058d
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
# Conflicts:
# sql/mysql.sql
|
2022-10-19 10:04:04 +08:00 |
XiaoQiTong
|
b0d0d30781
|
修改云端录像选择节点流媒体path不修改的bug
device表增加的mediaServerId字段丢失,重新添加
|
2022-10-18 20:18:51 +08:00 |
648540858
|
55b53caef1
|
支持手动添加,为设备设置单独的密码
|
2022-10-18 17:35:44 +08:00 |
648540858
|
688e222dcc
|
优化按需拉流配置,拉流代理支持按需拉流
|
2022-10-18 17:35:32 +08:00 |
648540858
|
3c52a16e5f
|
支持手动添加,为设备设置单独的密码
|
2022-10-18 17:02:05 +08:00 |
648540858
|
82fd369ce5
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
|
2022-10-17 16:56:13 +08:00 |
648540858
|
7918f03734
|
优化按需拉流配置,拉流代理支持按需拉流
|
2022-10-17 16:38:28 +08:00 |
648540858
|
6bfd48776d
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-10-17 12:45:56 +08:00 |
648540858
|
4f2191dc9f
|
增加liveplayer播放器
|
2022-10-17 10:30:44 +08:00 |
XiaoQiTong
|
dabee4ed7d
|
增加指定流媒体收流功能
|
2022-10-15 20:57:24 +08:00 |
648540858
|
06bbe3fe01
|
添加第二种语音对讲实现
|
2022-09-29 16:27:59 +08:00 |
648540858
|
d7a1b94f90
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java
|
2022-09-24 21:04:58 +08:00 |
648540858
|
710600db6f
|
优化sip消息,去除自动dialog创建
|
2022-09-21 18:18:37 +08:00 |
648540858
|
1ee56d50d8
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-09-16 18:04:13 +08:00 |
648540858
|
692f716788
|
优化点播时RtpServer为正常关闭的问题
|
2022-09-16 18:02:56 +08:00 |
648540858
|
ab74d1cff9
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
|
2022-09-14 20:51:21 +08:00 |
wenyanjun
|
12571e0db1
|
修复下载录像失败问题
|
2022-09-14 14:32:22 +08:00 |
648540858
|
221f99c764
|
优化sip消息
|
2022-09-09 17:06:19 +08:00 |
648540858
|
2f76fa98bb
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
|
2022-09-08 09:46:35 +08:00 |
jiang
|
3884e9a56a
|
1.根据redis消息更新推流列表时同时更新在线状态
2.推流列表的模板增加在线状态
|
2022-09-07 15:56:48 +08:00 |
648540858
|
e7bdcc1f8d
|
修复选择通道时默认节点显示错误的问题
|
2022-09-06 16:31:28 +08:00 |
648540858
|
d5e8aa62a1
|
添加对海康平台录像回放的兼容,修复录像信息发送失败, 级联平台支持开启rtcp保活
|
2022-09-05 17:10:21 +08:00 |
648540858
|
aa6bce35c7
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
|
2022-09-05 09:44:24 +08:00 |
648540858
|
cfe9c762d6
|
修复前端播放
|
2022-09-05 09:40:14 +08:00 |
648540858
|
3146e63fc0
|
优化异常处理
|
2022-09-01 17:53:00 +08:00 |
648540858
|
03d6ad289b
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
|
2022-09-01 14:50:28 +08:00 |
648540858
|
703c2e292a
|
云端录像详情页添加返回按钮
|
2022-08-31 18:07:53 +08:00 |
648540858
|
2de4c322f6
|
去除对redis key过期事件的使用;重构国标级联的注册保活
|
2022-08-31 11:29:13 +08:00 |
648540858
|
9f680a2e9e
|
修复bug以及日志按照,错误/sip/数据库 分割
|
2022-08-26 18:03:09 +08:00 |
648540858
|
8f7e8efc98
|
合并主线
|
2022-08-23 11:48:31 +08:00 |
648540858
|
020f9ea8a0
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
|
2022-08-23 11:01:53 +08:00 |
648540858
|
f24b6fa13f
|
优化国标录像的异常判断
|
2022-08-23 11:00:46 +08:00 |
648540858
|
ecf4fbb684
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
# web_src/src/components/Login.vue
|
2022-08-22 16:53:16 +08:00 |
648540858
|
042b28b2d6
|
支持全局异常和统一返回结果
|
2022-08-22 16:17:28 +08:00 |
648540858
|
5461b8ebf2
|
支持全局异常和统一返回结果,未完待续
|
2022-08-22 16:17:28 +08:00 |
648540858
|
116d979d87
|
合并主线
|
2022-08-09 16:58:31 +08:00 |
648540858
|
8b0ff3767b
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# sql/update.sql
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-08-09 14:41:21 +08:00 |
zouyaoji
|
3b5a37c270
|
前端显示媒体服务器配置时报错修复
|
2022-08-06 11:27:02 +08:00 |
648540858
|
3adc81764c
|
优化用户表单
|
2022-08-05 17:27:18 +08:00 |
648540858
|
d94ceb4fed
|
去除点播界面双loading
|
2022-08-05 17:20:26 +08:00 |
648540858
|
231582eb77
|
推流列表增加经纬度的添加
|
2022-08-05 17:10:53 +08:00 |
jiang
|
d09d8f11f0
|
修改‘修改pushkey’窗口的标题提示文案
|
2022-08-04 17:01:31 +08:00 |
mrjackwang
|
f93a0d599e
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-08-02 15:32:15 +08:00 |
648540858
|
5e4a673ecc
|
修复视频播放点击音量报错 #557,修复编解码信息获取失败
|
2022-08-01 14:33:51 +08:00 |
648540858
|
2a5c12746b
|
修复首页未获取到zlm消息时发送错误消息的bug
|
2022-08-01 09:32:39 +08:00 |
mrjackwang
|
a59095db0c
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-29 15:16:39 +08:00 |
648540858
|
b957ab61c7
|
bug修复
|
2022-07-26 11:43:56 +08:00 |
648540858
|
c77c1a956c
|
修复推流推流状态提示
|
2022-07-25 11:17:46 +08:00 |
648540858
|
91dc4566a2
|
修复级联无通道时更新停止在等待更新的问题
|
2022-07-25 09:44:43 +08:00 |
648540858
|
e29d94c83f
|
增加推流添加功能,修复级联目录推送
|
2022-07-22 16:02:14 +08:00 |
mrjackwang
|
8d87741dea
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-20 13:51:30 +08:00 |
jiang
|
a51b411101
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-19 18:13:42 +08:00 |
jiang
|
fc0ad32f81
|
1.修复新增用户没有pushkey的问题
2.将重置pushkey改为修改pushkey
|
2022-07-19 18:13:19 +08:00 |
648540858
|
9e397ba9f6
|
移除共享所有直播流功能
|
2022-07-19 17:46:16 +08:00 |
648540858
|
7f5a18d6b5
|
优化推流列表
|
2022-07-19 16:37:34 +08:00 |
648540858
|
4a43d04020
|
修复推流导入模板
|
2022-07-19 15:27:33 +08:00 |
648540858
|
03864ae46f
|
修复用户查询sql错误
|
2022-07-19 11:13:46 +08:00 |
jiang
|
1002150b2a
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-18 17:15:33 +08:00 |
jiang
|
c6fbd03276
|
增加用户管理功能。管理员可以添加删除用户、修改用户密码、重置pushkey
|
2022-07-18 17:09:35 +08:00 |
648540858
|
4451994959
|
优化国标级联目录订阅通知以及目录查询回复
|
2022-07-17 23:17:36 +08:00 |
648540858
|
cfed860667
|
合并主线
|
2022-07-12 16:54:58 +08:00 |
648540858
|
66e6756909
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into liujie-20220712
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/IMediaService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
|
2022-07-12 16:28:51 +08:00 |
648540858
|
74d97734ba
|
修复获取推流播放地址接口
|
2022-07-11 17:34:22 +08:00 |
648540858
|
afbec28906
|
增加推流鉴权。保护服务安全
|
2022-07-11 16:21:01 +08:00 |
wangyimeng
|
5e724cc062
|
Merge branch 'wvp-28181-2.0' of https://github.com/mrjackwang/wvp-GB28181-pro into wvp-28181-2.0
|
2022-07-06 15:33:43 +08:00 |
648540858
|
d7c293c867
|
界面优化
|
2022-07-06 10:18:56 +08:00 |
648540858
|
8aa0bdf539
|
数据库优化
|
2022-07-06 09:44:37 +08:00 |
648540858
|
10cb58391a
|
修复轨迹的储存与查询展示
|
2022-07-04 01:08:26 +08:00 |
648540858
|
5364db2982
|
优化对讲逻辑
|
2022-07-03 22:27:04 +08:00 |
648540858
|
7609d7836c
|
优化对讲逻辑
|
2022-07-03 16:23:31 +08:00 |
648540858
|
e78c402a24
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
# Conflicts:
# sql/mysql.sql
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-07-03 10:32:33 +08:00 |
648540858
|
f5fcc79a2c
|
优化国标树型展示
|
2022-07-03 07:40:54 +08:00 |
648540858
|
72c1b36d6d
|
优化对讲逻辑
|
2022-07-03 00:44:36 +08:00 |
648540858
|
b6c97528ae
|
添加界面停止逻辑
|
2022-07-01 18:36:35 +08:00 |
648540858
|
07956b48df
|
添加界面优化接口
|
2022-07-01 18:26:35 +08:00 |
648540858
|
1d1f174852
|
合并主线
|
2022-06-27 14:40:07 +08:00 |
648540858
|
26739237e2
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
# Conflicts:
# sql/update.sql
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# web_src/src/components/dialog/deviceEdit.vue
# web_src/src/components/dialog/devicePlayer.vue
|
2022-06-27 10:16:21 +08:00 |
648540858
|
038d360dd4
|
Merge remote-tracking branch 'origin/rtc' into commercial
# Conflicts:
# web_src/src/components/dialog/devicePlayer.vue
|
2022-06-27 09:38:59 +08:00 |
648540858
|
c2faa8c3ce
|
显示效果优化
|
2022-06-15 16:04:36 +08:00 |
648540858
|
f7006e4881
|
修复播放中zlm离线导致的bye发送失败
|
2022-06-15 14:55:33 +08:00 |
648540858
|
a9c4638c94
|
修复通道列表修改分页大小无效
|
2022-06-15 11:02:19 +08:00 |
648540858
|
5fae9a7b34
|
优化列表展示效果
|
2022-06-15 10:40:45 +08:00 |
648540858
|
c801ee6218
|
调整页面样式
|
2022-06-14 23:16:58 +08:00 |
648540858
|
31a8e6ea89
|
优化位置信息展示
|
2022-06-14 17:46:53 +08:00 |
648540858
|
c022213972
|
设备支持设置地理坐标系,并将级联输出坐标系统一为wgs84
|
2022-06-14 17:00:24 +08:00 |
648540858
|
e0344ccf97
|
国标级联推送推流 支持多wvp间自动选择与推送
|
2022-06-14 14:37:34 +08:00 |
648540858
|
c827d1518b
|
#510 jessibuca分屏监控异常
|
2022-06-13 23:02:53 +08:00 |
648540858
|
cba2e6b90b
|
优化wasm播放器内存占用问题
|
2022-06-04 23:18:01 +08:00 |
648540858
|
9ae0691c80
|
优化快照的存储与显示
|
2022-06-02 10:55:41 +08:00 |
648540858
|
cf35daeb98
|
优化大数据下的设备树加载
|
2022-05-31 15:54:39 +08:00 |
648540858
|
dc6769664e
|
兼容不规范的时间格式iso8601格式;升级fastjson版本
|
2022-05-26 12:10:46 +08:00 |
648540858
|
7a917ee50a
|
修复国标录像播放
|
2022-05-23 10:50:29 +08:00 |
hotcoffie
|
3aa2665fb2
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-23 09:15:59 +08:00 |
648540858
|
6fa9dae824
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
|
2022-05-18 18:13:59 +08:00 |
648540858
|
9ef1a0277b
|
更新jessibuca播放器
|
2022-05-18 15:36:33 +08:00 |
648540858
|
549bdfdd6a
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
|
2022-05-18 11:20:13 +08:00 |
648540858
|
ff83f2c7c8
|
优化播放页面
|
2022-05-18 10:42:27 +08:00 |
648540858
|
17f219d351
|
优化播放页面
|
2022-05-18 10:01:58 +08:00 |
648540858
|
b9ffcd1d38
|
修复播放页面
|
2022-05-18 09:57:36 +08:00 |
648540858
|
3051fc82ee
|
添加直接支持切换多种开源播放器
|
2022-05-18 09:49:25 +08:00 |
hotcoffie
|
1d753b48c0
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-17 11:53:42 +08:00 |
648540858
|
bfb3b4ea13
|
播放页面显示所有流地址
|
2022-05-16 17:49:44 +08:00 |
648540858
|
39efda779f
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
|
2022-05-16 11:47:17 +08:00 |
648540858
|
98e6cf5bae
|
优化海康录像下载
|
2022-05-13 21:05:33 +08:00 |
648540858
|
4d3f0a8d79
|
优化海康国标录像播放的控制
|
2022-05-13 15:41:50 +08:00 |
648540858
|
1757203202
|
支持海康摄像头国标录像查看播放
|
2022-05-13 15:32:30 +08:00 |
648540858
|
ec749de7c1
|
#470
|
2022-05-12 18:17:15 +08:00 |
648540858
|
9fa739ac02
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
|
2022-05-12 10:54:46 +08:00 |
648540858
|
f6893cf95b
|
优化设备在线状态
|
2022-05-11 18:37:24 +08:00 |
648540858
|
c2aaae9325
|
初步实现语音喊话
|
2022-05-09 18:15:30 +08:00 |
hotcoffie
|
ec8ab540f8
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-07 17:42:31 +08:00 |
648540858
|
ca16a79255
|
添加语音发送通道和语音接收通道字段
|
2022-05-07 09:52:02 +08:00 |
648540858
|
afe2450a14
|
优化地图功能的开关
|
2022-05-06 16:01:36 +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
|
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
|
ff3c30f32e
|
优化收到心跳设置设备上线的逻辑
|
2022-05-05 14:26:42 +08:00 |
xiaoxie
|
c592740efa
|
升级shelljs,解决较高版本node打包时的警告
|
2022-05-01 21:33:56 +08:00 |
648540858
|
db865cc9cc
|
#453
|
2022-04-28 18:18:09 +08:00 |
648540858
|
c4a2854e1b
|
修复添加/修改节点页面的BUG
|
2022-04-28 17:58:47 +08:00 |
xiaoxie
|
e0d641064a
|
多屏界面,切换分屏数时播放器正确调整尺寸
|
2022-04-28 14:23:17 +08:00 |
xiaoxie
|
35b3d7618d
|
修复多屏播放时播放器样式错位
|
2022-04-28 13:40:26 +08:00 |
648540858
|
363606d845
|
优化级联目录发送
|
2022-04-26 18:29:47 +08:00 |
648540858
|
9ce22eba3c
|
行政区划作为级联数据的处理,修复设备树的显示
|
2022-04-26 17:24:41 +08:00 |
xiaoxie
|
5c1a5f7931
|
优化播放器尺寸调节逻辑:
1.播放器不会大于屏幕高度
2.增加灰色背景色区分播放区域
3.播放器居中
|
2022-04-26 15:03:44 +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 |
xiaoxie
|
6e4fc1e79b
|
1.修正了播放地址无法正常播放视频的问题,包含两个错误:
1.1修正播放器界面路由(此页面不需要layout边框,之前已经修复但在地图代码合并时又被错误覆盖)
1.2修正播放器id属性,此属性现在不需要父级组件传入(这是之前导致独立播放页面失效的主要原因)
2.调整滚动条美化样式到app.vue中,使其真正全局生效
|
2022-04-23 23:34:36 +08:00 |
xiaoxie
|
e7ab983f94
|
动态计算播放器尺寸,保持16:9比例,避免出现黑框或固定大小无法缩放
|
2022-04-23 11:34:43 +08:00 |
xiaoxie
|
33eec2b68f
|
动态计算播放器尺寸,保持16:9比例,避免出现黑框或固定大小无法缩放
|
2022-04-23 11:20:00 +08:00 |
648540858
|
2bc43f4262
|
添加注释
|
2022-04-22 17:00:33 +08:00 |
648540858
|
92421b46cc
|
支持关闭地图功能,添加授权声明
|
2022-04-22 16:55:46 +08:00 |
648540858
|
1e2d207aea
|
添加优化后的地图页面,完全一处百度地图相关的api
|
2022-04-22 16:21:05 +08:00 |
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
|
2022-04-21 13:01:02 +08:00 |
xiaoxie
|
2735a7a98b
|
全局样式适配三个隐藏页面
|
2022-04-21 12:45:27 +08:00 |
xiaoxie
|
5623b5ee0f
|
通道页适配全局样式
|
2022-04-21 12:39:09 +08:00 |
xiaoxie
|
fb843d41c1
|
1.重构全局页面结构,从之前每个页面独立绘制改为路由嵌套
2.全局页面样式优化,如滚动条、标题栏等
|
2022-04-21 12:33:10 +08:00 |
648540858
|
d7bfd9bfa7
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
|
2022-04-21 10:30:46 +08:00 |
xiaoxie
|
3def634a27
|
修复实时监控页面,左侧菜单越界显示问题
|
2022-04-21 10:11:08 +08:00 |
xiaoxie
|
4dcc7df555
|
修复前端一处v-for没有key的警告
|
2022-04-21 10:03:21 +08:00 |
648540858
|
f7236c4a90
|
添加公共组件设备树
|
2022-04-20 18:21:18 +08:00 |
648540858
|
088419b4d8
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
|
2022-04-20 09:38:09 +08:00 |
648540858
|
4d975c21da
|
优化国标级联目录推送,支持zlm新特性ssrc校验
|
2022-04-19 11:52:03 +08:00 |
648540858
|
91515f1b05
|
添加行政区划功能,修复目录发送数量统计的BUG
|
2022-04-18 17:38:49 +08:00 |
648540858
|
93d69d5476
|
添加国标级联目录分组分组加快通道传输速度
|
2022-04-18 16:16:49 +08:00 |
648540858
|
c1f6401598
|
修复级联编辑页面开关的重置
|
2022-04-18 11:45:53 +08:00 |