kun
|
427d46ca37
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-13 11:19:42 +08:00 |
|
kun
|
0d09b54695
|
fix: 项目看板安全教育修改以及代码合并
|
2024-06-13 11:19:41 +08:00 |
|
Vce
|
35fd369831
|
fix:修改指挥部大屏右下角特殊作业统计分析显示作业数量
|
2024-06-13 00:38:18 +08:00 |
|
Vce
|
d2a0173388
|
fix:修改指挥部大屏中下部分”隐患检查推送“显示超期状态
|
2024-06-13 00:31:11 +08:00 |
|
Vce
|
0950addcae
|
fix:解决冲突Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-12 22:38:28 +08:00 |
|
Vce
|
c908c79e55
|
feat:添加现场大屏整体框架,完成现场大屏承包商项目信息、AI报警情况以及特殊作业情况的静态页面绘画
|
2024-06-12 22:11:48 +08:00 |
|
|
|
173f4be04d
|
提交大屏总览
|
2024-06-12 19:20:02 +08:00 |
|
|
|
e02871104e
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-12 18:48:12 +08:00 |
|
kun
|
e64d92cc64
|
feat: 项目看板大屏页面添加
|
2024-06-12 18:15:09 +08:00 |
|
kun
|
6202602cbe
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-12 17:31:56 +08:00 |
|
kun
|
093c339fd1
|
fix: BUG修改
|
2024-06-12 17:31:54 +08:00 |
|
Vce
|
809e3a1f34
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-12 16:41:20 +08:00 |
|
Vce
|
2736ef511c
|
修改指挥部大屏的中下部分“隐患检查推送”为定时30S获取一次,获取实时的隐患状态并修改显示消息通知格式以及指挥部大屏右下“特殊作业统计分析”修改为堆叠图
|
2024-06-12 16:41:15 +08:00 |
|
kun
|
ae490f9489
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-12 11:29:39 +08:00 |
|
kun
|
e0026e8f60
|
fix: BUG修改
|
2024-06-12 11:29:37 +08:00 |
|
|
|
3059dfeda5
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-06 17:02:54 +08:00 |
|
|
|
18847896db
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-06 17:01:17 +08:00 |
|
|
|
73897ae1eb
|
修改报警
|
2024-06-06 17:00:17 +08:00 |
|
kun
|
d78ce42578
|
fix: 冲突解决以及BUG修改
|
2024-06-06 09:26:02 +08:00 |
|
kun
|
a42f0385cb
|
fix: BUG修改
|
2024-06-06 09:25:34 +08:00 |
|
Vce
|
f434c4652b
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-06 00:20:34 +08:00 |
|
Vce
|
85f3c8575e
|
修改水波图
|
2024-06-06 00:19:28 +08:00 |
|
|
|
59a17d392d
|
flx:冲突
|
2024-06-05 22:48:37 +08:00 |
|
|
|
b6cfe00059
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-05 22:46:54 +08:00 |
|
|
|
f5e57324d3
|
无感刷新
|
2024-06-05 22:46:23 +08:00 |
|
|
|
d8026508e2
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-05 20:08:22 +08:00 |
|
|
|
29cbdcfc6b
|
无感刷新
|
2024-06-05 18:31:26 +08:00 |
|
kun
|
d1d8ebd656
|
fix: BUG修改
|
2024-06-05 15:58:24 +08:00 |
|
kun
|
0367457730
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-05 15:21:58 +08:00 |
|
kun
|
c342e06707
|
fix: BUG修改
|
2024-06-05 15:21:57 +08:00 |
|
Vce
|
89307c3e69
|
修改bug
|
2024-06-05 14:47:05 +08:00 |
|
Vce
|
7c82f0abb0
|
增加安全评分根据分值修改背景光晕颜色
|
2024-06-05 14:41:13 +08:00 |
|
Vce
|
0763058759
|
添加判断
|
2024-06-04 23:02:08 +08:00 |
|
Vce
|
ca1a598607
|
修改柱状图hover显示
|
2024-06-04 22:23:06 +08:00 |
|
Vce
|
99c597d136
|
Merge branch 'cjw-dev' into shenzhen-dev
|
2024-06-04 22:06:57 +08:00 |
|
Vce
|
ee8a6c4dcc
|
调整安全评分样式
|
2024-06-04 22:06:29 +08:00 |
|
Vce
|
07c5b67467
|
修改bug
|
2024-06-04 22:06:05 +08:00 |
|
Vce
|
449c8612f1
|
添加安全评分背景颜色
|
2024-06-04 21:45:21 +08:00 |
|
|
|
e23394d58e
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-04 21:38:16 +08:00 |
|
kun
|
93ae5c4037
|
fix: 冲突解决
|
2024-06-04 21:32:17 +08:00 |
|
kun
|
d80216cd61
|
fix: BUG修改
|
2024-06-04 21:31:55 +08:00 |
|
|
|
215c26fd76
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-04 20:14:56 +08:00 |
|
|
|
e1b002cc17
|
提交大屏应急弹窗
|
2024-06-04 20:13:38 +08:00 |
|
|
|
efc4fffade
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-04 19:59:27 +08:00 |
|
|
|
d1776b131e
|
1
|
2024-06-04 19:59:18 +08:00 |
|
|
|
fb6b8bddae
|
提交大屏警告
|
2024-06-04 19:16:37 +08:00 |
|
|
|
c272e3473c
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-04 10:01:27 +08:00 |
|
|
|
609b1b0318
|
修改细节问题
|
2024-06-04 10:00:55 +08:00 |
|
Vce
|
e51077ac92
|
修改责任单位隐患整改率统计
|
2024-06-04 00:21:58 +08:00 |
|
Vce
|
8973095146
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-03 22:20:59 +08:00 |
|