• Joined on 2025-06-18
dyf merged pull request dyf/APP#38 2026-03-19 11:42:41 +08:00
new-20250827 解决合并冲突
dyf pushed to main at dyf/APP 2026-03-19 11:42:41 +08:00
a2680fc14d Merge pull request 'new-20250827 解决合并冲突' (#38) from liubiao/APP:new-20250827 into main
f86e6a4fb7 解决合并冲突
bb0610ff1a Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827
61f00e1cbf 修改7305人员信息取模组件,文本自动居中
729f782c42 merge upstream
Compare 6 commits »
dyf merged pull request dyf/dyf-vue-ui#31 2026-03-10 18:04:25 +08:00
修复编辑蓝牙&4G设备时,IEMI不显示的问题
dyf merged pull request dyf/APP#37 2026-03-10 17:39:49 +08:00
new-20250827 批量报警、批量发送消息,分供应商处理
dyf pushed to main at dyf/APP 2026-03-10 17:39:49 +08:00
64b7914d23 Merge pull request 'new-20250827 批量报警、批量发送消息,分供应商处理' (#37) from liubiao/APP:new-20250827 into main
3b5aae87f4 批量报警、批量发送消息,多个供应商的协议作区分
2be522977c 批量报警、批量发送消息,分供应商处理
4cacdbe7f7 Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827
1eae2d1d91 更新100、670电量低的提示方式为监听式
Compare 9 commits »
dyf pushed to 6170 at dyf/fys-Multi-tenant 2026-03-02 16:38:14 +08:00
9d84265f57 Merge remote-tracking branch 'origin/6170' into 6170
fa5dfab939 2.4G设备上报技术方案
Compare 2 commits »
dyf pushed to 6170 at dyf/fys-Multi-tenant 2026-03-02 14:32:13 +08:00
Compare 2 commits »
dyf pushed to 6170 at dyf/fys-Multi-tenant 2026-02-27 15:31:58 +08:00
e036ef05ce Merge branch 'jingquan' into 6170
03f453f901 Merge pull request 'refactor(equipment): 将业务文件和操作视频功能从app模块迁移到equipment模块' (#25) from liwenlong/fys-Multi-tenant:jingquan into jingquan
e23c5267ee refactor(equipment): 将业务文件和操作视频功能从app模块迁移到equipment模块
Compare 3 commits »
dyf merged pull request dyf/fys-Multi-tenant#25 2026-02-27 15:29:31 +08:00
refactor(equipment): 将业务文件和操作视频功能从app模块迁移到equipment模块
dyf pushed to jingquan at dyf/fys-Multi-tenant 2026-02-27 15:29:31 +08:00
03f453f901 Merge pull request 'refactor(equipment): 将业务文件和操作视频功能从app模块迁移到equipment模块' (#25) from liwenlong/fys-Multi-tenant:jingquan into jingquan
e23c5267ee refactor(equipment): 将业务文件和操作视频功能从app模块迁移到equipment模块
Compare 2 commits »
dyf merged pull request dyf/dyf-vue-ui#30 2026-02-27 15:29:10 +08:00
设备类型增加参数、说明、视频
dyf pushed to main at dyf/dyf-vue-ui 2026-02-27 15:29:10 +08:00
1307e1bddf Merge pull request '设备类型增加参数、说明、视频' (#30) from liubiao/dyf-vue-ui:main into main
0ff3e4b1bc 设备类型增加参数、说明、视频
Compare 2 commits »
dyf pushed to main at dyf/dyf-vue-ui 2026-02-26 09:07:48 +08:00
3231df14d9 Merge pull request '修复首页“设备使用频次”功能X轴显示错误' (#29) from liubiao/dyf-vue-ui:main into main
4880ffc37c 修复首页“设备使用频次”功能X轴显示错误
Compare 2 commits »
dyf merged pull request dyf/dyf-vue-ui#29 2026-02-26 09:07:48 +08:00
修复首页“设备使用频次”功能X轴显示错误
dyf merged pull request dyf/APP#34 2026-02-26 09:07:31 +08:00
new-20250827 一些小优化
dyf pushed to main at dyf/APP 2026-02-26 09:07:31 +08:00
aa87a1a78f Merge pull request 'new-20250827 一些小优化' (#34) from liubiao/APP:new-20250827 into main
2f871ac5cf 添加消息推送云函数、消息处理为后续的消息通知做准备
db8f14525b 蓝牙设备添加断开重连提示
1aa11a7a38 蓝牙设备均添加可主动断开蓝牙
27097fecc4 修复不在控制页时收到蓝牙消息,进入设备页后未同步显示的问题
Compare 15 commits »
dyf pushed to dyf-device at dyf/fys-Multi-tenant 2026-02-26 08:38:47 +08:00
04cb699081 该设备类型下已有设备,无法修改设备类型名称!!!
0f0dd4c6b1 hby100japp功能2
2db37a75d2 hby100japp功能
696bbb4aa4 hby100j功能语音管理
ee445dc0d2 获取音频时长2
Compare 10 commits »
dyf pushed to main at dyf/dyf-vue-ui 2026-02-05 09:26:15 +08:00
26e4ab7539 Merge pull request 'main 设备功能类型控制支持筛选,文件管理功能增加更多类型扩大文件大小' (#28) from liubiao/dyf-vue-ui:main into main
5fb12d90ba merge upstream
c424fbd04b 设备功能类型控制支持筛选,文件管理功能增加更多类型扩大文件大小
Compare 3 commits »
dyf merged pull request dyf/dyf-vue-ui#28 2026-02-05 09:26:15 +08:00
main 设备功能类型控制支持筛选,文件管理功能增加更多类型扩大文件大小
dyf pushed to 6170 at dyf/fys-Multi-tenant 2026-02-04 17:28:22 +08:00
04cb699081 该设备类型下已有设备,无法修改设备类型名称!!!