袁晶琳
|
542e3597ac
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
内蒙古车辆模块字段修改、编辑bug修复
See merge request !144
|
2023-04-13 18:27:34 +08:00 |
|
jxj_yjl
|
4d94ec4ec0
|
内蒙古车辆模块字段修改、编辑bug修复
|
2023-04-13 18:25:47 +08:00 |
|
袁晶琳
|
07a1266fdf
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
仓库管理-领料单位页面、外加工管理页面、员工管理页面 布局
See merge request !143
|
2023-04-13 16:42:36 +08:00 |
|
jxj_yjl
|
95c5b63a14
|
仓库管理-领料单位页面、外加工管理页面、员工管理页面 布局
|
2023-04-13 16:41:46 +08:00 |
|
袁晶琳
|
01c7854f0f
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
中建四局-指挥中心大屏-进度条状态修改
See merge request !142
|
2023-04-11 17:50:43 +08:00 |
|
jxj_yjl
|
b6869b5d18
|
中建四局-指挥中心大屏-进度条状态修改
|
2023-04-11 17:48:25 +08:00 |
|
袁晶琳
|
94b21d6e39
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
仓库管理/货品管理/供应商管理页面新增
See merge request !141
|
2023-04-11 14:25:27 +08:00 |
|
jxj_yjl
|
f9266c0bee
|
仓库管理/货品管理/供应商管理页面新增
|
2023-04-11 14:23:15 +08:00 |
|
袁晶琳
|
88076e9804
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
质量管理-通知人回显类型bug修复
See merge request !140
|
2023-04-10 11:45:36 +08:00 |
|
jxj_yjl
|
4424236297
|
质量管理-通知人回显类型bug修复
|
2023-04-10 11:43:31 +08:00 |
|
jxj_yjl
|
955b0a3630
|
质量管理-字段ID精度修改
|
2023-04-07 16:12:30 +08:00 |
|
袁晶琳
|
164242aed3
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
金林湾大屏修改
See merge request !139
|
2023-04-07 14:25:45 +08:00 |
|
jxj_yjl
|
91176aa6f3
|
金林湾大屏修改
|
2023-04-07 14:24:35 +08:00 |
|
袁晶琳
|
b14c91baf6
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
萤石云分屏功能完善
See merge request !138
|
2023-04-07 09:09:21 +08:00 |
|
jxj_yjl
|
09ffe17421
|
萤石云分屏功能完善
|
2023-04-07 09:07:18 +08:00 |
|
袁晶琳
|
3d92a98c96
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
萤石云点击窗口高亮
See merge request !137
|
2023-04-06 18:01:27 +08:00 |
|
jxj_yjl
|
60108cf5a7
|
萤石云点击窗口高亮
|
2023-04-06 18:00:08 +08:00 |
|
jxj_gmj
|
97fe3ccf00
|
金林湾-项目概况-施工进度样式调整
|
2023-04-04 15:13:13 +08:00 |
|
袁晶琳
|
956c9be4fa
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
设备中台视频字段注释、中间四CIM+数据更新、萤石视频点击播放
See merge request !136
|
2023-04-04 14:02:42 +08:00 |
|
jxj_gmj
|
c1e39f0317
|
设备中台视频字段注释、中间四CIM+数据更新、萤石视频点击播放
|
2023-04-04 13:58:09 +08:00 |
|
yjl
|
f700f8e405
|
安全教育-考试页面试题滚动条
|
2023-04-03 14:12:25 +08:00 |
|
袁晶琳
|
45c3b4e9c6
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
中建四局-双碳管理-施工进度碳排放
See merge request !135
|
2023-04-03 09:40:10 +08:00 |
|
yjl
|
93fceeaa49
|
中建四局-双碳管理-施工进度碳排放
|
2023-04-03 09:39:18 +08:00 |
|
袁晶琳
|
d1baa57069
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
中建四局-双碳管理-图片更换
See merge request !134
|
2023-04-02 14:50:20 +08:00 |
|
yjl
|
cc13d38053
|
配置
|
2023-04-02 14:49:21 +08:00 |
|
yjl
|
088fa08877
|
中建四局 -双碳管理页面图片更换
|
2023-04-02 14:49:00 +08:00 |
|
袁晶琳
|
2aebf5b3a2
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
金林湾页面调整
See merge request !133
|
2023-04-01 14:50:10 +08:00 |
|
yjl
|
503afa6089
|
金林湾页面调整
|
2023-04-01 14:44:11 +08:00 |
|
yjl
|
12840ac241
|
金林湾大屏页面修改
|
2023-04-01 14:26:45 +08:00 |
|
袁晶琳
|
32e0168197
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
金林湾、中建四局大屏修改
See merge request !132
|
2023-03-31 18:09:50 +08:00 |
|
yjl
|
c4b23c5be3
|
修改
|
2023-03-31 18:09:06 +08:00 |
|
yjl
|
041e5018f4
|
金林湾、中建四局-大屏页面调整
|
2023-03-31 18:08:47 +08:00 |
|
袁晶琳
|
2adac09d38
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
金林湾大屏-环境监测增加噪音字段
See merge request !131
|
2023-03-30 13:41:22 +08:00 |
|
yjl
|
a99094632a
|
金林湾大屏-环境监测增加噪音字段
|
2023-03-30 13:40:11 +08:00 |
|
yjl
|
4856d020e2
|
视频管理-分屏调整
|
2023-03-30 10:13:47 +08:00 |
|
yjl
|
044bb53105
|
金林湾-大屏数据修改
|
2023-03-30 10:06:13 +08:00 |
|
袁晶琳
|
11d3548c3e
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
视频管理-分屏功能、云联万物
See merge request !130
|
2023-03-30 09:24:42 +08:00 |
|
yjl
|
04c6b9bebe
|
视频管理-模块自定义分屏功能、云联万物修改
|
2023-03-30 09:23:33 +08:00 |
|
yjl
|
603d2f7ae7
|
视频管理-萤石云监控分屏画面布局
|
2023-03-29 15:10:54 +08:00 |
|
严妍
|
11241c85ea
|
Merge branch 'yanyan_dev' into shenzhen-dev
|
2023-03-28 15:32:15 +08:00 |
|
严妍
|
1c21113ebc
|
修复物料管理
|
2023-03-28 15:31:18 +08:00 |
|
yjl
|
738c69c2df
|
L大写
|
2023-03-28 11:35:09 +08:00 |
|
yjl
|
9e0b5c61e3
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into dev-yjl
|
2023-03-28 09:49:00 +08:00 |
|
严妍
|
27521cb7cb
|
Merge remote-tracking branch 'origin/yanyan_dev' into shenzhen-dev
|
2023-03-27 15:09:10 +08:00 |
|
严妍
|
959afef0e8
|
修复物料管理的查看图片
|
2023-03-27 15:02:35 +08:00 |
|
yjl
|
5fb5d7dde2
|
中建四局大屏-安全管理深基坑数据对接
|
2023-03-27 09:06:51 +08:00 |
|
严妍
|
70edbab6bf
|
Merge branch 'yanyan_dev' into shenzhen-dev
|
2023-03-24 18:24:51 +08:00 |
|
严妍
|
c79553cb0e
|
物料管理
|
2023-03-24 18:07:01 +08:00 |
|
yjl
|
b55c1fddfe
|
金林湾下面-大屏数据对接
|
2023-03-24 17:33:02 +08:00 |
|
yjl
|
74d285abd7
|
中建四-安全管理-大屏数据对接单位修改
|
2023-03-24 11:09:10 +08:00 |
|