Commit Graph

Select branches

Hide Pull Requests

dev

dev_trial

main

release_0.0.1

release_0.0.2

release_1.1.1

release_1.1.2

release_1.2.1

release_1.3.0

tag_videoplay.done

yuxiaolei-patch-1

yuxiaolei-patch-2

#1

#2

#3

Mono Color

• 345a2014db 解决冲突 wenlele 2022-05-30 18:42:57 +0800
• 8589ead102 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial yuan_yi 2022-05-30 18:37:58 +0800
• 6dbcca3fa9 导出通用接口 30% yuan_yi 2022-05-30 18:33:49 +0800
• e175e6ade5 导出通用接口 30% yuan_yi 2022-05-30 18:33:42 +0800
• 1fd486536b 解决了表格数据展现的BUG wenlele 2022-05-30 18:32:38 +0800
• b009f18bc2 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial yuan_yi 2022-05-27 17:27:45 +0800
• 24c1294aad 安心云数据查询bug yuan_yi 2022-05-27 17:27:37 +0800
• e632b74387 数据修改 wenlele 2022-05-27 15:19:58 +0800
• 6efe633899 添加骨架屏 wenlele 2022-05-26 10:43:45 +0800
• 5a86abc520 摄像头添加 deartibers 2022-05-25 11:28:41 +0800
• 8a9b814ea6 nvr table yuan_yi 2022-05-25 11:17:11 +0800
• 28e2133a7c Merge branch 'dev_trial' of ssh://gitea.free-sun.vip:2022/free-sun/FS-IOT into dev_trial wenlele 2022-05-25 11:10:19 +0800
• 3f3d357f1e 解决报错问题 wenlele 2022-05-25 11:10:13 +0800
• efab54dbdc Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial yuan_yi 2022-05-25 11:06:58 +0800
• 5919ec2850 摄像头萤石 yuan_yi 2022-05-25 11:06:51 +0800
• 5c5334ff72 摄像头分页 wenlele 2022-05-25 10:10:54 +0800
• cf93351a5a 表格查看和其它功能的数据对接 wenlele 2022-05-25 08:51:19 +0800
• 5750c3872e 萤石摄像头添加 yuan_yi 2022-05-24 17:38:13 +0800
• 96954a8a6e "babel-polyfill": "^6.26.0", yuan_yi 2022-05-24 14:02:50 +0800
• f638047ae7 webpack yuan_yi 2022-05-24 13:51:26 +0800
• 7801359f73 统一提示 yuan_yi 2022-05-24 09:46:22 +0800
• fff6d76346 数据接口 yuan_yi 2022-05-23 20:23:30 +0800
• 89d485d276 Merge pull request 'dev_trial' (#3) from dev_trial into release_0.0.1 release_0.0.1 殷伟文 2022-05-23 08:00:48 +0000
• a033e13a2e 设备筛选 #3 yuan_yi 2022-05-20 17:28:19 +0800
• ddc013104d 高德服务 yuan_yi 2022-05-20 16:25:05 +0800
• c61d69a720 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial yuan_yi 2022-05-20 15:18:10 +0800
• 79d4f26ec1 摄像头若干接口 yuan_yi 2022-05-20 15:18:05 +0800
• a1c20552b1 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial deartibers 2022-05-19 15:13:09 +0800
• 38f9bf91da 设备厂家必填 deartibers 2022-05-19 15:12:57 +0800
• 70080015d7 表格设置和查询的修改 wenlele 2022-05-19 10:54:47 +0800
• 64fa1bc28c AXY_API_URL yuan_yi 2022-05-18 17:30:09 +0800
• 1efb405f19 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial yuan_yi 2022-05-18 15:31:13 +0800
• 974455267e 多平台请求抽象化 yuan_yi 2022-05-18 15:31:08 +0800
• 20daa99a47 添加摄像头弹框 deartibers 2022-05-18 14:57:14 +0800
• 54737dba51 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial yuan_yi 2022-05-17 10:07:30 +0800
• 9dc3554c7d 摄像头获取接口 yuan_yi 2022-05-17 10:07:25 +0800
• 99b8aca186 查询功能样式完成 wenlele 2022-05-12 17:44:58 +0800
• dc0136a212 设备信息和头部样式 wenlele 2022-05-10 17:33:38 +0800
• 70d75b164a 列表的设置选择问题 wenlele 2022-05-09 17:40:14 +0800
• 1d6877ce2d Merge branch 'dev_trial' of ssh://gitea.free-sun.vip:2022/free-sun/FS-IOT into dev_trial wenlele 2022-05-07 17:03:50 +0800
• 068ccda661 摄像头列表设置完成 wenlele 2022-05-07 17:02:33 +0800
• 47a80141b0 修改less文件位置 deartibers 2022-05-07 16:54:26 +0800
• b4f2dc62e3 首页样式修改 deartibers 2022-05-07 11:33:40 +0800
• 224bc45174 socket 优化 yuan_yi 2022-05-07 09:00:24 +0800
• 9e8de3ff47 socket 优化 yuan_yi 2022-05-06 17:31:15 +0800
• caa85094bd socket 优化 yuan_yi 2022-05-06 17:12:48 +0800
• d1be1ce22d Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial yuan_yi 2022-05-06 14:52:40 +0800
• 0c1b8f8d99 websocket yuan_yi 2022-05-06 14:52:34 +0800
• 25c88dea6b nvr新增刷新列表 deartibers 2022-05-06 14:30:00 +0800
• f1f3a17be3 解决冲突 wenlele 2022-05-06 14:17:10 +0800
• 870afbcd47 解决冲突 wenlele 2022-05-06 14:14:48 +0800
• ee8881a661 修改nvr deartibers 2022-05-06 11:35:14 +0800
• b9ac39955c 表格功能完成 wenlele 2022-05-06 09:43:58 +0800
• c23c764238 表格功能完成 wenlele 2022-05-06 09:36:56 +0800
• 981dc894c4 nvr接口调试以及摄像头页面 deartibers 2022-05-05 17:19:30 +0800
• 37779c29b9 注释以运行 yuan_yi 2022-05-05 14:54:16 +0800
• 255466ef39 api -u yuan_yi 2022-05-05 14:46:29 +0800
• 12be6e0ba6 redis精简 yuan_yi 2022-05-05 11:07:22 +0800
• 29de0083a4 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial yuan_yi 2022-05-05 10:34:09 +0800
• 685f65affd 获取nvr的接口 yuan_yi 2022-05-05 10:34:04 +0800
• 2bee6dc9a3 Merge branch 'dev_trial' of ssh://gitea.free-sun.vip:2022/free-sun/FS-IOT into dev_trial wenlele 2022-04-29 17:16:10 +0800
• 7113aaf672 表格设置完成 wenlele 2022-04-29 17:15:53 +0800
• a45a0a9a50 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial deartibers 2022-04-29 16:56:28 +0800
• c3a82d8979 添加摄像头页面 deartibers 2022-04-29 16:56:17 +0800
• 4168be60d7 删除 AUTH yuan_yi 2022-04-29 15:24:03 +0800
• 8c4cffa8b5 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial yuan_yi 2022-04-29 15:23:32 +0800
• 068c0a6e50 NVR 增删接口 yuan_yi 2022-04-29 15:23:26 +0800
• bdbd43ef73 删除px deartibers 2022-04-29 08:53:03 +0800
• b1d1b4bfb5 nvr弹出框交互 deartibers 2022-04-28 16:37:32 +0800
• 525d99c736 BUG修改 wenlele 2022-04-28 16:34:23 +0800
• 90b6c11a3f auth 参数配置 yuan_yi 2022-04-28 16:12:35 +0800
• 6f23175395 namePresent yuan_yi 2022-04-28 15:40:56 +0800
• 3e898f7a3e 登录登出 yuan_yi 2022-04-28 14:52:14 +0800
• 85b64e95c4 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial yuan_yi 2022-04-28 14:14:53 +0800
• d18dfa9c30 登录登出 yuan_yi 2022-04-28 14:14:46 +0800
• 27594bada8 弹框修改 deartibers 2022-04-28 13:47:36 +0800
• 5744fe52b8 表格修改 wenlele 2022-04-28 13:44:17 +0800
• 6c712920c8 Merge branch 'dev_trial' of ssh://gitea.free-sun.vip:2022/free-sun/FS-IOT into dev_trial wenlele 2022-04-27 17:23:22 +0800
• b6ed892275 冲突更改 wenlele 2022-04-27 17:23:05 +0800
• 1aad3c3bef 修改问题 deartibers 2022-04-27 17:21:52 +0800
• 3f5742570b 表格 wenlele 2022-04-27 17:16:59 +0800
• 00610e8c2a Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial deartibers 2022-04-27 17:12:35 +0800
• 1ebc1f15ae 添加nvr弹框 deartibers 2022-04-27 17:12:27 +0800
• f1c3748571 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial yuan_yi 2022-04-27 16:25:26 +0800
• c494dce09e recycle_banner.mp4 yuan_yi 2022-04-27 16:25:18 +0800
• 72f2e341b4 nvr管理头部弹框 deartibers 2022-04-27 16:18:56 +0800
• d1eab76dd0 Merge branch 'main' of ssh://gitea.free-sun.vip:2022/free-sun/FS-IOT into main main yinweiwen 2022-04-27 13:58:25 +0800
• 3bf01d91a8 new file: imgs/md/image-20220427105700305.png new file: imgs/md/image-20220427112426602.png new file: imgs/md/image-20220427113550589.png new file: "\350\276\271\347\274\230\347\275\221\345\205\263.vsdx" new file: "\350\276\271\347\274\230\347\275\221\345\205\263\345\212\237\350\203\275\345\261\225\346\234\233\345\222\214\345\272\224\347\224\250\345\234\272\346\231\257.md" "../\350\256\241\345\210\222/\347\211\251\350\201\224\347\275\221\346\204\237\347\237\245\345\271\263\345\217\260\344\272\247\345\223\201\347\272\277\345\221\250\346\212\24504.18~04.22.docx" yinweiwen 2022-04-27 13:56:53 +0800
• 07f13a617f video banner yuan_yi 2022-04-27 11:45:26 +0800
• d192b64407 camera_banner yuan_yi 2022-04-27 11:16:28 +0800
• 333330d9c3 nvr banner yuan_yi 2022-04-27 11:14:50 +0800
• b122c1e11c Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial yuan_yi 2022-04-27 11:07:43 +0800
• 06648ff786 DB模型 yuan_yi 2022-04-27 11:07:39 +0800
• 33b42ed889 banner视频 deartibers 2022-04-27 11:02:39 +0800
• a8f7b63cac 格式 wenlele 2022-04-27 10:53:48 +0800
• 29a904dce8 冲突解决 wenlele 2022-04-27 10:43:38 +0800
• 911e502bf4 Merge wenlele 2022-04-27 10:42:52 +0800
• 6e92a71354 测试 wenlele 2022-04-27 10:26:52 +0800
• 67c41bd4d9 nvr头部 deartibers 2022-04-27 10:19:08 +0800
• 15420f0c96 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial deartibers 2022-04-27 09:15:17 +0800