1
0
forked from dyf/APP
Commit Graph

67 Commits

Author SHA1 Message Date
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
d8edb9f31e 6170控制设备接口,添加参数imei 2025-08-11 11:24:21 +08:00
0d13f84744 分享管理修复bug,210历史记录功能开发 2025-08-09 17:59:09 +08:00
c0bb2bcd9c Merge branch 'main' of http://47.107.152.87:3000/dyf/APP 2025-08-09 10:40:57 +08:00
0ef9dc7934 210历史记录页面 2025-08-09 10:40:47 +08:00
00e0a4bbd1 修复mqtt客户端问题 2025-08-09 10:39:05 +08:00
c6babaa262 进度条加载 2025-08-09 09:47:50 +08:00
3ab58ac29e 修复6170测试中出现的bug 2025-08-08 17:34:46 +08:00
ae608e04c0 210新增自动报警弹框提示,历史记录页面功能 2025-08-07 11:48:58 +08:00
ca844723fa 6155点阵插件完成。 2025-08-07 08:48:02 +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
d19dc91223 Merge branch 'main' of http://47.107.152.87:3000/dyf/APP 2025-08-04 17:48:20 +08:00
40a5897b1b matt订阅设备消息 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报警功能,图片压缩大小 2025-08-04 15:49:17 +08:00
c15e7b4aad 6170增加强制报警页面功能 2025-08-02 16:32:48 +08:00
d0aca9e730 进度条颜色 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 2025-08-01 16:36:58 +08:00
6b409f4272 地图动态打点 2025-08-01 16:36:43 +08:00
6c53b1fc95 更新 2025-08-01 15:38:12 +08:00
4d52f5d42a 图片调整路径 2025-08-01 14:53:20 +08:00
766c72941e 新增210管控页面,6170设备控制,订阅设备消息 2025-07-31 19:02:09 +08:00
c7d7149d2f 关闭灯光 2025-07-31 14:03:28 +08:00
4ebdec8dac Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	pages/common/index/index.vue
2025-07-31 13:35:07 +08:00
52c4a0b436 设备图片自适应展示 2025-07-30 09:34:53 +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
1ddb68369d 地图主题色修改,地图打点 2025-07-28 18:04:40 +08:00
113ea601ca 设备控制页上传logo图联调 2025-07-26 16:48:31 +08:00
c83a513f86 更新ui细节 2025-07-25 17:08:23 +08:00
51ab4d0bfa 封装提示弹框 2025-07-24 10:05:17 +08:00
c0a9c0b3f2 首页根据类型判断显示,位置,报警,发送信息按钮 2025-07-23 09:07:27 +08:00
864f7f58a0 分享设备相关的功能 2025-07-22 17:47:38 +08:00
1663ae75e4 6170分享设备页面功能开发 2025-07-19 10:22:48 +08:00
bc3bea6df0 设备分享模块页面功能开发 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 发送信息列表接口联调, 2025-07-16 11:33:26 +08:00
6257f9d84b 增加mqtt 2025-07-16 11:16:19 +08:00
f3a3778452 功能细节调整 2025-07-16 09:42:51 +08:00
4a4d7dbc73 1 2025-07-15 19:01:49 +08:00
3349d09e46 6170设备控制页面,滑块显示值 2025-07-15 19:00:53 +08:00
388b462b57 首页跳转传参方式 2025-07-15 16:34:58 +08:00
0ac0d1998a Merge branch 'main' of http://47.107.152.87:3000/liubiao/APP
# Conflicts:
#	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
2025-07-15 13:18:13 +08:00
56f05e7eec 解绑传参方式修改,隐私协议,用户协议,跳转相对应路径 2025-07-14 16:10:57 +08:00
e470726fbd 添加几个函数 2025-07-14 11:42:35 +08:00
dd752d0478 Merge branch 'liubiao-main' 2025-07-14 11:35:47 +08:00