 guangyin
|
f9eca566da
|
feat:更换导览图片
|
2023-05-23 16:52:52 +08:00 |
吴延福
|
1a88c53925
|
feat：新增火焰效果
|
2023-05-23 16:48:55 +08:00 |
|
guangyin
|
193d453f22
|
Merge branch 'master' into guangyin
|
2023-05-23 11:47:32 +08:00 |
|
guangyin
|
99132162bd
|
feat:获取设施点位
|
2023-05-23 11:47:16 +08:00 |
|
吴延福
|
d66c99cf90
|
feat:新增框架内容
|
2023-05-23 11:46:06 +08:00 |
|
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 |
|
吴延福
|
c6caff4dba
|
Merge commit '3d3871d14ce3f4906597b22c630658ef312e8c96'
|
2023-05-19 16:39:18 +08:00 |
|
吴延福
|
80dab92333
|
feat:新增导览路径
|
2023-05-19 16:39:07 +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 |
|
吴延福
|
ccbece898b
|
style：删除注释
|
2023-05-18 16:52:19 +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
|
25db0220d7
|
Merge remote-tracking branch 'origin/master'
|
2023-05-18 16:22:25 +08:00 |
|
吴延福
|
ed9d5af62d
|
feat:新增封装方法
|
2023-05-18 16:22:02 +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
|
8ea6b03bc5
|
feat:导览页面数据模拟
|
2023-05-18 14:57:41 +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 |
|
吴延福
|
adb9380b5f
|
Merge commit '43cf540d8f1fc5390d86159da463c4d80094e03c'
|
2023-05-18 14:06:40 +08:00 |
|
吴延福
|
3edba6f3a9
|
feat:新增火焰交互
|
2023-05-18 14:06:30 +08:00 |
|
guangyin
|
43cf540d8f
|
feat:导览页面数据模拟
|
2023-05-18 13:59:02 +08:00 |
|
guangyin
|
1316579757
|
Merge branch 'guangyin'
|
2023-05-18 11:04:05 +08:00 |
|
guangyin
|
9d89e41130
|
feat:导览页面数据模拟
|
2023-05-18 11:03:46 +08:00 |
|
吴延福
|
a298037c7d
|
feat:新增导览路线
|
2023-05-18 11:01:39 +08:00 |
|
吴延福
|
276d9e1c2c
|
Merge commit '957fff1316354747733661fc2ac898fe3ce9964f'
|
2023-05-18 10:45:56 +08:00 |
|
吴延福
|
cb149a0446
|
feat:新增导览路径
|
2023-05-18 10:45:45 +08:00 |
|
guangyin
|
957fff1316
|
Merge branch 'guangyin'
|
2023-05-18 10:35:21 +08:00 |
|
guangyin
|
4132bfa038
|
feat:导览页面数据模拟
|
2023-05-18 10:35:05 +08:00 |
|
guangyin
|
f71156aac9
|
Merge branch 'guangyin'
|
2023-05-18 10:23:53 +08:00 |