|
|
ec6deab32a
|
合并主分支
# Conflicts:
# pages/210/deviceControl/index.vue
# pages/650/HBY650.vue
# pages/common/index/index.vue
# unpackage/dist/dev/app-plus/static/tabs/device-HL.png
# unpackage/dist/dev/app-plus/static/tabs/device.png
# unpackage/dist/dev/app-plus/static/tabs/my-HL.png
# unpackage/dist/dev/app-plus/static/tabs/my.png
# utils/BleReceive.js
# utils/loading.js
|
2025-11-21 16:27:32 +08:00 |
|
|
|
3a75d4df2b
|
merge upstream
|
2025-11-19 11:34:56 +08:00 |
|
|
|
2a14d77f17
|
210主机联机页面代码修改
|
2025-11-19 11:12:54 +08:00 |
|
|
|
18fd446b07
|
完成HBY102
|
2025-11-17 15:30:57 +08:00 |
|
|
|
cb9ed0b1da
|
添加102
|
2025-11-14 17:28:20 +08:00 |
|
|
|
623a47466a
|
合并线上代码
|
2025-11-07 12:16:10 +08:00 |
|
|
|
2493bb7113
|
完成100
|
2025-11-07 11:57:35 +08:00 |
|
|
|
d37ccfeabc
|
完成BJQ4877功能开发
|
2025-10-24 17:21:18 +08:00 |
|
|
|
90cee62df1
|
6331前端功能初步完成,扩展msgPop支持自定义插槽
|
2025-10-17 17:29:08 +08:00 |
|
|
|
e3a2624509
|
修改670人员信息重复发送的问题/修改版本更新的方式/加入检查更新的连接
|
2025-10-10 17:31:33 +08:00 |
|
|
|
4f3a8bb3ec
|
670人员登记调整，蓝牙成功不再走后端
|
2025-10-09 14:34:22 +08:00 |
|
|
|
17e76f9fa8
|
670增加去连接蓝牙，其它体验问题小调整
|
2025-09-25 09:59:37 +08:00 |
|
|
|
2adc73cdab
|
尝试解决主分支冲突
|
2025-09-24 08:35:34 +08:00 |
|
|
|
9c9c684ab6
|
650添加应答,app图标添加
|
2025-09-15 11:55:44 +08:00 |
|
|
|
9846fe2315
|
添加报警功能
|
2025-08-28 14:05:06 +08:00 |
|
|
|
c2aa8bfa2f
|
移植6155、650、670
|
2025-08-27 11:06:49 +08:00 |
|
|
|
dfb6f29683
|
670完成
|
2025-08-26 15:42:26 +08:00 |
|
|
|
e95b2466e1
|
6155完成部分协议对接
|
2025-08-15 16:39:00 +08:00 |
|
|
|
4df8330738
|
添加类型路由后，合并版本
|
2025-08-15 10:52:29 +08:00 |
|
|
|
84c0a6ae18
|
跟主分支合并
|
2025-08-15 09:10:11 +08:00 |
|
|
|
958a74101e
|
650全局蓝牙优化
|
2025-08-14 17:25:53 +08:00 |
|
|
|
e56bbfe674
|
优化设备控制，提交后，实时获取设备返回状态信息
|
2025-08-14 13:46: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 |
|
|
|
3ab58ac29e
|
修复6170测试中出现的bug
|
2025-08-08 17:34:46 +08:00 |
|
|
|
ae608e04c0
|
210新增自动报警弹框提示，历史记录页面功能
|
2025-08-07 11:48:58 +08:00 |
|
|
|
77d1fdbe64
|
210设备管控页弹框功能
|
2025-08-06 18:33:33 +08:00 |
|
|
|
6c5a702ff9
|
地图打点动态数据加载，
|
2025-08-05 19:02:04 +08:00 |
|
|
|
b3c0b74628
|
650蓝牙协议更新
|
2025-08-05 13:14:22 +08:00 |
|
|
|
afc79db6bb
|
完善6170报警功能，图片压缩大小
|
2025-08-04 15:49:17 +08:00 |
|
|
|
c15e7b4aad
|
6170增加强制报警页面功能
|
2025-08-02 16:32:48 +08:00 |
|
|
|
4d52f5d42a
|
图片调整路径
|
2025-08-01 14:53:20 +08:00 |
|
|
|
c7d7149d2f
|
关闭灯光
|
2025-07-31 14:03:28 +08:00 |
|
|
|
e5e2aca0c4
|
Merge branch 'main' of http://47.107.152.87:3000/liubiao/APP
# Conflicts:
# .gitignore
# pages/common/index/index.vue
# 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-07-29 09:40:01 +08:00 |
|
|
|
3c0bf2f770
|
添加蓝牙通讯握手
|
2025-07-29 09:34:15 +08:00 |
|
|
|
c83a513f86
|
更新ui细节
|
2025-07-25 17:08:23 +08:00 |
|
|
|
864f7f58a0
|
分享设备相关的功能
|
2025-07-22 17:47:38 +08:00 |
|
|
|
bc3bea6df0
|
设备分享模块页面功能开发
|
2025-07-16 16:43:22 +08:00 |
|
|
|
89464f3696
|
6155前端功能完成
|
2025-07-14 09:46:58 +08:00 |
|
|
|
cc0ad19e2d
|
6155部分功能
|
2025-07-11 16:11:40 +08:00 |
|
|
|
82fd1574c8
|
设备列表，设备绑定，删除，修改设备名
|
2025-07-09 13:41:42 +08:00 |
|
|
|
aede64dacd
|
增加晶全app静态页面
|
2025-07-05 14:49:26 +08:00 |
|
