Commit Graph

Select branches

Hide Pull Requests

main

new-20250827

Mono Color

• 6ee45f6868 修改bug new-20250827 fengerli 2025-09-05 18:48:46 +08:00
• 8108744d56 Merge branch 'liubiao-new-20250827' daiyongfei 2025-08-30 14:37:40 +08:00
• c537e17780 修改设备实时状态参数，同后端一起修改 fengerli 2025-08-30 14:34:44 +08:00
• 2f437e16b6 排除unpackge冲突 liub 2025-08-28 15:05:34 +08:00
• 8460aa1be2 670分享功能 liub 2025-08-28 14:46:04 +08:00
• c4cd556bd4 670分享功能 liub 2025-08-28 14:46:04 +08:00
• 9846fe2315 添加报警功能 liub 2025-08-28 14:05:06 +08:00
• 82ca470b2d Merge branch 'main' of http://47.107.152.87:3000/dyf/APP fengerli 2025-08-27 16:27:42 +08:00
• 49834be90d 报警 fengerli 2025-08-27 16:26:57 +08:00
• c2aa8bfa2f 移植6155、650、670 liub 2025-08-27 11:06:49 +08:00
• 057858a132 加了几个文件 liub 2025-08-27 10:32:13 +08:00
• 09862e8e07 实验一下 liub 2025-08-27 10:30:20 +08:00
• d2d68a0b39 试一下 liub 2025-08-27 10:27:38 +08:00
• cd912b861e 670完成 main liub 2025-08-27 09:08:59 +08:00
• dfb6f29683 670完成 liub 2025-08-26 15:42:26 +08:00
• c9996748eb Revert "提交" daiyongfei 2025-08-26 15:09:14 +08:00
• b1ba355cb2 Merge branch 'liubiao-main' daiyongfei 2025-08-26 08:39:27 +08:00
• 8d97dcf121 提交 fengerli 2025-08-26 08:35:52 +08:00
• 2c2a75aa02 650完成，并解决了冲突 liub 2025-08-25 17:31:14 +08:00
• 295f904b10 650完成 liub 2025-08-25 17:28:41 +08:00
• 7f4fd00937 650完成 liub 2025-08-25 17:15:06 +08:00
• bbf55c58f0 650完成，670完成部分 liub 2025-08-25 17:13:13 +08:00
• f8a02b7f9f 封装实时接口，请求，共多个页面调用 fengerli 2025-08-19 11:48:12 +08:00
• 793fe7132b 添加全局蓝牙监听 liub 2025-08-18 16:33:06 +08:00
• 585bd76a0a 添加全局蓝牙监听 liub 2025-08-18 16:32:25 +08:00
• 96acaa5d94 添加全局蓝牙监听 liub 2025-08-18 16:31:41 +08:00
• 5e5bde6934 添加全局蓝牙消息监听 liub 2025-08-18 16:30:44 +08:00
• 76329756c9 解决版本冲突 liub 2025-08-18 08:49:46 +08:00
• 535f4728ea 添加全局消息监听 liub 2025-08-18 08:38:28 +08:00
• 823c54aed7 批量报警，获取设备实时状态 fengerli 2025-08-16 17:37:24 +08:00
• 64529bf573 修复发送信息bug fengerli 2025-08-16 14:28:21 +08:00
• fe5545b642 优化mqtt协议代码 fengerli 2025-08-16 13:59:17 +08:00
• e95b2466e1 6155完成部分协议对接 liub 2025-08-15 16:39:00 +08:00
• 6ef2bb08b9 合并版本 liub 2025-08-15 11:09:06 +08:00
• 4df8330738 添加类型路由后，合并版本 liub 2025-08-15 10:52:29 +08:00
• 8e1a37dbea 修改了列表跳转方式 fengerli 2025-08-15 10:30:08 +08:00
• 84c0a6ae18 跟主分支合并 liub 2025-08-15 09:10:11 +08:00
• ceafd10b72 650小bug修复 liub 2025-08-15 09:04:27 +08:00
• 6b4d47828e 修改main.js，去除原有的蓝牙插件 liub 2025-08-15 09:03:48 +08:00
• 6650334525 增加6155、650跳转 liub 2025-08-14 17:27:10 +08:00
• 958a74101e 650全局蓝牙优化 liub 2025-08-14 17:25:53 +08:00
• 106320bfd5 更新mqtt 微微一笑 2025-08-14 17:04:12 +08:00
• 9bac0995a3 设备发送 fengerli 2025-08-14 16:05:16 +08:00
• a773823c3f 优化实时获取设备，前端取消掉超时状态，根据服务的超时来判断 fengerli 2025-08-14 14:39:10 +08:00
• e56bbfe674 优化设备控制，提交后，实时获取设备返回状态信息 fengerli 2025-08-14 13:46:57 +08:00
• 1ed6ca4828 修复650id大小写错误 liub 2025-08-13 14:56:24 +08:00
• e39356bbe0 增加绑定蓝牙页面 liub 2025-08-13 14:39:29 +08:00
• 5eea3a0fff 增加650的跳转 liub 2025-08-13 14:38:57 +08:00
• d9a28d0345 添加全局蓝牙 liub 2025-08-12 15:27:14 +08:00
• 47a9dace85 Merge branch 'main' of http://47.107.152.87:3000/dyf/APP liub 2025-08-11 15:21:37 +08:00
• 4ab10bb251 BLE发送数据添加安卓苹果不同的逻辑 liub 2025-08-11 14:51:09 +08:00
• d8edb9f31e 6170控制设备接口，添加参数imei fengerli 2025-08-11 11:24:21 +08:00
• b78ec21152 Merge branch 'main' of http://47.107.152.87:3000/dyf/APP fengerli 2025-08-09 17:59:25 +08:00
• 0d13f84744 分享管理修复bug,210历史记录功能开发 fengerli 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 fengerli 2025-08-09 10:40:57 +08:00
• 0ef9dc7934 210历史记录页面 fengerli 2025-08-09 10:40:47 +08:00
• 00e0a4bbd1 修复mqtt客户端问题 微微一笑 2025-08-09 10:39:05 +08:00
• c6babaa262 进度条加载 fengerli 2025-08-09 09:47:50 +08:00
• 3ab58ac29e 修复6170测试中出现的bug fengerli 2025-08-08 17:34:46 +08:00
• ae608e04c0 210新增自动报警弹框提示，历史记录页面功能 fengerli 2025-08-07 11:48:58 +08:00
• ca844723fa 6155点阵插件完成。 liub 2025-08-07 08:48:02 +08:00
• 77d1fdbe64 210设备管控页弹框功能 fengerli 2025-08-06 18:33:33 +08:00
• 566fb77648 Merge branch 'main' of http://47.107.152.87:3000/dyf/APP fengerli 2025-08-05 19:02:14 +08:00
• 6c5a702ff9 地图打点动态数据加载， fengerli 2025-08-05 19:02:04 +08:00
• 654dac65e2 Merge branch 'main' of http://47.107.152.87:3000/dyf/APP 微微一笑 2025-08-05 15:32:48 +08:00
• e15281f18c 修改接口url问题 微微一笑 2025-08-05 15:32:44 +08:00
• b3c0b74628 650蓝牙协议更新 liub 2025-08-05 13:14:22 +08:00
• d19dc91223 Merge branch 'main' of http://47.107.152.87:3000/dyf/APP fengerli 2025-08-04 17:48:20 +08:00
• 40a5897b1b matt订阅设备消息 fengerli 2025-08-04 17:48:03 +08:00
• e857cf50fe Merge branch 'main' of http://47.107.152.87:3000/dyf/APP 微微一笑 2025-08-04 17:33:19 +08:00
• ccd4d2e772 更map地图 微微一笑 2025-08-04 17:33:16 +08:00
• afc79db6bb 完善6170报警功能，图片压缩大小 fengerli 2025-08-04 15:49:17 +08:00
• c15e7b4aad 6170增加强制报警页面功能 fengerli 2025-08-02 16:32:48 +08:00
• d0aca9e730 进度条颜色 fengerli 2025-08-02 09:13:18 +08:00
• 8df5c80445 更新 微微一笑 2025-08-01 17:20:21 +08:00
• 1443aa9964 Merge branch 'main' of http://47.107.152.87:3000/dyf/APP fengerli 2025-08-01 16:36:58 +08:00
• 6b409f4272 地图动态打点 fengerli 2025-08-01 16:36:43 +08:00
• 6c53b1fc95 更新 微微一笑 2025-08-01 15:38:12 +08:00
• 4d52f5d42a 图片调整路径 fengerli 2025-08-01 14:53:20 +08:00
• 766c72941e 新增210管控页面，6170设备控制，订阅设备消息 fengerli 2025-07-31 19:02:09 +08:00
• c7d7149d2f 关闭灯光 fengerli 2025-07-31 14:03:28 +08:00
• a3865e2f26 添加文本行转点阵的插件 liub 2025-07-31 13:54:20 +08:00
• 4ebdec8dac Merge remote-tracking branch 'upstream/main' liub 2025-07-31 13:35:07 +08:00
• 52c4a0b436 设备图片自适应展示 fengerli 2025-07-30 09:34:53 +08:00
• e5e2aca0c4 Merge branch 'main' of http://47.107.152.87:3000/liubiao/APP liub 2025-07-29 09:40:01 +08:00
• 40639d2bad 蓝牙握手提交 liub 2025-07-29 09:36:54 +08:00
• 3c0bf2f770 添加蓝牙通讯握手 liub 2025-07-29 09:34:15 +08:00
• 1ddb68369d 地图主题色修改，地图打点 fengerli 2025-07-28 18:04:40 +08:00
• 113ea601ca 设备控制页上传logo图联调 fengerli 2025-07-26 16:48:31 +08:00
• c83a513f86 更新ui细节 fengerli 2025-07-25 17:08:23 +08:00
• 51ab4d0bfa 封装提示弹框 fengerli 2025-07-24 10:05:17 +08:00
• c0a9c0b3f2 首页根据类型判断显示，位置，报警，发送信息按钮 fengerli 2025-07-23 09:07:27 +08:00
• 864f7f58a0 分享设备相关的功能 fengerli 2025-07-22 17:47:38 +08:00
• 1663ae75e4 6170分享设备页面功能开发 fengerli 2025-07-19 10:22:48 +08:00
• bc3bea6df0 设备分享模块页面功能开发 fengerli 2025-07-16 16:43:22 +08:00
• 9b3be8c7d7 Merge branch 'main' of http://47.107.152.87:3000/dyf/APP 微微一笑 2025-07-16 11:35:14 +08:00
• 80dd83bb3d 发送信息列表接口联调， fengerli 2025-07-16 11:33:26 +08:00
• 6257f9d84b 增加mqtt 微微一笑 2025-07-16 11:16:19 +08:00
• e42d4af3b2 更新请求环境配置 微微一笑 2025-07-16 10:23:06 +08:00