Commit Graph

52 Commits (91ca3ebc501075e54f1c88d32c6b5d58b288e49b)

Author SHA1 Message Date
guangyin 91ca3ebc50 feat:获取设施点位 2023-05-19 17:59:58 +08:00
guangyin 375d511c07 Merge branch 'master' into guangyin 2023-05-19 17:19:32 +08:00
吴延福 f9fec9731a feat:新增事件打印 2023-05-19 17:18:54 +08:00
guangyin 4d6ebe4af4 Merge branch 'master' into guangyin
# Conflicts:
#	src/views/overview.component.html
#	src/views/overview.component.ts
2023-05-19 17:18:21 +08:00
吴延福 b05d7fb1ce feat:修改导览交互 2023-05-19 16:48:54 +08:00
guangyin 3c4cbd6e49 feat:右侧全屏后添加暂停播放按钮 2023-05-19 16:48:45 +08:00
guangyin 3d3871d14c feat:右侧全屏后添加暂停播放按钮 2023-05-19 16:28:34 +08:00
guangyin ab8f893edc feat:树形数据调整 告警列表改为设施列表 2023-05-19 16:00:01 +08:00
guangyin 53c45ab6db feat:右侧弹出告警详情切换后没关闭 2023-05-19 09:51:58 +08:00
guangyin c7c09b5ca9 feat:右侧弹出告警详情 2023-05-18 17:11:05 +08:00
guangyin e3bc8cd3d9 Merge branch 'master' into guangyin
# Conflicts:
#	src/views/overview.component.ts
2023-05-18 17:04:59 +08:00
guangyin 0a13e6fda2 feat:右侧弹出告警详情 2023-05-18 17:03:24 +08:00
guangyin 46bbbb9db7 feat:右侧弹出告警详情 2023-05-18 16:53:24 +08:00
吴延福 c1761b3a6a feat:新增车辆人员弹窗 2023-05-18 16:51:40 +08:00
吴延福 5f89bf6a85 feat:新增页面切换时删除告警点位 2023-05-18 16:33:39 +08:00
吴延福 15165f96fa feat:新增告警效果 2023-05-18 16:31:37 +08:00
guangyin 679390c026 Merge branch 'master' into guangyin 2023-05-18 16:21:45 +08:00
guangyin 250579d1e0 feat:导览页面树交互调整 2023-05-18 16:21:29 +08:00
吴延福 6fe0020264 style:删除console 2023-05-18 15:51:18 +08:00
吴延福 c5a3e310cc feat:新增菜单修改时关闭火焰 2023-05-18 15:33:50 +08:00
吴延福 7f3ba6f65e feat:新增火焰弹窗 2023-05-18 15:30:12 +08:00
guangyin 730cbd1858 Merge branch 'master' into guangyin
# Conflicts:
#	src/views/overview.component.ts
2023-05-18 15:18:08 +08:00
guangyin 7b50662ef3 feat:导览页面树交互调整 2023-05-18 15:16:52 +08:00
吴延福 c8dde03c28 feat:新增火焰 2023-05-18 15:14:12 +08:00
guangyin f9e8dc33b8 Merge branch 'master' into guangyin 2023-05-18 14:55:55 +08:00
guangyin 27c4522b05 feat:导览页面数据模拟 2023-05-18 14:55:46 +08:00
吴延福 dc0a11a501 feat:调整火焰位置 2023-05-18 14:55:02 +08:00
吴延福 f0de2e4001 feat:新增火灾窗口 2023-05-18 14:31:35 +08:00
吴延福 3edba6f3a9 feat:新增火焰交互 2023-05-18 14:06:30 +08:00
吴延福 a298037c7d feat:新增导览路线 2023-05-18 11:01:39 +08:00
guangyin f71156aac9 Merge branch 'guangyin' 2023-05-18 10:23:53 +08:00
guangyin c7be35f12b feat:删除无用图片
feat:导览页面数据模拟
2023-05-18 10:23:22 +08:00
吴延福 4a5973d657 Merge commit 'a37cd8f9fca8289f949525bdc26e73834565176f' 2023-05-18 09:13:47 +08:00
吴延福 0361dc06ed feat:新增周界 2023-05-18 09:13:35 +08:00
guangyin a37cd8f9fc feat:添加退出导览按钮 2023-05-18 09:12:05 +08:00
吴延福 378de94183 Merge commit 'b3d6a8aa29f6c78004b5137827b3511dd8f8941a' 2023-05-17 18:09:28 +08:00
吴延福 9eecbf8fdb feat:新增自由导览 2023-05-17 18:09:16 +08:00
guangyin b3d6a8aa29 Merge branch 'master' into guangyin 2023-05-17 16:56:27 +08:00
guangyin 7dde068ed0 feat:运营管理页面搭建 2023-05-17 16:54:11 +08:00
吴延福 c9a45ca8f6 feat:新增自由导览 2023-05-17 16:48:12 +08:00
吴延福 9a94cd4e0e Merge commit 'e83e91434742112d7100e93e6a770bdd9104d475' 2023-05-17 15:52:35 +08:00
吴延福 fb20e164c7 feat:新增地图方法 2023-05-17 15:52:16 +08:00
guangyin e83e914347 feat:导览页搭建完成 2023-05-17 15:07:29 +08:00
guangyin f13a95d92d Merge branch 'master' into guangyin
# Conflicts:
#	src/views/overview.component.ts
2023-05-16 18:09:33 +08:00
guangyin 0937577802 feat:首页搭建完成
feat:导览页搭建
2023-05-16 18:08:36 +08:00
吴延福 5b6fa34bb9 feat:新增弹窗页面样式 2023-05-16 18:03:04 +08:00
吴延福 9b147841d4 fixed:修改配置文件 2023-05-16 16:33:33 +08:00
guangyin d580a6f1dc Merge branch 'master' into guangyin
# Conflicts:
#	src/views/overview.component.ts
2023-05-16 16:16:33 +08:00
guangyin 68aaa9ad58 feat:首页搭建 2023-05-16 16:13:55 +08:00
吴延福 3d77e7584f style:清空无效代码 2023-05-16 16:10:28 +08:00