|
|
30ab53c652
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-25 22:02:08 +08:00 |
|
|
|
d2212f45b0
|
flx：隐藏项目后台
|
2024-06-25 22:01:24 +08:00 |
|
kun
|
17b8dad36e
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-25 21:00:20 +08:00 |
|
kun
|
de610ef2b9
|
fix: 跳转链接修改
|
2024-06-25 21:00:19 +08:00 |
|
Vce
|
7662c014c8
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-25 16:53:43 +08:00 |
|
Vce
|
68aa41f75d
|
fix:修改总览大屏和项目看板的各企业本周数据统计自动切换时间为10秒
|
2024-06-25 16:53:40 +08:00 |
|
kun
|
fc6b1fe40f
|
fix: 合并代码以及解决冲突
|
2024-06-25 16:41:00 +08:00 |
|
kun
|
78d303370d
|
fix: 环境添加
|
2024-06-25 16:40:33 +08:00 |
|
Vce
|
814e53ad9e
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-25 14:58:00 +08:00 |
|
Vce
|
530682cffb
|
fix:修改现场大屏标题以及特殊作业echaarts图颜色
|
2024-06-25 14:57:54 +08:00 |
|
|
|
d5e56c3a3b
|
flx：修改登录权限判断 修改看板样式问题
|
2024-06-25 10:37:48 +08:00 |
|
|
|
69843e72c7
|
flx：现场大屏样式修改
|
2024-06-24 23:33:49 +08:00 |
|
|
|
1dcda2bd7e
|
flx：修改指挥部大屏 项目看板样式问题
|
2024-06-24 22:37:07 +08:00 |
|
|
|
168a793600
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-24 17:49:41 +08:00 |
|
|
|
832587181e
|
flx：修改指挥部大屏文字
|
2024-06-24 17:12:04 +08:00 |
|
|
|
031c32d6f7
|
flx：新增指挥部大屏安全风险隐患总数
|
2024-06-24 17:08:30 +08:00 |
|
|
|
db07f825c3
|
flx：修改人员风险样式问题
|
2024-06-24 16:19:39 +08:00 |
|
|
|
354b197ae5
|
flx：调整总览大屏样式遮挡
|
2024-06-24 15:22:10 +08:00 |
|
|
|
ef179d8ae7
|
flx：修改总览大屏样式问题 指挥部大屏显示问题
|
2024-06-24 14:27:58 +08:00 |
|
Vce
|
7adf5b84cb
|
fix：修改现场大屏距离完工还剩多少天的字段
|
2024-06-24 13:54:58 +08:00 |
|
|
|
2695f1efd0
|
flx：修改指挥部大屏样式问题
|
2024-06-21 18:47:03 +08:00 |
|
Vce
|
75527d96e4
|
Merge branch 'cjw-dev' into shenzhen-dev
|
2024-06-21 18:21:42 +08:00 |
|
Vce
|
3ffaade9ad
|
fix：修改现场大屏劳务实名制字段
|
2024-06-21 17:32:05 +08:00 |
|
|
|
cb90879199
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-20 23:20:04 +08:00 |
|
|
|
0541c84536
|
flx：修改项目看板风险颜色
|
2024-06-20 23:19:37 +08:00 |
|
Vce
|
0e4e286388
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-20 18:54:14 +08:00 |
|
Vce
|
b582ebdb89
|
fix:修改现场大屏安全待办以及质量待办样式
|
2024-06-20 18:53:44 +08:00 |
|
|
|
3a474d2c92
|
flx：修改看板 总览 雷达图字体超出省略号
|
2024-06-20 18:51:02 +08:00 |
|
|
|
0d3d4241b7
|
flx：调整项目总览 项目看板 指挥部大屏 样式问题
|
2024-06-20 17:41:09 +08:00 |
|
|
|
535a0981b4
|
flx：调整总览大屏 项目看板轮播图样式问题
|
2024-06-20 16:08:49 +08:00 |
|
|
|
a4ccb44511
|
flx：修改项目看板 总览大屏样式问题
|
2024-06-20 15:28:59 +08:00 |
|
|
|
66aedd6eed
|
flx：冲突
|
2024-06-20 10:20:08 +08:00 |
|
|
|
81e524c0dc
|
flx:冲突
|
2024-06-20 10:17:40 +08:00 |
|
|
|
f579491e4a
|
flx：修改项目大屏和总览大屏样式问题
|
2024-06-20 10:15:24 +08:00 |
|
Vce
|
cb98b23f45
|
fix:判断现场大屏雄本地与鞍钢正式和测试环境的项目Sn判断
|
2024-06-20 10:06:08 +08:00 |
|
Vce
|
7b933c75f8
|
fix：现场大屏所有接口暂时写死projectSn，部署时需根据环境来切换相应的projectSn，已在切换环境的地方做好注释说明
|
2024-06-20 00:37:29 +08:00 |
|
Vce
|
5d8fc0f44e
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
|
2024-06-20 00:36:26 +08:00 |
|
Vce
|
c6c84b7f4f
|
fix:现场大屏所有接口暂时写死projectSn，部署时需根据环境来切换相应的projectSn
|
2024-06-20 00:36:07 +08:00 |
|
|
|
0f60a72dd5
|
flx:冲突
|
2024-06-19 23:55:50 +08:00 |
|
|
|
b302fe4ddc
|
flx：冲突
|
2024-06-19 23:55:08 +08:00 |
|
|
|
bc0eb11742
|
flx：config配置
|
2024-06-19 23:52:06 +08:00 |
|
|
|
9fb652a257
|
flx：冲突
|
2024-06-19 23:37:50 +08:00 |
|
|
|
66a5a51037
|
flx：上传指挥部大屏风险
|
2024-06-19 23:35:19 +08:00 |
|
|
|
9a8b432645
|
flx冲突
|
2024-06-19 22:26:55 +08:00 |
|
|
|
9f3dff0d17
|
flx：配置冲突
|
2024-06-19 22:26:09 +08:00 |
|
|
|
0ebf0ab9a4
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-19 22:25:00 +08:00 |
|
|
|
4f99277a9f
|
flx：提交总览大屏和项目看板
|
2024-06-19 22:24:42 +08:00 |
|
|
|
63ef13545a
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-19 21:15:39 +08:00 |
|
Vce
|
52d7a7fdd2
|
fix：修改现场大屏只能由供应商登录
|
2024-06-19 21:13:25 +08:00 |
|
|
|
b0b20c81d6
|
flx：冲突
|
2024-06-19 20:33:56 +08:00 |
|
