668 Commits

Author SHA1 Message Date
Vce
fb286c173f feat:完成现场大屏中上部分安全教育接口对接
fix:调整左下部分特殊作业情况、中上部分安全教育、中下左部分劳务实名制、中下右部分质量待办、右上部分应急记录、右下部分安全待办的细节样式
2024-06-15 20:31:54 +08:00
ac9ba34758 Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain 2024-06-15 17:59:55 +08:00
255fdd1d6e flx:调整指挥部大屏样式 2024-06-15 17:58:41 +08:00
1cb144c1a6 Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain 2024-06-15 17:16:03 +08:00
cabb608193 feat:新增指挥部大屏雷达图展示 2024-06-15 17:09:21 +08:00
Vce
9872ca236e fix调整现场大屏中责任单位的样式及布局 2024-06-15 11:25:04 +08:00
74c403ecee Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain 2024-06-15 10:08:56 +08:00
f65de23079 flx:调整总览大屏样式问题 2024-06-15 10:08:38 +08:00
Vce
2a17e2347f Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev 2024-06-15 09:47:00 +08:00
Vce
fbe97c4393 fix:调整现场大屏样式以及添加责任单位字段 2024-06-15 09:46:11 +08:00
7138d5d032 Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain 2024-06-14 20:06:36 +08:00
89b0298466 flx:提交总览大屏数据接口 2024-06-14 20:06:07 +08:00
kun
bcc5ef2314 feat: 鞍钢集团项目大屏接口对接以及页面修改 2024-06-14 16:22:42 +08:00
6181bc06c6 Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain 2024-06-14 15:23:27 +08:00
f8296aa429 flx:绑定总览大屏接口 2024-06-14 15:23:11 +08:00
kun
549eafbb43 feat: 项目看板部分接口对接以及视频配置组件接口对接 2024-06-14 15:06:30 +08:00
Vce
500cc54d92 Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev 2024-06-13 22:00:30 +08:00
Vce
b6cb6bb904 feat:完成现场大屏中上部分安全教育静态页面开发
fix:优化现场大屏左上部分承包商项目信息布局、优化现场大屏左下部分特殊作业情况嵌套环形图、调整现场大屏中下右部分质量待办、右上部分应急记录以及右下部分安全待办
2024-06-13 21:57:10 +08:00
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