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

• 7ed76c4208 搜索修改 wenlele 2022-06-24 10:53:27 +0800
• 8d29279fd9 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial wenlele 2022-06-24 10:09:13 +0800
• bb9974c8b2 查询复制地址完成 wenlele 2022-06-24 10:09:09 +0800
• 4a3946d4cc 萤石状态推送 巴林闲侠 2022-06-24 09:55:29 +0800
• 756231efa7 fix websocket 信息推送 巴林闲侠 2022-06-24 09:47:32 +0800
• eb9789e6c0 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-06-24 09:09:05 +0800
• 1b16c8a05b makeDir 巴林闲侠 2022-06-24 09:09:03 +0800
• 35ab0b2fa6 完善导出 wenlele 2022-06-24 08:55:18 +0800
• e9e4b42060 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-06-23 11:27:58 +0800
• b3caa8a43a 级联添加接口 巴林闲侠 2022-06-23 11:27:55 +0800
• 26aa1c6ae8 头部敬语和摄像头页面设备状态查询添加 wenlele 2022-06-23 11:15:41 +0800
• a7d98ddcfc dockerfile 巴林闲侠 2022-06-23 08:47:27 +0800
• 8deb57ba1f Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-06-22 15:43:04 +0800
• fa513c5e8e 萤石状态广播测试 巴林闲侠 2022-06-22 15:43:02 +0800
• 5a0da83039 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial wenlele 2022-06-22 15:39:29 +0800
• f69525056b socket wenlele 2022-06-22 15:39:15 +0800
• 57e99c139a Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-06-22 14:25:07 +0800
• 7279365a62 iourl = root 巴林闲侠 2022-06-22 14:25:05 +0800
• e8d0d7c2d7 登录页添加背景文字 wenlele 2022-06-22 14:19:27 +0800
• 1f3dc736fb Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-06-22 14:17:31 +0800
• cfc281eddc yingshi state 巴林闲侠 2022-06-22 14:17:29 +0800
• d171c80b5a 添加新的模块 wenlele 2022-06-22 10:35:12 +0800
• 28756bee04 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-06-21 21:05:10 +0800
• eb5bbc2758 萤石状态查询 巴林闲侠 2022-06-21 21:05:08 +0800
• 03fc11ead2 NVR添加成功后弹框跳转和不再提醒功能（根据用户判断是否提醒） 100% 所有项目信息的去重重新展现问题 100% wenlele 2022-06-21 20:54:31 +0800
• de5d8f4283 videoOperationHistroyTime 巴林闲侠 2022-06-21 17:42:43 +0800
• 06f310034e Merge branches 'dev_trial' and 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-06-21 17:29:18 +0800
• 7826cbc581 videoOperationTime 巴林闲侠 2022-06-21 17:29:16 +0800
• af10506c47 从安心云四个摄像头的添加跳转到视频平台对应的摄像头添加 wenlele 2022-06-21 15:42:27 +0800
• b288d2156e 参数提示 巴林闲侠 2022-06-21 15:34:09 +0800
• b712b36be8 debug 巴林闲侠 2022-06-21 15:32:57 +0800
• 7db8194212 参数提示 巴林闲侠 2022-06-21 15:28:30 +0800
• a421a1671e docker 巴林闲侠 2022-06-21 15:01:53 +0800
• 5ad052f205 docker 巴林闲侠 2022-06-21 14:58:40 +0800
• 6553443e41 引用错误 巴林闲侠 2022-06-21 14:58:17 +0800
• ee23345513 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-06-21 13:30:54 +0800
• 89749c7dc2 定时任务 巴林闲侠 2022-06-21 13:30:52 +0800
• d1dbeeccae 删掉一个不用的按钮 wenlele 2022-06-20 17:32:39 +0800
• 26a9ff2b1f 冲突解决 wenlele 2022-06-20 17:28:46 +0800
• 45761dd89b 解决冲突 wenlele 2022-06-20 17:20:12 +0800
• 9958510f5c 从安心云四个摄像头的添加跳转到视频平台对应的摄像头添加 50% wenlele 2022-06-20 17:15:57 +0800
• 4d6398b7e5 dockerfile 巴林闲侠 2022-06-20 15:39:35 +0800
• 25902d6f22 jenkinsfile 巴林闲侠 2022-06-20 14:56:39 +0800
• e1dd11c50e sql脚本 巴林闲侠 2022-06-20 14:45:06 +0800
• aff86a6820 jenkinsfile 巴林闲侠 2022-06-20 14:33:16 +0800
• 54d4227b59 登录背景mp4 巴林闲侠 2022-06-20 11:26:45 +0800
• 65f427a12d sql脚本 巴林闲侠 2022-06-20 11:06:24 +0800
• 1cd95e5ad3 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-06-20 10:24:51 +0800
• 0debdb7c1d docker 文件 ，部分播放器样式 巴林闲侠 2022-06-20 10:24:49 +0800
• 3430ecb5e2 萤石，级联，ipc添加修改时通过接口测试的功能完成 wenlele 2022-06-20 10:15:47 +0800
• 2d9f850a9f NVR跳转传参功能完成,NVR摄像头获取视频流时交互样式 wenlele 2022-06-17 18:03:06 +0800
• 0594201af5 播放器样式 100% 巴林闲侠 2022-06-17 10:59:58 +0800
• 4cb212cbcf 级联摄像头的修改，表格项目信息 wenlele 2022-06-17 08:38:11 +0800
• acc1f98e13 video play UI 88% 巴林闲侠 2022-06-16 17:30:57 +0800
• c0ec917f01 语音样式 巴林闲侠 2022-06-15 21:30:25 +0800
• 5cc1e758ef Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-06-15 21:16:33 +0800
• e3d08b97f0 云控样式 巴林闲侠 2022-06-15 21:16:31 +0800
• ab8b7bc8d1 级联摄像头修改50% wenlele 2022-06-15 20:57:07 +0800
• 6369ae4c5e Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial wenlele 2022-06-15 19:39:24 +0800
• 53515f4a3d 表格设备名称的条件搜索 wenlele 2022-06-15 19:39:11 +0800
• a15fb7be51 登出、配置 巴林闲侠 2022-06-15 18:41:42 +0800
• b86cbbd98e Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-06-15 15:00:28 +0800
• 2c64beb088 跳转 100% 巴林闲侠 2022-06-15 15:00:26 +0800
• fa9cabdef0 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial wenlele 2022-06-14 15:58:42 +0800
• 68a7d60fa0 解决冲突 wenlele 2022-06-14 15:58:38 +0800
• 3b23a41e80 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial 巴林闲侠 2022-06-14 15:58:04 +0800
• 93b4754159 setAuthCrossLoading(false) 巴林闲侠 2022-06-14 15:58:00 +0800
• 0a210e2729 解决冲突 wenlele 2022-06-14 15:47:19 +0800
• 4b87887396 添加级联摄像头 wenlele 2022-06-14 15:46:48 +0800
• ec2b6fd849 添加级联摄像头 wenlele 2022-06-14 15:30:27 +0800
• f0842505d1 暂时的ip配置 巴林闲侠 2022-06-14 15:22:25 +0800
• b75fee46ea 视频播放组件 40% yuan_yi 2022-06-14 13:38:12 +0800
• 43a8402252 <边缘网关升级功能.md> yuxiaolei-patch-2 yuxiaolei 2022-06-09 03:34:01 +0000
• 458014d31e 上传文件至 'doc/方案/边缘网关' yuxiaolei-patch-1 yuxiaolei 2022-06-09 01:38:49 +0000
• 0956159fc8 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial yuan_yi 2022-06-07 17:27:48 +0800
• 12815a3cee mqtt 引入 40% yuan_yi 2022-06-07 17:27:41 +0800
• f468021def NVR添加修改的测试校验功能完成 wenlele 2022-06-06 17:43:07 +0800
• dfcac5c2fb setAuthCrossLoading(false) yuan_yi 2022-06-06 16:34:24 +0800
• c8e54329a7 摄像头验证接口 yuan_yi 2022-06-06 16:33:49 +0800
• d9739eed96 摄像头验证接口 yuan_yi 2022-06-06 16:33:22 +0800
• 720f3e29ef setAuthCrossLoading(false) yuan_yi 2022-06-06 08:59:05 +0800
• a0e55f01e7 暂 http://10.8.30.82 yuan_yi 2022-06-06 08:54:30 +0800
• 51c2f84976 ifream visibility: 'hidden' yuan_yi 2022-06-06 08:44:46 +0800
• 7dea13915d 添加NVR摄像头，解决NVR页面部分自测问题 wenlele 2022-06-02 20:25:44 +0800
• 8fd9b56cc7 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial wenlele 2022-06-02 20:24:11 +0800
• b31d5a8c1d 添加NVR摄像头，解决NVR页面部分自测问题 wenlele 2022-06-02 20:21:41 +0800
• 63e8968c10 AUTH CROSS yuan_yi 2022-06-02 20:19:26 +0800
• f8e5e30e57 Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial yuan_yi 2022-06-02 14:26:19 +0800
• 538fb4630a import react yuan_yi 2022-06-02 14:26:12 +0800
• 205f8f177e 萤石云摄像头和IPC摄像头的添加,摄像头删除 wenlele 2022-06-01 20:56:58 +0800
• 4794d63ffe 监控中心 yuan_yi 2022-06-01 20:00:05 +0800
• f7bd48bfaa 监控中心页 yuan_yi 2022-06-01 19:36:22 +0800
• ce47dbadcf 完善sider选择逻辑 yuan_yi 2022-06-01 19:12:30 +0800
• 77efe48d7c 回收站建设页 yuan_yi 2022-06-01 18:28:10 +0800
• 377503cbcb 导出实操 yuan_yi 2022-06-01 10:24:38 +0800
• 33e9e9b42a 导出实操 yuan_yi 2022-06-01 10:23:07 +0800
• 9d1096583e ipc 摄像头添加 yuan_yi 2022-05-31 20:57:29 +0800
• cffc4e95be 摄像头信息导出 yuan_yi 2022-05-31 10:47:50 +0800
• 44606dfd4c nvr 信息导出 yuan_yi 2022-05-31 09:41:25 +0800
• 8c5407347d xlsx简单文件通用下载 yuan_yi 2022-05-30 21:05:40 +0800