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 |
|
yjl
|
29d7a0b034
|
修改中建四大屏（页面调整）
|
2023-02-14 14:45:57 +08:00 |
|
袁晶琳
|
8833b36ea7
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
修改中建四局（监控大屏）列表上下滑动
See merge request !99
|
2023-02-13 18:19:21 +08:00 |
|
yjl
|
40c8a4fd93
|
修改中建四局（监控大屏）列表上下滑动
|
2023-02-13 18:18:37 +08:00 |
|
袁晶琳
|
0a61fa7299
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
修改中建四局（质量管理、资源管理）页面
See merge request !98
|
2023-02-10 15:09:49 +08:00 |
|
yjl
|
11fff9dd37
|
修改中建四局（质量管理、资源管理）页面
|
2023-02-10 15:08:38 +08:00 |
|
袁晶琳
|
1c63ae37e6
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
修改（质量管理模块页面bug）
See merge request !97
|
2023-02-10 09:39:24 +08:00 |
|
yjl
|
bf8023aad8
|
修改（质量管理模块页面bug）
|
2023-02-10 09:38:53 +08:00 |
|
袁晶琳
|
9cf3f0ca13
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
修改中建四局（大屏）进度、质量
See merge request !96
|
2023-02-09 17:34:19 +08:00 |
|
yjl
|
f076d06058
|
修改中建四局（大屏）进度、质量
|
2023-02-09 17:33:12 +08:00 |
|
袁晶琳
|
8fd0d764f6
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
修改测试平台（进度导入报错）..
See merge request !95
|
2023-02-07 17:39:49 +08:00 |
|
yjl
|
4286f4834b
|
修改测试平台（进度导入报错）..
|
2023-02-07 17:34:55 +08:00 |
|
袁晶琳
|
0045558068
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
修改进度管理（甘特图）
See merge request !93
|
2023-02-07 10:11:37 +08:00 |
|
yjl
|
58ed28cbb1
|
修改进度管理（甘特图）
|
2023-02-07 10:10:36 +08:00 |
|
袁晶琳
|
72685cde60
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
Dev yjl
See merge request !92
|
2023-02-05 19:51:30 +08:00 |
|
yjl
|
f9fc24bedd
|
测试提交名
|
2023-02-05 19:49:18 +08:00 |
|
yjl
|
7ede199f04
|
修复演示平台bug
|
2023-02-04 11:40:45 +08:00 |
|
骆乐
|
b875335ab0
|
修改（演示平台、三江集团，广西智慧工地bug）
|
2023-02-04 10:49:03 +08:00 |
|
yjlHub
|
9da6687fbc
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
推送合并代码
See merge request !91
|
2023-02-02 14:38:01 +08:00 |
|
yjl
|
f98f1f166c
|
修复BUG
|
2023-02-01 17:27:33 +08:00 |
|
骆乐
|
4bcdf809b8
|
中建四局-大屏页面调整
|
2023-01-13 21:04:45 +08:00 |
|
骆乐
|
5d2074fd1a
|
修改中建四局大屏需求
|
2023-01-12 22:00:16 +08:00 |
|
骆乐
|
6313f41642
|
Merge branch 'shenzhen-dev' of http://10.0.0.60/dhp/zhgdyun into dev-yjl
|
2023-01-11 14:03:30 +08:00 |
|
骆乐
|
ab3be886cc
|
大屏数据
|
2023-01-11 14:00:46 +08:00 |
|