1110 Commits

Author SHA1 Message Date
jxj_yjl
a345267885 成润项目页面bug修改 2023-05-17 15:58:05 +08:00
jxj_yjl
b93c2d64a8 升降机设备/塔吊设备页面日期查询 2023-05-16 14:40:49 +08:00
jxj_yjl
077c31437e 成润项目/中建四局-无人机视频播放功能 2023-05-16 13:47:36 +08:00
jxj_yjl
8e12e0fdd4 成润页面修改 2023-05-15 21:48:02 +08:00
jxj_yjl
0f6b5c0c11 成润页面bug修复 -02 2023-05-15 17:56:38 +08:00
jxj_yjl
5421cb3a94 Merge branch 'yanyan_dev' of http://139.9.66.234:18023/dhp/zhgdyun into dev-yjl 2023-05-15 16:34:26 +08:00
袁晶琳
5b24468112 Merge branch 'dev-yjl' into 'shenzhen-dev'
四川成润-页面bug修复

See merge request !163
2023-05-15 16:29:43 +08:00
严妍
1497ceac83 修改瑞士恒通大屏 2023-05-15 16:29:36 +08:00
jxj_yjl
0591bc6c50 四川成润-页面bug修复 2023-05-15 16:28:59 +08:00
严妍
6e0d3b017a Merge branch 'dev-yjl' of http://139.9.66.234:18023/dhp/zhgdyun into yanyan_dev 2023-05-15 10:37:48 +08:00
袁晶琳
c568e207f3 Merge branch 'dev-yjl' into 'shenzhen-dev'
演示平台-大屏页面调整

See merge request !162
2023-05-13 18:38:41 +08:00
jxj_yjl
2e8ce3a2f8 演示平台-大屏页面调整 2023-05-13 18:37:30 +08:00
袁晶琳
85eadb4bdc Merge branch 'dev-yjl' into 'shenzhen-dev'
成润页面bug修复

See merge request !161
2023-05-13 17:04:59 +08:00
jxj_yjl
18177b6e3e 成润页面bug修复 2023-05-13 17:01:23 +08:00
jxj_yjl
e613f96bbc 成润项目-页面bug修改 2023-05-13 17:00:19 +08:00
严妍
3ae6819f07 地磅录入 2023-05-13 14:55:10 +08:00
严妍
f34ccca1a0 Merge branch 'dev-yjl' of http://139.9.66.234:18023/dhp/zhgdyun into yanyan_dev 2023-05-12 16:45:36 +08:00
严妍
8095089f7c 修复地磅 2023-05-12 16:42:51 +08:00
袁晶琳
bc05fe8806 Merge branch 'dev-yjl' into 'shenzhen-dev'
港投项目-发票记录开发/中建四-大屏监控图片修改

See merge request !160
2023-05-11 17:26:02 +08:00
jxj_yjl
b561145f18 港投项目-发票记录开发/中建四-大屏监控图片修改 2023-05-11 17:24:57 +08:00
袁晶琳
40c60736d4 Merge branch 'dev-yjl' into 'shenzhen-dev'
港投项目-页面bug修复

See merge request !159
2023-05-08 18:25:37 +08:00
jxj_yjl
999c4cbf06 港投项目-页面bug修复 2023-05-08 18:23:59 +08:00
jxj_yjl
a369220164 Merge branch 'yanyan_dev' of http://139.9.66.234:18023/dhp/zhgdyun into dev-yjl 2023-05-08 15:16:47 +08:00
jxj_yjl
bc0c880698 港投项目-智慧党建-文章管理-暂无数据显示 2023-05-08 15:12:00 +08:00
袁晶琳
5d09220bea Merge branch 'dev-yjl' into 'shenzhen-dev'
港投项目-智慧党建-文章管理页面

See merge request !158
2023-05-08 13:52:45 +08:00
jxj_yjl
eb318b6eb2 港投项目-智慧党建-文章管理页面 2023-05-08 13:52:04 +08:00
袁晶琳
ab8479368c Merge branch 'dev-yjl' into 'shenzhen-dev'
中建四局-大屏页面调整

See merge request !157
2023-05-06 17:15:06 +08:00
jxj_yjl
c1bace0848 中建四局-大屏页面调整 2023-05-06 17:04:34 +08:00
袁晶琳
59b5810094 Merge branch 'dev-yjl' into 'shenzhen-dev'
港投项目-检验检测/质量监管/智慧党建模块

See merge request !156
2023-05-06 16:13:12 +08:00
jxj_yjl
df7d8cba9c 港投项目-检验检测/质量监管/智慧党建模块 2023-05-06 16:11:59 +08:00
严妍
5d5108953e Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into yanyan_dev 2023-04-28 18:08:32 +08:00
严妍
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
袁晶琳
c88b7e863e Merge branch 'dev-yjl' into 'shenzhen-dev'
材料管理-日期清除bug修复

See merge request !155
2023-04-28 18:07:15 +08:00
jxj_yjl
b4fa567591 材料管理-日期清除bug修复 2023-04-28 18:06:38 +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