kun
|
2f54c80e97
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-13 20:35:30 +08:00 |
|
kun
|
d173148ca6
|
fix: 代码合并
|
2024-06-13 20:35:28 +08:00 |
|
|
|
f34fe9bfa5
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-13 18:41:52 +08:00 |
|
|
|
f899a097d6
|
flx：冲突
|
2024-06-13 18:40:46 +08:00 |
|
|
|
3f461a201f
|
feat：添加总览大屏
|
2024-06-13 18:39:41 +08:00 |
|
kun
|
2055f6f3ef
|
fix: echarts图依赖安装
|
2024-06-13 17:15:24 +08:00 |
|
kun
|
200c73e983
|
fix: 鞍钢集团项目看板页面修改
|
2024-06-13 17:08:56 +08:00 |
|
|
|
b9ec4d0511
|
flx：解决冲突 新增项目总览大屏
|
2024-06-13 16:57:27 +08:00 |
|
kun
|
d93bf70c07
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-13 16:53:33 +08:00 |
|
kun
|
2ee5827a20
|
feat: 鞍钢集团项目看板内容页面添加以及合并代码
|
2024-06-13 16:53:31 +08:00 |
|
|
|
bbc8d8a08c
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-13 16:52:42 +08:00 |
|
|
|
39e1f27b60
|
flx:冲突
|
2024-06-13 16:50:59 +08:00 |
|
|
|
1f0f4e7a5f
|
flx：冲突
|
2024-06-13 16:48:21 +08:00 |
|
Vce
|
f1a9d62f25
|
Merge branch 'cjw-dev' into shenzhen-dev
|
2024-06-13 16:36:04 +08:00 |
|
Vce
|
c0eb6cd8f0
|
fix：按照客户需求修改指挥部大屏中下部分隐患检查推送不显示超期状态
|
2024-06-13 16:35:53 +08:00 |
|
Vce
|
6002913671
|
feat:完成现场大屏中下右部分质量待办、右上部分应急记录以及右下部分安全待办部分的静态页面开发
|
2024-06-13 16:33:10 +08:00 |
|
|
|
770887684f
|
flx：冲突
|
2024-06-13 13:39:57 +08:00 |
|
|
|
d74e071378
|
flx：冲突
|
2024-06-13 13:37:00 +08:00 |
|
|
|
c45a95a204
|
1
|
2024-06-13 12:01:20 +08:00 |
|
Vce
|
d74641e980
|
Merge branch 'cjw-dev' into shenzhen-dev
|
2024-06-13 11:36:19 +08:00 |
|
Vce
|
6209420a28
|
fix:修改指挥部大屏中下部分隐患检查推送中超期数据只显示超期未整改的
|
2024-06-13 11:35:58 +08:00 |
|
Vce
|
8b6780a373
|
Merge branch 'cjw-dev' into shenzhen-dev
|
2024-06-13 11:30:11 +08:00 |
|
Vce
|
ea373fa41f
|
feat:完成现场大屏中下左边部分劳务实名制静态页面开发
|
2024-06-13 11:29:46 +08:00 |
|
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 |
|
