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 |
|
|
|
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 |
|
