|
|
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 |
|
|
|
230ee5eb77
|
merge upstream
|
2025-11-17 09:38:17 +08:00 |
|
|
|
c8ea753b8e
|
恢复7305代码冲突
|
2025-11-17 09:29:05 +08:00 |
|
|
|
b24d34d32d
|
Merge branch 'main' of http://47.107.152.87:3000/dyf/APP
|
2025-11-17 09:06:24 +08:00 |
|
|
|
04083446e7
|
1
|
2025-11-17 09:06:03 +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 |
|
|
|
f835e25bbb
|
Merge pull request 'new-20250827 一些小优化' (#22) from liubiao/APP:new-20250827 into main
Reviewed-on: dyf/APP#22
|
2025-11-08 10:32:38 +08:00 |
|
|
|
012eca6985
|
Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827
# Conflicts:
# pages.json
# pages/100/HBY100.vue
# pages/6075/BJQ6075.vue
# pages/7305/BJQ7305.vue
# utils/BleReceive.js
|
2025-11-07 13:08:05 +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 |
|
|
|
3526f28d06
|
修复蓝牙传输数据
|
2025-10-31 15:35:03 +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 |
|
|
|
0909d9f023
|
merge upstream
|
2025-10-24 11:46:02 +08:00 |
|
|
|
b20a93dd28
|
修复传输时序问题
|
2025-10-24 11:42:56 +08:00 |
|
|
|
1d8b3b4a9a
|
修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题
# Conflicts:
# pages/7305/BJQ7305.vue
|
2025-10-24 11:08:32 +08:00 |
|
|
|
a5c6faa9da
|
* 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题
* 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题
* 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题
* 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题
* 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题
* 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题
* 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题
* 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题
修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题
|
2025-10-24 11:04:36 +08:00 |
|
|
|
15ba241317
|
修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题
|
2025-10-24 11:00:35 +08:00 |
|
|
|
fa64e7f1fc
|
merge upstream
|
2025-10-24 10:57:08 +08:00 |
|
|
|
45328120c1
|
修复6155/7305全局订阅与详情订阅重复弹窗
|
2025-10-24 10:56:37 +08:00 |
|
|
|
1de958df20
|
修复优化7305设备屏幕点阵取模兼容设备端填坑
|
2025-10-24 10:29:46 +08:00 |
|
|
|
0033649677
|
修改蓝牙接收数据处理逻辑，改成配置式，避免if无限增多
|
2025-10-23 16:36:48 +08:00 |
|
|
|
738ce209a6
|
跟朱工合并7305的功能
# Conflicts:
# utils/BleHelper.js
# utils/BleReceive.js
|
2025-10-23 16:10:53 +08:00 |
|
