严妍
|
d3ca8f5584
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into yanyan_dev
|
2023-04-28 18:08:06 +08:00 |
|
严妍
|
43d739fcb9
|
修复地磅
|
2023-04-28 18:05:59 +08:00 |
|
袁晶琳
|
ef81b072b8
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
材料管理，页面bug修复
See merge request !154
|
2023-04-28 09:50:33 +08:00 |
|
jxj_yjl
|
c1c3cdd81e
|
材料管理，页面bug修复
|
2023-04-28 09:49:33 +08:00 |
|
严妍
|
0561947009
|
Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into yanyan_dev
|
2023-04-27 16:04:01 +08:00 |
|
严妍
|
92c5606a5a
|
Merge branch 'shenzhen-dev' into yanyan_dev
|
2023-04-27 16:02:59 +08:00 |
|
严妍
|
f065b00e88
|
修复扫码
|
2023-04-27 15:59:34 +08:00 |
|
袁晶琳
|
7c42773b29
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
材料管理页面/中建五局页面调整
See merge request !153
|
2023-04-27 15:23:12 +08:00 |
|
jxj_yjl
|
cdec2aba21
|
材料管理页面/中建五局页面调整
|
2023-04-27 15:22:14 +08:00 |
|
袁晶琳
|
daf37ee6fc
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
中建五局-页面调整
See merge request !152
|
2023-04-26 11:57:16 +08:00 |
|
jxj_yjl
|
93da7c4040
|
中建五局-页面调整
|
2023-04-26 11:56:31 +08:00 |
|
袁晶琳
|
119c52b732
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
中建五局导出/材料管理-设备管理/中建四大屏修改
See merge request !151
|
2023-04-25 17:32:43 +08:00 |
|
jxj_yjl
|
457ce0638f
|
中建五局导出/材料管理-设备管理/中建四大屏修改
|
2023-04-25 17:27:25 +08:00 |
|
袁晶琳
|
56cca867d6
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
材料管理-合同管理模块/基本信息页面/供应商评价记录功能对接
See merge request !150
|
2023-04-23 18:50:47 +08:00 |
|
jxj_yjl
|
98a40c71c9
|
材料管理-合同管理模块/基本信息页面/供应商评价记录功能对接
|
2023-04-23 18:50:10 +08:00 |
|
袁晶琳
|
611e0c6772
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
中建五局-质量管理模块新增字段/新增整改排名页面/人员管理页面
See merge request !149
|
2023-04-23 14:51:38 +08:00 |
|
jxj_yjl
|
35a3ef9e55
|
中建五局-质量管理模块新增字段/新增整改排名页面/人员管理页面
|
2023-04-23 14:50:59 +08:00 |
|
袁晶琳
|
e98d1e5e2a
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
采购需求计划/招标管理/供应商管理，页面功能对接
See merge request !148
|
2023-04-19 19:15:08 +08:00 |
|
jxj_yjl
|
1be73a29e9
|
采购需求计划/招标管理/供应商管理，页面功能对接
|
2023-04-19 19:14:28 +08:00 |
|
袁晶琳
|
f80716c311
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
材料管理-采购管理/招采管理/合同管理/出入库管理/周转料管理/设备管理-页面布局完成
See merge request !147
|
2023-04-18 16:31:22 +08:00 |
|
jxj_yjl
|
f29e3a5450
|
材料管理-采购管理/招采管理/合同管理/出入库管理/周转料管理/设备管理-页面布局完成
|
2023-04-18 16:30:14 +08:00 |
|
袁晶琳
|
89d754f4b9
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
标准版-仓库、出入库管理页面
See merge request !146
|
2023-04-15 18:26:46 +08:00 |
|
jxj_yjl
|
815b4a7d59
|
标准版-仓库、出入库管理页面
|
2023-04-15 18:24:44 +08:00 |
|
袁晶琳
|
89f55ab6e2
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
金林湾大屏-顶部栏调整
See merge request !145
|
2023-04-14 14:46:52 +08:00 |
|
jxj_yjl
|
269295c841
|
金林湾大屏-顶部栏调整
|
2023-04-14 14:45:24 +08:00 |
|
袁晶琳
|
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 |
|