1
0
Fork 0
Commit Graph

194 Commits (098b787a30eba74ca2a322aa46ff4e0bf5cecdad)

Author SHA1 Message Date
vine_liutk 01668c19a5 调整 2023-05-26 17:08:59 +08:00
vine_liutk ff572e40de 调整基地详情弹窗样式 2023-05-26 11:01:26 +08:00
vine_liutk fb22e5f045 调整样式 2023-05-26 10:44:55 +08:00
vine_liutk 9173252975 Merge branch 'develop' of https://gitea.hmily.club/liutk/internet-everythings-agricultural into develop 2023-05-25 21:23:06 +08:00
panliang 5eab5450d8 region 2023-05-25 19:09:53 +08:00
panliang 0d735f631a 1 2023-05-25 16:41:21 +08:00
panliang 5811fdfb0e 1 2023-05-25 16:32:45 +08:00
panliang b8b4762539 1 2023-05-25 16:16:50 +08:00
panliang 95855a2ba7 resources 2023-05-25 16:12:58 +08:00
vine_liutk 172c6fe895 调整气象图 2023-05-24 12:27:21 +08:00
vine_liutk c5f6578377 调整 2023-05-23 15:55:34 +08:00
vine_liutk fc5213a00b 添加尺寸比例裁剪 2023-05-22 12:43:23 +08:00
vine_liutk 8dea83e32a 处理未设置规则时候的情况 2023-05-22 12:19:00 +08:00
vine_liutk d77eb42256 补充预警添加记录 2023-05-22 12:17:14 +08:00
vine_liutk e5ddd219f4 调整 2023-05-19 16:34:16 +08:00
vine_liutk e15ea3e8c7 完善预警设置保存 2023-05-19 10:56:31 +08:00
vine_liutk b99678f96e 调整默认预警设置选中或 2023-05-18 20:48:39 +08:00
vine_liutk 7853032f81 改变预警设置表单 2023-05-18 19:14:22 +08:00
vine_liutk 1a251a3625 处理bug 2023-05-17 12:12:19 +08:00
vine_liutk 3a9cdc6d9b 完善图 2023-05-17 12:10:45 +08:00
李静 996a0dba68 Update 2023-05-16 12:01:27 +08:00
李静 5b69d6758a 生成土壤监控报告 2023-05-16 11:53:48 +08:00
李静 6654d00ee3 优化同步 linkos 历史流水 2023-05-16 11:32:20 +08:00
panliang 2660bd86bc Merge branch 'develop' of gitea.hmily.club:liutk/internet-everythings-agricultural into develop 2023-05-16 11:27:51 +08:00
panliang d97be45086 种植记录id 2023-05-16 11:27:38 +08:00
李静 d701d25b06 优化创建 linkos 设备监控报告流程 2023-05-15 22:36:48 +08:00
vine_liutk 96bb016325 Merge branch 'develop' of https://gitea.hmily.club/liutk/internet-everythings-agricultural into develop 2023-05-12 15:38:10 +08:00
vine_liutk cf8f326515 调整数据结构 2023-05-12 15:38:04 +08:00
李静 418e227866 Fix 2023-05-12 14:15:21 +08:00
李静 a33d981dcc Fix 2023-05-12 13:32:25 +08:00
李静 4b467fa7b0 优化 linkos 设备报告 2023-05-12 13:04:58 +08:00
vine_liutk c01420471d Merge branch 'develop' of https://gitea.hmily.club/liutk/internet-everythings-agricultural into develop 2023-05-12 12:26:38 +08:00
vine_liutk 073f509618 完善监测点位设置设备 2023-05-12 12:26:35 +08:00
李静 91c74b29c3 linkos 气象设备、水质设备每日报告 2023-05-12 12:01:20 +08:00
vine_liutk d07a31741a 处理编辑区域报错问题 2023-05-11 16:05:05 +08:00
vine_liutk 96c4744bd7 调整设备信息查看 2023-05-11 11:38:46 +08:00
vine_liutk 7ffb4048b2 调整标签 2023-05-11 11:16:53 +08:00
vine_liutk f0312e34f0 调整报错 2023-05-10 21:40:15 +08:00
vine_liutk ce8ee04df9 处理冲突 2023-05-10 21:37:55 +08:00
vine_liutk d1a48b3f45 完善样式 2023-05-10 21:36:51 +08:00
vine_liutk f5e1a5698e 暂存 2023-05-10 19:06:01 +08:00
panliang 7281a51b22 timestamp null 2023-05-09 20:24:22 +08:00
panliang 4745c1dff4 region pagination 2023-05-09 20:16:14 +08:00
panliang cbf27302e4 api region harvest 2023-05-09 19:38:52 +08:00
panliang d1b8d88a5e merge app/Models/Region.php 2023-05-09 19:08:59 +08:00
panliang 041a588023 api region 2023-05-09 19:07:47 +08:00
vine_liutk 3968270cf3 补充实验田点击打开 2023-05-09 19:05:04 +08:00
vine_liutk 51dd0f4e1f 大致封装echart-config 2023-05-09 18:19:31 +08:00
vine_liutk 4f92f3017c 完善种植详情 2023-05-09 16:23:10 +08:00
panliang 7d120b8443 com 2023-05-08 22:15:44 +08:00
panliang 892bc642e0 ModelNotFoundException 2023-05-08 21:43:02 +08:00
panliang d40af05598 editor 2023-05-08 21:34:27 +08:00
panliang c4c8832a72 editor 2023-05-08 21:32:03 +08:00
vine_liutk 08202b451f 调整文件名称后报错 2023-05-08 18:32:37 +08:00
vine_liutk 4c3904f38f Merge branch 'develop' of https://gitea.hmily.club/liutk/internet-everythings-agricultural into develop 2023-05-08 18:23:04 +08:00
vine_liutk 94883ec937 调整收获记录 2023-05-08 18:22:59 +08:00
李静 bd6fdcecdb 优化设备报监控告生成脚本 2023-05-08 17:28:58 +08:00
vine_liutk 9eac19eafe 调整文件命名 2023-05-08 17:15:47 +08:00
vine_liutk 8dc26a1b30 Merge branch 'develop' of https://gitea.hmily.club/liutk/internet-everythings-agricultural into develop 2023-05-08 17:06:49 +08:00
vine_liutk e0f73aff5d 完善种植记录添加删除修改 2023-05-08 17:06:40 +08:00
李静 d589404415 Update 2023-05-08 13:39:04 +08:00
李静 c4ea661dcc 优化设备流水同步 2023-05-08 12:11:23 +08:00
李静 015e10682f 设备监控报告 2023-05-06 18:02:02 +08:00
李静 3d07fde008 同步 linkos 设备历史数据时,区分土壤监控数据和气象监控数据 2023-05-06 16:16:21 +08:00
李静 3fcbe33ddc 优化设备数据同步命令 2023-05-06 14:18:52 +08:00
李静 c551bcafeb 修复 SQL 查询 N+1 2023-05-06 10:16:38 +08:00
李静 4646f1fd16 优化设备数据同步 2023-05-05 17:21:05 +08:00
李静 3f43e9953f 设备数据同步命令 2023-05-05 16:28:15 +08:00
panliang 180f2e070d 视频监控 2023-05-05 15:12:15 +08:00
panliang d1a14556f2 setting 2023-05-05 11:58:10 +08:00
vine_liutk 1dfee8c501 调整 2023-05-04 18:13:18 +08:00
vine_liutk 0d48e59c15 Merge branch 'develop' of https://gitea.hmily.club/liutk/internet-everythings-agricultural into develop 2023-05-04 17:18:35 +08:00
vine_liutk 0d177eb289 完善设备和试验田管理 2023-05-04 17:18:26 +08:00
李静 9ec299c490 Linkos 回调日志 2023-05-04 13:48:59 +08:00
李静 177b2cee24 修复 Linkos 设备上线、离线通知 2023-05-04 11:30:40 +08:00
vine_liutk 8f8d5ff8ef 完善设备管理 2023-05-04 10:50:16 +08:00
panliang cfbd28918d Exceptions/Handler 2023-04-29 17:06:34 +08:00
panliang 22d9248cd3 Merge branch 'develop' of gitea.hmily.club:liutk/internet-everythings-agricultural into develop 2023-04-29 16:51:50 +08:00
panliang cf11df2bf4 1 2023-04-29 16:51:34 +08:00
李静 7b641539cd linkos 设备离线、上线通知通知 2023-04-28 17:40:20 +08:00
李静 0eef056851 设备日志 2023-04-28 16:56:38 +08:00
李静 f2a1be3adc Update linkos http client 2023-04-28 14:06:35 +08:00
李静 235fbeafe6 Update linkos http client 2023-04-28 14:02:52 +08:00
panliang d226abe231 admin-notice 2023-04-28 13:03:42 +08:00
李静 3d1d58ac61 LinkOS Http 客户端 2023-04-28 11:16:54 +08:00
panliang 9fbf167a0b dialog 2023-04-27 16:04:57 +08:00
panliang df2f45a26c add ArticleFactory 2023-04-27 15:49:51 +08:00
panliang f8389d8d99 api 2023-04-27 15:27:12 +08:00
panliang 7baf63523d banner 2023-04-27 13:09:25 +08:00
panliang b67e8f04af banner-place 2023-04-27 12:31:28 +08:00
panliang 0fae071c1b admin-notice 2023-04-27 11:38:11 +08:00
panliang 994e0c7895 article 2023-04-27 09:55:13 +08:00
vine_liutk 0ce6575106 简单封装enable 2023-04-26 20:35:21 +08:00
panliang 8c38cfd497 article filter 2023-04-26 18:54:40 +08:00
panliang 4995c1c367 article todo 2023-04-26 17:53:50 +08:00
panliang 21cd0da1a7 Merge branch 'develop' of gitea.hmily.club:liutk/internet-everythings-agricultural into develop 2023-04-26 16:19:40 +08:00
panliang 24a19ccfd7 article-caetgory 2023-04-26 16:19:23 +08:00
vine_liutk aea7d202e6 处理冲突 2023-04-26 12:31:43 +08:00
vine_liutk 48337e440f 更新样式以及实验田报错 2023-04-26 12:31:00 +08:00
panliang 26a9d2458c merge 2023-04-26 11:16:25 +08:00