987 Commits

Author SHA1 Message Date
袁晶琳
bcf285cd36 Merge branch 'dev-yjl' into 'shenzhen-dev'
安全教育模块-扫码考试页面开发

See merge request !121
2023-03-16 10:07:58 +08:00
yjl
34c35f5561 安全教育模块-扫码考试页面开发 2023-03-16 10:06:15 +08:00
袁晶琳
e80fe00c00 Merge branch 'dev-yjl' into 'shenzhen-dev'
安全管理-新增项目自检记录页面

See merge request !119
2023-03-15 17:34:01 +08:00
yjl
5a4940a1c3 安全管理-新增项目自检记录页面 2023-03-15 17:32:01 +08:00
袁晶琳
1b2419e29b Merge branch 'dev-yjl' into 'shenzhen-dev'
演示平台页面bug修复

See merge request !118
2023-03-15 10:01:06 +08:00
yjl
c658f72895 演示平台页面bug修复 2023-03-15 10:00:33 +08:00
袁晶琳
381e3f6969 Merge branch 'dev-yjl' into 'shenzhen-dev'
项目版整体分页bug修改

See merge request !117
2023-03-14 18:27:46 +08:00
yjl
70428c5f9c 项目版整体分页bug修改 2023-03-14 18:26:52 +08:00
袁晶琳
a4bb79c51b Merge branch 'dev-yjl' into 'shenzhen-dev'
中建四大屏-质量管理接口调整修改

See merge request !116
2023-03-14 16:59:26 +08:00
yjl
1b6ddc6c80 中建四大屏-质量管理接口调整修改 2023-03-14 16:58:48 +08:00
袁晶琳
1f8a037e5a Merge branch 'dev-yjl' into 'shenzhen-dev'
演示平台-分页bug修复

See merge request !115
2023-03-14 16:06:14 +08:00
yjl
a36934bf5b 演示平台-分页bug修复 2023-03-14 16:05:42 +08:00
袁晶琳
cdbec961a6 Merge branch 'dev-yjl' into 'shenzhen-dev'
演示平台bug修改

See merge request !114
2023-03-14 13:45:08 +08:00
yjl
1431188f37 演示平台bug修改 2023-03-14 13:44:11 +08:00
袁晶琳
119d93e1b6 Merge branch 'dev-yjl' into 'shenzhen-dev'
项目版-高支模功能完善

See merge request !113
2023-03-13 17:57:40 +08:00
yjl
b789e06bd2 项目版-高支模功能完善 2023-03-13 17:56:46 +08:00
袁晶琳
3296204253 Merge branch 'dev-yjl' into 'shenzhen-dev'
瑞士恒通项目页面调整

See merge request !112
2023-03-13 11:03:20 +08:00
yjl
e296dcf0ed 瑞士恒通页面字样调整 2023-03-13 10:59:36 +08:00
yjl
2dbc0e1e92 智建宝平台修改 2023-03-10 13:37:42 +08:00
yjl
76c5d6dc22 修改瑞士恒通-后台页面bug 2023-03-08 13:32:36 +08:00
yjl
d90180ac6a 中建四后台页面调整 2023-03-07 18:30:20 +08:00
yjl
2c392d75a3 中建四-页面调整 2023-03-07 16:00:40 +08:00
yjl
8244891251 中建四页面调整 2023-03-07 14:28:10 +08:00
yjl
c5ba45a378 中建四局大屏-指挥中心页面调整 2023-03-07 11:05:04 +08:00
yjl
559b258eef 首页区域模块样式跳转 2023-03-06 20:37:50 +08:00
袁晶琳
fbd2b85cee Merge branch 'dev-yjl' into 'shenzhen-dev'
修改演示平台 配置bug

See merge request !111
2023-03-01 11:56:36 +08:00
yjl
8f6419de30 修改演示平台 配置bug 2023-03-01 11:55:40 +08:00
袁晶琳
b49d182c7f Merge branch 'dev-yjl' into 'shenzhen-dev'
演示平台新增(标准七参数版)

See merge request !110
2023-03-01 09:47:24 +08:00
yjl
4b1a6f6dff 演示平台新增(标准七参数版) 2023-03-01 09:46:41 +08:00
袁晶琳
c98e56eaf7 Merge branch 'dev-yjl' into 'shenzhen-dev'
中建四(质量管理-时间查询、安全巡检字段修改)

See merge request !109
2023-02-28 17:26:51 +08:00
yjl
74beb354ae 中建四(质量管理-时间查询、安全巡检字段修改) 2023-02-28 17:26:12 +08:00
袁晶琳
50fe2b1845 Merge branch 'dev-yjl' into 'shenzhen-dev'
修改中建四局(大屏页面、后台管理)

See merge request !108
2023-02-28 10:26:18 +08:00
yjl
78c2663e98 修改中建四局(大屏页面、后台管理) 2023-02-28 10:25:46 +08:00
袁晶琳
96633e34cd Merge branch 'dev-yjl' into 'shenzhen-dev'
中建四局(后台管理)bug修复

See merge request !107
2023-02-27 18:48:03 +08:00
yjl
18c0f1c27c 中建四局(后台管理)bug修复 2023-02-27 18:47:21 +08:00
袁晶琳
953140cdfe Merge branch 'dev-yjl' into 'shenzhen-dev'
中建四局大屏、后台页面修改

See merge request !106
2023-02-27 11:56:17 +08:00
yjl
9d45994eb4 中建四局大屏、后台页面修改 2023-02-27 11:55:28 +08:00
袁晶琳
3bf2abe8e5 Merge branch 'dev-yjl' into 'shenzhen-dev'
中建四局大屏页面调整

See merge request !105
2023-02-24 18:34:10 +08:00
yjl
d24b3e18f2 中建四局大屏页面调整 2023-02-24 18:33:18 +08:00
袁晶琳
1ab65fdf65 Merge branch 'dev-yjl' into 'shenzhen-dev'
修改中建四局大屏

See merge request !104
2023-02-23 21:05:21 +08:00
yjl
b048f301d8 修改中建四局大屏 2023-02-23 21:03:56 +08:00
yjl
10fb3eef7e 中建四局页面修改 2023-02-22 18:14:02 +08:00
袁晶琳
c80a996193 Merge branch 'dev-yjl' into 'shenzhen-dev'
修改中建四局(双碳管理页面)

See merge request !103
2023-02-21 15:52:43 +08:00
yjl
dbded99caa 修改中建四局(双碳管理页面) 2023-02-21 15:47:23 +08:00
袁晶琳
7b480db583 Merge branch 'dev-yjl' into 'shenzhen-dev'
新增三江集团版本

See merge request !101
2023-02-17 11:36:41 +08:00
yjl
4be924043c 新增三江集团版本 2023-02-17 11:35:39 +08:00
yjl
aaaedbbd72 Merge branch 'yanyan_dev' of http://10.0.0.60/dhp/zhgdyun into yanyan_dev 2023-02-14 15:07:23 +08:00
yjl
b30c0f9cd2 Merge branch 'shenzhen-dev' of http://10.0.0.60/dhp/zhgdyun into yanyan_dev 2023-02-14 15:07:12 +08:00
yjl
fd380681a1 Merge branch 'shenzhen-dev' of 10.0.0.60:dhp/zhgdyun into yanyan_dev 2023-02-14 14:57:14 +08:00
袁晶琳
1d1025379e Merge branch 'dev-yjl' into 'shenzhen-dev'
修改中建四大屏(页面调整)

See merge request !100
2023-02-14 14:46:33 +08:00