Commit Graph

674 Commits

Author SHA1 Message Date
b1ff2cc8e1 Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr 2024-03-25 18:05:26 +08:00
a8f06847bc 融合通信管理平台————应急与消防知识库平台->知识库管理 更新 2024-03-25 18:05:19 +08:00
adb3e1df41 Merge remote-tracking branch 'origin/main' 2024-03-25 18:03:37 +08:00
5b031ccba1 feat 2024-03-25 18:02:25 +08:00
6a837a7b2b fix:bug 2024-03-25 18:00:13 +08:00
89152bfb22 ffeat: llogin 2024-03-25 17:52:44 +08:00
bf0e2366ee Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr 2024-03-25 17:37:31 +08:00
9952885a7b fix 2024-03-25 17:37:14 +08:00
d40b074f06 Merge remote-tracking branch 'origin/main' 2024-03-25 17:33:53 +08:00
4e6e06c6a4 fix: 会议管理录像上传改 2024-03-25 17:33:43 +08:00
9c33aa8af2 Merge remote-tracking branch 'origin/main' 2024-03-25 17:33:06 +08:00
6f82cb1f4e ytr 2024-03-25 17:32:33 +08:00
29b8c76713 融合通信管理平台————应急与消防知识库平台->知识库管理 更新 2024-03-25 17:31:09 +08:00
185b3f4b79 Merge remote-tracking branch 'origin/main' 2024-03-25 17:20:37 +08:00
c68095cbae ytr 2024-03-25 17:18:50 +08:00
cb8862f8c2 feat:融合通信管理平台 监测预警系统平台视频查看 2024-03-25 17:16:16 +08:00
f72199ca2e Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr 2024-03-25 17:10:16 +08:00
64041064dc 融合通信,添加下载文件按钮 2024-03-25 17:10:08 +08:00
f05f6a5125 Merge remote-tracking branch 'origin/main' 2024-03-25 17:09:30 +08:00
a6542d78fe feat: 应急业务平台-统计报告 2024-03-25 17:09:12 +08:00
780cebab13 Merge pull request 'feat: 综合指挥支撑子系统平台' (#22) from zhoumingxiu into main
Reviewed-on: http://117.73.11.115:3000/Tony/god-ytr/pulls/22
2024-03-25 17:05:13 +08:00
f259d31086 feat: 综合指挥支撑子系统平台 2024-03-25 17:03:23 +08:00
6ba06531d1 feat:融合通信管理平台 2024-03-25 16:57:33 +08:00
dcaca101b4 Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr 2024-03-25 16:57:04 +08:00
35d28b2b76 feat:融合通信管理平台bug 2024-03-25 16:56:24 +08:00
88d2673860 fix:bug 2024-03-25 16:56:20 +08:00
8890e5256d feat:融合通信管理平台bug 2024-03-25 16:54:09 +08:00
f98b769628 Merge remote-tracking branch 'refs/remotes/origin/main' 2024-03-25 16:43:16 +08:00
e301333ece Merge remote-tracking branch 'refs/remotes/origin/main' 2024-03-25 16:42:47 +08:00
zhaofei06
d797856cfc Merge remote-tracking branch 'origin/main' 2024-03-25 16:42:14 +08:00
zhaofei06
8be7bbc894 feat:应急救援平台-标准的接入功能、监测预警系统平台-视频数据接入 2024-03-25 16:41:40 +08:00
8b0ad42e49 feat:融合通信管理平台 bug 2024-03-25 16:40:27 +08:00
fd1f3470e9 feat:融合通信管理平台bug 2024-03-25 16:37:41 +08:00
34059f3d6b Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr 2024-03-25 16:37:18 +08:00
48bc69340f Merge remote-tracking branch 'origin/main' 2024-03-25 16:36:56 +08:00
96ac7c3e4a feat:融合通信管理平台 bug 2024-03-25 16:34:38 +08:00
0abe973945 Merge remote-tracking branch 'origin/main' 2024-03-25 16:34:08 +08:00
4b7591bef6 Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr 2024-03-25 16:33:47 +08:00
8bb9d5170f 融合通信管理平台,应急响应,调度方案,作战力量第一版 2024-03-25 16:33:38 +08:00
6b1c19b7f9 fix: 会议管理录像上传 2024-03-25 16:33:29 +08:00
9195172b46 feat:融合通信管理平台 bug 2024-03-25 16:32:51 +08:00
27dffb0359 Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr 2024-03-25 16:32:15 +08:00
45c357ebbd feat:融合通信管理平台 bug 2024-03-25 16:30:44 +08:00
91b5fc0e23 feat:融合通信管理平台中监测预警系统平台、应急救援平台中现场固定视频整合接入研发 2024-03-25 16:29:58 +08:00
82b9e21705 fix:bug 2024-03-25 16:28:23 +08:00
6799ec04b0 ytr 2024-03-25 16:26:14 +08:00
6d950b1ce5 Merge remote-tracking branch 'origin/main' 2024-03-25 16:17:11 +08:00
5a11649772 fix:视频优化 2024-03-25 16:17:02 +08:00
1456391dc8 feat: 应急业务平台-资讯管理、图表分析、决策分析 2024-03-25 16:15:52 +08:00
13d3f9d41c feat: 地图 2024-03-25 16:09:05 +08:00