1
0
forked from dyf/APP
Commit Graph

125 Commits

Author SHA1 Message Date
cd912b861e 670完成 2025-08-27 09:08:59 +08:00
dfb6f29683 670完成 2025-08-26 15:42:26 +08:00
c9996748eb Revert "提交"
This reverts commit 8d97dcf121.
2025-08-26 15:09:14 +08:00
b1ba355cb2 Merge branch 'liubiao-main' 2025-08-26 08:39:27 +08:00
8d97dcf121 提交 2025-08-26 08:35:52 +08:00
2c2a75aa02 650完成,并解决了冲突 2025-08-25 17:31:14 +08:00
295f904b10 650完成 2025-08-25 17:28:41 +08:00
7f4fd00937 650完成 2025-08-25 17:15:06 +08:00
bbf55c58f0 650完成,670完成部分 2025-08-25 17:13:13 +08:00
f8a02b7f9f 封装实时接口,请求,共多个页面调用 2025-08-19 11:48:12 +08:00
793fe7132b 添加全局蓝牙监听 2025-08-18 16:33:06 +08:00
585bd76a0a 添加全局蓝牙监听 2025-08-18 16:32:25 +08:00
96acaa5d94 添加全局蓝牙监听 2025-08-18 16:31:41 +08:00
5e5bde6934 添加全局蓝牙消息监听 2025-08-18 16:30:44 +08:00
76329756c9 解决版本冲突 2025-08-18 08:49:46 +08:00
535f4728ea 添加全局消息监听 2025-08-18 08:38:28 +08:00
823c54aed7 批量报警,获取设备实时状态 2025-08-16 17:37:24 +08:00
64529bf573 修复发送信息bug 2025-08-16 14:28:21 +08:00
fe5545b642 优化mqtt协议代码 2025-08-16 13:59:17 +08:00
e95b2466e1 6155完成部分协议对接 2025-08-15 16:39:00 +08:00
6ef2bb08b9 合并版本 2025-08-15 11:09:06 +08:00
4df8330738 添加类型路由后,合并版本 2025-08-15 10:52:29 +08:00
8e1a37dbea 修改了列表跳转方式 2025-08-15 10:30:08 +08:00
84c0a6ae18 跟主分支合并 2025-08-15 09:10:11 +08:00
ceafd10b72 650小bug修复 2025-08-15 09:04:27 +08:00
6b4d47828e 修改main.js,去除原有的蓝牙插件 2025-08-15 09:03:48 +08:00
6650334525 增加6155、650跳转 2025-08-14 17:27:10 +08:00
958a74101e 650全局蓝牙优化 2025-08-14 17:25:53 +08:00
106320bfd5 更新mqtt 2025-08-14 17:04:12 +08:00
9bac0995a3 设备发送 2025-08-14 16:05:16 +08:00
a773823c3f 优化实时获取设备,前端取消掉超时状态,根据服务的超时来判断 2025-08-14 14:39:10 +08:00
e56bbfe674 优化设备控制,提交后,实时获取设备返回状态信息 2025-08-14 13:46:57 +08:00
1ed6ca4828 修复650id大小写错误 2025-08-13 14:56:24 +08:00
e39356bbe0 增加绑定蓝牙页面 2025-08-13 14:39:29 +08:00
5eea3a0fff 增加650的跳转 2025-08-13 14:38:57 +08:00
d9a28d0345 添加全局蓝牙 2025-08-12 15:27:14 +08:00
47a9dace85 Merge branch 'main' of http://47.107.152.87:3000/dyf/APP
# Conflicts:
#	pages.json
#	unpackage/dist/dev/app-plus/app-config-service.js
#	unpackage/dist/dev/app-plus/app-service.js
#	unpackage/dist/dev/app-plus/app-view.js
#	unpackage/dist/dev/app-plus/manifest.json
#	utils/request.js
2025-08-11 15:21:37 +08:00
4ab10bb251 BLE发送数据添加安卓苹果不同的逻辑 2025-08-11 14:51:09 +08:00
d8edb9f31e 6170控制设备接口,添加参数imei 2025-08-11 11:24:21 +08:00
b78ec21152 Merge branch 'main' of http://47.107.152.87:3000/dyf/APP 2025-08-09 17:59:25 +08:00
0d13f84744 分享管理修复bug,210历史记录功能开发 2025-08-09 17:59:09 +08:00
d66b5aed7f mqtt增加心跳间隔应对网络波动 2025-08-09 15:02:40 +08:00
c0bb2bcd9c Merge branch 'main' of http://47.107.152.87:3000/dyf/APP 2025-08-09 10:40:57 +08:00
0ef9dc7934 210历史记录页面 2025-08-09 10:40:47 +08:00
00e0a4bbd1 修复mqtt客户端问题 2025-08-09 10:39:05 +08:00
c6babaa262 进度条加载 2025-08-09 09:47:50 +08:00
3ab58ac29e 修复6170测试中出现的bug 2025-08-08 17:34:46 +08:00
ae608e04c0 210新增自动报警弹框提示,历史记录页面功能 2025-08-07 11:48:58 +08:00
ca844723fa 6155点阵插件完成。 2025-08-07 08:48:02 +08:00
77d1fdbe64 210设备管控页弹框功能 2025-08-06 18:33:33 +08:00