|
|
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 |
|
Vce
|
a278b720e5
|
fix:修改现场大屏登录是显示账号类型不匹配
|
2024-06-19 20:23:36 +08:00 |
|
Vce
|
53307b21cc
|
Merge branch 'cjw-dev' into shenzhen-dev
|
2024-06-19 20:22:09 +08:00 |
|
Vce
|
cfd89da956
|
feat:完成现场大屏接口对接
|
2024-06-19 20:21:25 +08:00 |
|
|
|
ceda7e5fbf
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-19 19:38:02 +08:00 |
|
|
|
d430f578c4
|
flx：提交指挥部大屏风险开发
|
2024-06-19 19:36:55 +08:00 |
|
kun
|
39beca0a58
|
fix: 中科佳成项目跳转问题修改
|
2024-06-19 10:03:51 +08:00 |
|
kun
|
b93a9a68e1
|
fix: 中科佳成环境添加
|
2024-06-18 20:17:48 +08:00 |
|
kun
|
619f551237
|
fix: 合并代码以及冲突解决
|
2024-06-18 18:28:49 +08:00 |
|
kun
|
86020fcf89
|
feat: 中科佳成项目环境添加
|
2024-06-18 18:28:17 +08:00 |
|
|
|
53df39f602
|
Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-18 15:53:42 +08:00 |
|
|
|
25dc5c976d
|
flx：对接总览大屏和项目看板
|
2024-06-18 15:53:02 +08:00 |
|
kun
|
138fd5d63a
|
feat: 重庆南岸项目环境添加
|
2024-06-17 18:50:14 +08:00 |
|
kun
|
1e7dbb6019
|
fix: 解决冲突以及合并代码
|
2024-06-17 18:35:49 +08:00 |
|
kun
|
f1950be1ea
|
fix: 合并代码
|
2024-06-17 18:32:48 +08:00 |
|
|
|
72e16b2d43
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain
|
2024-06-17 18:17:10 +08:00 |
|
|
|
b81ae01ab6
|
flx：对接总览大屏 审批数据汇总 数据看板 审批数据汇总和进度概况轮询
|
2024-06-17 18:16:19 +08:00 |
|
Vce
|
823140d855
|
Merge branch 'cjw-dev' into shenzhen-dev
|
2024-06-15 20:32:41 +08:00 |
|
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 |
|
