273 Commits

Author SHA1 Message Date
kun
3bba6b1ba8 fix: 冲突解决 2024-05-13 11:44:53 +08:00
kun
fd376320cd fix: BUG修改 2024-05-13 11:44:23 +08:00
Vce
b419461185 Merge branch 'dev-Rain' into shenzhen-dev 2024-05-13 02:39:47 +08:00
Vce
012ac4048f 更换接口以及调整样式 2024-05-13 02:00:37 +08:00
Vce
d69541caad fix:修复bug 2024-05-13 01:17:34 +08:00
kun
87698ed89c fix: BUG修改 2024-05-13 00:53:00 +08:00
Vce
e3be724729 fix: 冲突解决 2024-05-12 18:03:50 +08:00
Vce
2c08d6eca0 fix: BUG修改 2024-05-12 18:02:27 +08:00
kun
4c71583301 Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev 2024-05-12 17:54:34 +08:00
kun
dfa7bfd580 fix: BUG修改 2024-05-12 17:54:33 +08:00
Vce
ef35e21b3e Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev 2024-05-12 17:44:07 +08:00
Vce
269a6840d6 调整centerTop安全评分弹窗和centerBottom底部滚动速度 2024-05-12 17:43:36 +08:00
kun
ff976e1817 fix: BUG修改 2024-05-12 17:06:37 +08:00
kun
fdba33e4dc Merge branch 'dev-Rain' into shenzhen-dev 2024-05-12 09:37:47 +08:00
Vce
62d105281e 隐患智能分析 显示暂无 2024-05-12 09:11:26 +08:00
Vce
4fea6474fb 修改ai报警上方无数据不显示 2024-05-12 08:31:00 +08:00
Vce
37450d0558 Merge branch 'shenzhen-dev' into cjw-dev 2024-05-12 01:56:03 +08:00
Vce
7a45df231f 对接指挥部大屏centerTop 2024-05-12 01:52:37 +08:00
kun
7d16a1786b fix: BUG修改 2024-05-12 00:30:12 +08:00
kun
d984f715f8 Merge branch 'dev-Rain' into shenzhen-dev 2024-05-11 21:44:48 +08:00
kun
d86d25b681 fix: BUG修改 2024-05-11 21:43:15 +08:00
kun
1e651700d4 fix: BUG修改 2024-05-11 21:26:48 +08:00
kun
68cde83997 fix: BUG修改 2024-05-11 21:21:47 +08:00
Vce
78d05bea05 数据大屏右侧 2024-05-11 20:50:20 +08:00
kun
7a986d8ae7 fix: BUG修改 2024-05-11 19:15:44 +08:00
kun
e8d91ddef6 fix: BUG修改 2024-05-11 15:11:04 +08:00
kun
41d148a0d3 fix: 冲突解决以及BUG修改 2024-05-11 11:17:19 +08:00
Vce
1e0d3bfa3a 修改右侧 2024-05-11 11:10:48 +08:00
kun
8e8a177e53 fix: BUG修改 2024-05-11 11:07:32 +08:00
kun
1186b1804a fix: BUG修改 2024-05-11 02:51:04 +08:00
kun
ec424858c7 fix: BUG修改 2024-05-11 02:49:17 +08:00
2f5c27657a 1 2024-05-10 23:01:33 +08:00
kun
6c78be10b7 fix: BUG修改 2024-05-10 20:33:26 +08:00
kun
1ee154e05d fix: BUG修改 2024-05-09 00:55:59 +08:00
Vce
26846e6d7b fix:修改合肥启程临边不显示问题,以及为视频监控增加新字段判断 2024-05-05 01:44:26 +08:00
Vce
f327cd90c9 dev:添加鞍钢最新地址 2024-05-04 16:39:48 +08:00
Vce
f444a0284a dev:添加环境 2024-04-28 16:58:51 +08:00
Vce
670d3429db dev:指挥部大屏 2024-04-28 16:54:51 +08:00
Vce
c65093d484 dev:指挥部大屏 2024-04-28 16:48:53 +08:00
Vce
779b8684b0 dev:指挥部大屏 2024-04-28 01:15:21 +08:00
Vce
ac30afc740 dev:指挥部大屏 2024-04-27 22:50:10 +08:00
kun
64b4e67a55 fix: BUG修改 2024-04-27 19:34:59 +08:00
kun
aecd03ac09 feat: 页面新增以及BUG修改 2024-04-27 18:46:11 +08:00
Vce
eade95241c Merge branch 'cjw-dev' into shenzhen-dev 2024-04-27 13:44:03 +08:00
kun
ac4fe32f7f fix: BUG修改 2024-04-27 13:41:36 +08:00
Vce
7abfa01a06 dev:调整指挥部大屏布局 2024-04-27 13:41:13 +08:00
Vce
c67c9878d0 dev:指挥部 2024-04-27 09:47:16 +08:00
Vce
f80be897bf dev:指挥部大屏 2024-04-26 18:06:30 +08:00
Vce
0f4372aede fix:修改BUG 2024-04-25 23:33:56 +08:00
Vce
bfda6c9df2 调整中海臻如府项目菜单栏显示 2024-04-25 09:29:27 +08:00