Commit Graph

175 Commits

Author SHA1 Message Date
516cc8324c Merge branch 'liubiao-new-20250827' 2025-11-20 16:44:34 +08:00
d0047907c1 210页面完成 2025-11-20 16:40:33 +08:00
294d854867 670加入用户确认收到消息 2025-11-20 16:40:14 +08:00
3a75d4df2b merge upstream 2025-11-19 11:34:56 +08:00
2a14d77f17 210主机联机页面代码修改 2025-11-19 11:12:54 +08:00
ea565276ee 4877小优化一下 2025-11-18 10:02:14 +08:00
c13cd92f8c 6155发图片修改 2025-11-17 16:37:37 +08:00
f2e5e7c1f3 Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827 2025-11-17 15:31:14 +08:00
18fd446b07 完成HBY102 2025-11-17 15:30:57 +08:00
674f758b39 merge upstream 2025-11-17 15:29:11 +08:00
1ba22c7aae 210自动报警,手动报警 2025-11-17 10:20:54 +08:00
1f3dfab4d2 merge upstream 2025-11-17 08:55:19 +08:00
cb9ed0b1da 添加102 2025-11-14 17:28:20 +08:00
dadad6ed19 添加token过期,跳转到登录页 2025-11-12 09:51:35 +08:00
c8f5567285 merge upstream 2025-11-10 17:28:29 +08:00
1ad1ae0ac9 4877V1完成 2025-11-10 17:27:37 +08:00
426fdeddee Merge branch 'main' of http://47.107.152.87:3000/dyf/APP 2025-11-08 10:33:20 +08:00
968d7a613d 6075页面功能开发 2025-11-08 10:33:00 +08:00
623a47466a 合并线上代码 2025-11-07 12:16:10 +08:00
2493bb7113 完成100 2025-11-07 11:57:35 +08:00
b8ce1621b4 Merge branch 'main' of http://47.107.152.87:3000/dyf/APP 2025-11-06 08:47:45 +08:00
c81a4d1903 6075设备控制页 2025-11-06 08:46:27 +08:00
27d212e7dc 继续优化7305 2025-11-05 19:18:05 +08:00
9037ef6ac3 Merge branch 'main' of http://47.107.152.87:3000/dyf/APP 2025-11-05 11:17:11 +08:00
a30a631ea6 改成13*13符合设备端 2025-11-05 11:17:08 +08:00
2b72cc1a5c Merge branch 'main' of http://47.107.152.87:3000/dyf/APP 2025-11-05 11:13:35 +08:00
77be45f1f3 6075 2025-11-05 11:13:32 +08:00
a0c883f4e3 优化蓝牙连接7305同步状态 2025-11-05 10:22:17 +08:00
9313ec0106 Merge branch 'main' of http://47.107.152.87:3000/dyf/APP 2025-11-05 08:48:15 +08:00
ca6345ee3e 6075页面开发 2025-11-05 08:48:13 +08:00
d06cd6cdfd 修复复杂字体渲染设备端乱序问题 2025-11-04 19:30:47 +08:00
2218ca0650 修改输入框文本 2025-11-01 17:32:03 +08:00
500b461bdd 修复7305设备上报问题 2025-11-01 17:21:45 +08:00
3eeffdb62c Merge branch 'liubiao-new-20250827' 2025-10-31 11:15:39 +08:00
317c762edc 7305文件报错 2025-10-31 11:13:07 +08:00
c39cbcb34d 蓝牙开始、结束搜索添加状态判定 2025-10-30 11:10:57 +08:00
bd56ca997b 修复7305标签未闭合问题 2025-10-27 13:00:34 +08:00
cf60414d76 蓝牙断开连接变成异步操作 2025-10-27 11:51:38 +08:00
61ed91695f 蓝牙模块添加在web平台默认成功方便调试功能,4877功能完成 2025-10-27 10:52:17 +08:00
d37ccfeabc 完成BJQ4877功能开发 2025-10-24 17:21:18 +08:00
1d8b3b4a9a 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题
# Conflicts:
#	pages/7305/BJQ7305.vue
2025-10-24 11:08:32 +08:00
15ba241317 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题 2025-10-24 11:00:35 +08:00
1de958df20 修复优化7305设备屏幕点阵取模兼容设备端填坑 2025-10-24 10:29:46 +08:00
738ce209a6 跟朱工合并7305的功能
# Conflicts:
#	utils/BleHelper.js
#	utils/BleReceive.js
2025-10-23 16:10:53 +08:00
8487a4303a 解决安卓数据包问题,拆成小包发送,增加电量,续航时间,充电检测 2025-10-23 15:28:47 +08:00
f51b6c5a85 一点小优化,从设备详情去绑定蓝牙设备,成功后更新设备详情的连接状态 2025-10-23 14:54:12 +08:00
61433fca05 7305修改人员信息的点阵方式 2025-10-23 08:46:44 +08:00
c6ed8635c7 添加录音的权限 2025-10-21 12:13:55 +08:00
90cee62df1 6331前端功能初步完成,扩展msgPop支持自定义插槽 2025-10-17 17:29:08 +08:00
b114f6690d 蓝牙添加连接、断开、可用、不可用控制 2025-10-17 11:52:26 +08:00