Commit Graph

337 Commits

Author SHA1 Message Date
chenbo 2083bf58ef fixed 2024-02-27 10:08:42 +08:00
chenbo e9ad4bc757 fixed 2024-02-23 14:11:05 +08:00
chenbo 3b356f0617 fixed 2024-02-22 16:32:03 +08:00
chenbo c92d3c7e64 fixed 2024-02-22 16:11:34 +08:00
chenbo 927ab3bc8b 地区接口 2024-01-09 14:56:05 +08:00
chenbo d1a3dc08f7 update 2024-01-09 11:04:19 +08:00
chenbo 0466e710a7 fixed 2024-01-09 10:34:19 +08:00
chenbo 8ad58b7790 add 前台代码 2024-01-09 10:07:28 +08:00
chenbo 19e6a34aab app首页视频封面,上传监控视频封面 2024-01-08 16:38:55 +08:00
chenbo b04c038bd3 app首页视频封面,上传监控视频封面 2024-01-08 16:17:59 +08:00
chenbo 3eb365c461 Merge remote-tracking branch 'origin/dev' into dev 2024-01-08 11:25:45 +08:00
chenbo 59cfacccf4 app首页视频封面,上传监控视频封面 2024-01-08 11:25:35 +08:00
lxz cbabc74ec4 新增视频播放场景 2024-01-06 14:22:28 +08:00
lxz 3218995797 监控视频播放 2024-01-06 14:18:13 +08:00
chenbo 5e240474e0 fixed 2024-01-05 14:33:31 +08:00
chenbo 3922f4cda5 Merge branch 'preview' 2024-01-05 11:46:54 +08:00
chenbo 66d829cff6 fixed 2024-01-05 11:46:21 +08:00
chenbo 2f11d9e2fe fixed 2024-01-05 11:22:19 +08:00
chenbo 33b756af53 Merge branch 'preview' 2024-01-03 14:21:07 +08:00
chenbo 4403d9ddf7 后台添加手机用户 2024-01-03 14:05:40 +08:00
chenbo e0b37628a9 后台添加手机用户 2024-01-03 14:03:20 +08:00
chenbo 53819a174e 后台添加手机用户 2024-01-03 11:38:29 +08:00
chenbo 6937312540 Merge branch 'preview' 2024-01-03 11:34:32 +08:00
chenbo 2a468004e0 后台添加手机用户 2024-01-03 11:34:01 +08:00
chenbo 27b695a965 手机验证码注册 2024-01-02 18:20:41 +08:00
chenbo 8c6838fbf2 手机验证码注册 2024-01-02 18:18:52 +08:00
chenbo 282a18dfc5 Merge branch 'preview' 2024-01-02 14:43:10 +08:00
chenbo 0fe66b9c21 视频地址 2024-01-02 14:42:32 +08:00
chenbo ddc10275a5 Merge branch 'preview'
# Conflicts:
#	app/api/controller/IndexController.php
2023-12-27 18:11:42 +08:00
chenbo a4d3887205 视频地址 2023-12-27 18:10:48 +08:00
chenbo 1c9c34dc3a Merge branch 'preview' 2023-12-23 11:26:24 +08:00
chenbo 31fa9fe3e3 update 推送用户名和设备id逻辑更改 2023-12-23 11:09:21 +08:00
chenbo ef8579d017 update 推送用户名和设备id逻辑更改 2023-12-23 10:21:59 +08:00
mkm 4e86efbab4 更新 app/api/controller/IndexController.php
修复错误
2023-12-20 18:13:12 +08:00
mkm f6f4e5e007 更新 app/api/controller/IndexController.php
修复错误
2023-12-20 18:09:07 +08:00
mkm 8bf95a9a21 更新 app/api/controller/IndexController.php
修复数组判断
2023-12-20 18:04:50 +08:00
chenbo 8f1b8ad26a update app添加地块新增经纬度 2023-12-20 10:56:33 +08:00
chenbo d7d19a5ebd update app添加地块新增经纬度 2023-12-20 10:52:52 +08:00
chenbo d37a1e6169 add 设备图 2023-12-19 18:15:01 +08:00
chenbo ac46035ba5 add 设备图 2023-12-19 18:14:06 +08:00
chenbo 48d7dd3f23 add 设备图 2023-12-19 18:03:06 +08:00
chenbo 3fcd918153 add 设备图 2023-12-19 17:58:52 +08:00
chenbo 85ada8e9f3 udpate 溯源首页详情接口 2023-12-19 14:09:59 +08:00
chenbo 8df9a67241 udpate 溯源首页详情接口 2023-12-19 10:18:47 +08:00
chenbo 0fc1f7fcc3 Merge branch 'dev' into preview 2023-12-19 10:04:55 +08:00
chenbo ce197778d1 fixed 2023-12-18 09:57:36 +08:00
chenbo c6544e071c add 第二页-地块监测设备统计 2023-12-16 11:09:44 +08:00
chenbo c9b6cdb300 add 第二页-地块监测设备统计 2023-12-16 10:49:25 +08:00
chenbo a24e238880 add 第二页-地块气象环境监测 2023-12-16 09:35:47 +08:00
chenbo 5e1573731a 第二页 地块种植面积/种类统计
改造设备告警统计接口,兼容某个地块的告警
2023-12-15 18:24:24 +08:00