Commit Graph

1007 Commits

Author SHA1 Message Date
kerwincui
1afceda43c sql数据简化 2025-03-19 16:31:08 +08:00
kerwincui
4920d84516 物模型和产品操作优化 2025-03-19 16:27:17 +08:00
kerwincui
14ad72b6fa Merge branch 'dev'
# Conflicts:
#	docker/data/mysql/initdb/fastbee2.1.sql
2024-12-17 22:05:18 +08:00
kerwincui
59f4185d2b sql脚本中注释bug修复 2024-12-17 22:04:50 +08:00
kerwincui
59c83b1601 Merge branch 'dev' 2024-12-13 10:44:49 +08:00
随遇而安
e8c192dbd4 update README.md.
Signed-off-by: 随遇而安 <164770707@qq.com>
2024-12-13 02:37:03 +00:00
gx_ma
1424423769 Merge remote-tracking branch 'origin/master' 2024-12-10 15:07:32 +08:00
gx_ma
0615f005b7 fix(初始化脚本): sql修改 2024-12-10 15:06:02 +08:00
随遇而安
c2a7aafcd4 !45 fix:解决设备运行状态无法显示问题https://gitee.com/beecue/fastbee/issues/IAW9KE
Merge pull request !45 from Ming/master
2024-11-29 03:54:26 +00:00
Ming
d8e07328c7 fix:解决设备运行状态无法显示问题https://gitee.com/beecue/fastbee/issues/ 2024-11-28 05:21:24 +08:00
Ming
5abe95f617 fix:解决设备运行状态无法显示问题https://gitee.com/beecue/fastbee/issues/IAW9KE 2024-11-28 05:12:59 +08:00
随遇而安
c12352ffea update springboot/fastbee-admin/src/main/resources/application-dev.yml.
Signed-off-by: 随遇而安 <164770707@qq.com>
2024-11-11 07:30:48 +00:00
随遇而安
5715a15d46 update springboot/fastbee-admin/src/main/resources/application.yml.
Signed-off-by: 随遇而安 <164770707@qq.com>
2024-11-11 07:29:51 +00:00
Zhu
92b504d78a Merge branch 'master' into dev 2024-11-06 12:02:04 +08:00
Zhu
c8a9fd0a99 fix(运行状态):实时更新问题修复 2024-11-06 12:00:55 +08:00
随遇而安
4af4f250eb update README.md.
Signed-off-by: 随遇而安 <164770707@qq.com>
2024-10-28 07:20:28 +00:00
随遇而安
6d50802b60 update vue/README.md.
Signed-off-by: 随遇而安 <164770707@qq.com>
2024-09-26 03:06:15 +00:00
gx_ma
87cb9f2ba1 1.开源app已经上线,代码删除对应安装包 2024-08-19 16:26:20 +08:00
gx_ma
2f481c1b13 1.sql脚本运行报错修改 2024-08-19 15:17:09 +08:00
gx_ma
cfebb8753f Merge branch 'dev' 2024-08-14 16:32:43 +08:00
gx_ma
a7f60c902a !44 修复验证码关闭的bug
Merge pull request !44 from 像风一样/N/A
2024-08-14 08:29:48 +00:00
像风一样
aab9710423 修复验证码关闭的bug
后台配置了取消验证,但实际没有取消

Signed-off-by: 像风一样 <963565242@qq.com>
2024-08-14 07:59:03 +00:00
zhuangpeng.li
a56ab82a94 1.播放器版本更新 2024-08-09 15:46:03 +08:00
zhuangpeng.li
984a5e6357 Merge branch 'dev'
# Conflicts:
#	README.md
v2.1.0
2024-08-09 14:37:24 +08:00
zhuangpeng.li
f48a7e0e4a 1.README文档修改 2024-08-09 14:29:32 +08:00
gx_ma
4dbf1f0bee Merge branch 'dev'
# Conflicts:
#	README.md
2024-08-09 10:40:35 +08:00
zhuangpeng.li
f866fd2d9c 1.设备端sdk移除 2024-08-08 23:14:24 +08:00
zhuangpeng.li
ebad891de7 1.设备端sdk移除 2024-08-08 23:13:54 +08:00
zhuangpeng.li
93c73501a2 1.代码更新 2024-08-06 11:44:51 +08:00
zhuangpeng.li
7983f72429 1.新增esp-idf设备端sdk 2024-08-05 15:46:10 +08:00
gx_ma
642cf21648 Merge remote-tracking branch 'origin/dev' into dev 2024-08-05 11:03:16 +08:00
baiying
c869f5ea10 设备管理总条数修改 2024-08-05 10:58:30 +08:00
gx_ma
90b165775e 1.删除实时监测 2024-08-05 10:57:54 +08:00
baiying
ba47af758f 删除监测统计并取消显示modbus设备 2024-07-23 11:33:48 +08:00
gx_ma
9aed2047cb 1.删除开源版不支持的功能代码以及商用提示 2024-07-19 16:46:15 +08:00
baiying
90e9409b7a 前端页面修改 2024-07-18 14:07:24 +08:00
gx_ma
6e1cd1eac0 1.视频模块、规则引擎新增菜单以及数据字典,sql整理 2024-07-16 10:31:03 +08:00
gx_ma
2c17dda169 1.docker脚本 2024-07-16 09:56:55 +08:00
gx_ma
940123b78d 1.视频相关配置文件修改 2024-07-15 18:03:06 +08:00
zhuangpeng.li
60c0949edf Merge remote-tracking branch 'origin/dev' into dev 2024-07-15 17:56:08 +08:00
zhuangpeng.li
6702e3414f 1.代码更新 2024-07-15 17:55:57 +08:00
gx_ma
00084ed066 1.视频相关sql脚本 2024-07-15 17:54:33 +08:00
gx_ma
65390f9ca8 部署脚本修改 2024-07-15 14:02:36 +08:00
zhuangpeng.li
1c026ab07a 1.修改部署脚本 2024-07-15 10:12:39 +08:00
zhuangpeng.li
9ef70c53a5 1.代码更新 2024-07-14 11:49:32 +08:00
zhuangpeng.li
d6d506ff6a 1.优化代码 2024-07-14 11:25:48 +08:00
zhuangpeng.li
12e2203abc 1.修改部署脚本 2024-07-14 11:11:31 +08:00
gx_ma
6fa84b7ecb 1.配置文件新增sip配置 2024-07-12 17:16:46 +08:00
gx_ma
34902ae252 1.监控设备状态更新定时任务 2024-07-12 17:09:07 +08:00
gx_ma
28fccca86b 1.规则引擎新增告警配置菜单 2024-07-12 15:57:56 +08:00