|
|
8ccc37cb93
|
强跟泛光指令修改
|
2025-11-26 16:06:34 +08:00 |
|
|
|
ebbac4232a
|
Merge branch 'main' of http://47.107.152.87:3000/dyf/APP
|
2025-11-26 15:57:54 +08:00 |
|
|
|
362b752087
|
6155添加强泛光指令
|
2025-11-26 15:57:52 +08:00 |
|
|
|
5c69e32c2d
|
修复6155使用加号添加设备没有监听的问题
|
2025-11-26 15:56:55 +08:00 |
|
|
|
e247acdd5e
|
6155人员信息合成一个06格式头发送
|
2025-11-26 11:12:05 +08:00 |
|
|
|
2ba53fcf92
|
merge upstream
|
2025-11-24 08:20:45 +08:00 |
|
|
|
97b6825420
|
修复6155人员信息第一个字体缺失问题,画布取值加载预热机制
|
2025-11-22 18:28:43 +08:00 |
|
|
|
14d6fa7ccb
|
修改区分图片，动画协议
|
2025-11-21 18:47:20 +08:00 |
|
|
|
8270cc77d7
|
Merge branch 'main' of http://47.107.152.87:3000/dyf/APP into new-20250827
# Conflicts:
# pages/6155/deviceDetail.vue
|
2025-11-21 16:30:13 +08:00 |
|
|
|
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 |
|
|
|
1558045882
|
102主从机告警
|
2025-11-21 16:22:35 +08:00 |
|
|
|
27308e0ed1
|
Merge branch 'main' of http://47.107.152.87:3000/dyf/APP
|
2025-11-21 16:12:57 +08:00 |
|
|
|
76d40bc096
|
修改人员信息时间前后
|
2025-11-21 16:12:55 +08:00 |
|
|
|
31b189dd72
|
关闭压塑保证ios正常6155
|
2025-11-21 15:59:58 +08:00 |
|
|
|
fc1fad0579
|
ios
|
2025-11-21 14:43:23 +08:00 |
|
|
|
864dd59b4c
|
Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827
# Conflicts:
# pages/6155/deviceDetail.vue
|
2025-11-21 14:21:10 +08:00 |
|
|
|
4790892a24
|
merge upstream
|
2025-11-21 14:18:55 +08:00 |
|
|
|
a8ce1d9680
|
6155发送视频修改，方便随时切换切片大小
|
2025-11-21 14:18:36 +08:00 |
|
|
|
5b62fd176f
|
Merge branch 'main' of http://47.107.152.87:3000/dyf/APP
|
2025-11-21 13:25:41 +08:00 |
|
|
|
ad85c922e1
|
6155解决 iOS 上的分辨率检查问题
|
2025-11-21 13:25:38 +08:00 |
|
|
|
a7f09dfbc2
|
修改设备电量低，重复弹框提示两个弹框
|
2025-11-21 11:24:04 +08:00 |
|
|
|
7b2b7ea34c
|
Merge branch 'main' of http://47.107.152.87:3000/dyf/APP
|
2025-11-21 11:10:49 +08:00 |
|
|
|
eea68b5276
|
6155限制人员信息，文字不能超过7个字
|
2025-11-21 11:10:47 +08:00 |
|
|
|
ac7e1873cd
|
修复6155电量同步显示问题
|
2025-11-21 11:07:10 +08:00 |
|
|
|
a28d4921a0
|
修复6155蓝牙数据问题
|
2025-11-20 17:51:26 +08:00 |
|
|
|
401e78cd8b
|
Merge branch 'main' into new-20250827
|
2025-11-20 17:00:00 +08:00 |
|
|
|
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 |
|
|
|
547ec3f94b
|
完成HBY102
|
2025-11-17 15:31:44 +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 |
|
|
|
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: #22
|
2025-11-08 10:32:38 +08:00 |
|
