648540858
676a59e5f7
Merge pull request #2152 from T0n0T/fix/cloud-record-websocket-and-ptz-cruise-preset
...
fix: add WebSocket sub_filter for mp4_record and fix ptzCruising preset label
2026-05-25 22:16:29 +08:00
lin
fac2195ace
重构播放器分享功能，为各处播放器增加播放器切换能力
2026-05-25 22:05:15 +08:00
T0n0T
bc3cde6d52
fix: add value-key for el-select to display preset label correctly
...
When presetName is empty, the el-select trigger area failed to show
the fallback presetId without value-key being set explicitly.
2026-05-15 18:09:05 +08:00
T0n0T
477172f3af
fix: add WebSocket sub_filter for mp4_record and fix ptzCruising preset label
...
- Add ws:// and wss:// sub_filter entries for mp4_record in nginx template
to allow WebSocket playback of cloud recordings through nginx proxy
- Fix ptzCruising dropdown preset label to fallback to presetId when
presetName is empty, preventing blank option display
2026-05-15 16:13:04 +08:00
lin
4b1ea8ad30
优化错误提示
2025-11-21 12:15:26 +08:00
lin
333965255f
Merge branch 'master' into 重构/1078
...
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/common/enums/ChannelDataType.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelPlayService.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
2025-07-31 21:14:23 +08:00
lin
3f6264cad9
通用通道支持辅助开关、雨刷、自动扫描
2025-07-31 20:59:57 +08:00
lin
8ec950d515
通用通道支持巡航组
2025-07-31 20:54:08 +08:00
lin
9614584219
通用通道支持预置位调用，删除， 增加
2025-07-31 19:05:07 +08:00
lin
19b873ba5c
通用通道支持云台控制
2025-07-31 18:49:53 +08:00
lin
465e03d15d
Merge branch 'master' into 重构/1078
...
# Conflicts:
# web/src/router/index.js
# web/src/views/common/channelPlayer/chooseChannelForJt.vue
# web/src/views/common/channelPlayer/jtDeviceEdit.vue
# web/src/views/common/channelPlayer/jtDevicePlayer.vue
# web_src/src/layout/UiHeader.vue
# web_src/src/main.js
# web_src/src/router/index.js
2025-07-03 09:41:55 +08:00
lin
8d488b33e9
调整菜单结构，增加通道列表，支持节点搜索
2025-07-02 17:21:20 +08:00
