admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
987 Commits 40 Branches 0 Tags
Commit Graph

987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yjl
62d9e043a3 修改资源管理 2023-01-04 14:49:05 +08:00
yjlHub
58a8cdcf87 Merge branch 'dev-yjl' into 'shenzhen-dev' 
Dev yjl

See merge request !83
 2023-01-04 14:30:37 +08:00
骆乐
489c6649eb Merge branch 'shenzhen-dev' of http://10.0.0.60/dhp/zhgdyun into dev-yjl 2023-01-04 14:30:08 +08:00
骆乐
a2f6b0e817 中建四局-新版大屏风格改造 2023-01-04 14:27:14 +08:00
yjl
927e286f1b 修復金陵灣bug 2023-01-03 18:07:35 +08:00
yjlHub
39bc52065c Merge branch 'dev-yjl' into 'shenzhen-dev' 
中建四局（CIM+页面）数据修改，页面调整

See merge request !81
 2022-12-24 17:28:04 +08:00
骆乐
333ba6296d 中建四局（CIM+页面）数据修改，页面调整 2022-12-24 17:27:18 +08:00
yjlHub
63037a031b Merge branch 'dev-yjl' into 'shenzhen-dev' 
中建四局（质量管理/其他大屏页面数据调整）

See merge request !80
 2022-12-22 18:28:57 +08:00
骆乐
14f78bec68 中建四局（质量管理/其他大屏页面数据调整） 2022-12-22 18:28:08 +08:00
yjlHub
8fbc20f480 Merge branch 'dev-yjl' into 'shenzhen-dev' 
中间四局（资源管理、进度管理）页面调整

See merge request !79
 2022-12-21 13:45:28 +08:00
骆乐
756aeaa948 中间四局（资源管理、进度管理）页面调整 2022-12-21 13:40:26 +08:00
yjlHub
4cc585dd5d Merge branch 'dev-yjl' into 'shenzhen-dev' 
中建四局（大屏页面调整）

See merge request !78
 2022-12-21 09:39:13 +08:00
骆乐
df585d26cc 中建四局（大屏页面调整） 2022-12-21 09:38:25 +08:00
yjlHub
f7b5c20dc1 Merge branch 'dev-yjl' into 'shenzhen-dev' 
中建四局（安全管理页面数据显示调整）

See merge request !77
 2022-12-20 11:32:46 +08:00
骆乐
5c8577d74b 中建四局（安全管理页面数据显示调整） 2022-12-20 11:31:45 +08:00
yjl
955920d8e8 Merge branch 'shenzhen-dev' of http://10.0.0.60/dhp/zhgdyun into yanyan_dev 2022-12-20 11:28:14 +08:00
yjl
fe52293746 修复中建四局bug 2022-12-20 11:25:19 +08:00
yjlHub
516bcec25f Merge branch 'dev-yjl' into 'shenzhen-dev' 
中建四局（CIM+页面模型载入、页面调整）

See merge request !76
 2022-12-19 19:02:42 +08:00
骆乐
37c3115247 中建四局（CIM+页面模型载入、页面调整） 2022-12-19 19:01:41 +08:00
yjlHub
880c408e37 Merge branch 'dev-yjl' into 'shenzhen-dev' 
中建四局（无人机巡检后台页面新增、页面样式调整）

See merge request !75
 2022-12-19 09:29:43 +08:00
骆乐
6d5e9ce947 中建四局（无人机巡检后台页面新增、页面样式调整） 2022-12-19 09:29:02 +08:00
yjl
3f21e62390 Merge branch 'yanyan_dev' into shenzhen-dev 2022-12-17 12:05:30 +08:00
yjl
69b48258b9 修复中建四局bug 2022-12-17 11:46:32 +08:00
yjl
4b9fa5c78b Merge branch 'shenzhen-dev' of http://10.0.0.60/dhp/zhgdyun into shenzhen-dev 2022-12-17 09:25:46 +08:00
yjl
eab68abe7f Merge branch 'yanyan_dev' into shenzhen-dev 2022-12-17 09:24:37 +08:00
yjlHub
dcf8d2add8 Merge branch 'dev-yjl' into 'shenzhen-dev' 
中建四局（进度管理布局、CIM+页面布局对接口）

See merge request !74
 2022-12-17 09:24:14 +08:00
骆乐
cd01e720ba 中建四局（进度管理布局、CIM+页面布局对接口） 2022-12-17 09:23:31 +08:00
yjl
f50ef147a9 修复中建四局bug 2022-12-17 09:22:38 +08:00
yjl
3b7688f4df Merge branch 'shenzhen-dev' of http://10.0.0.60/dhp/zhgdyun into shenzhen-dev 2022-12-16 10:58:38 +08:00
yjl
13cd984cbf Merge branch 'yanyan_dev' into shenzhen-dev 2022-12-16 10:56:51 +08:00
yjlHub
99f47b16ba Merge branch 'dev-yjl' into 'shenzhen-dev' 
中建四局（双碳管理页面）接口对接

See merge request !73
 2022-12-16 10:56:27 +08:00
骆乐
850ff133cf 中建四局（双碳管理页面）接口对接 2022-12-16 10:55:28 +08:00
yjl
a4ceb85474 修改中建四局大屏 2022-12-16 10:54:02 +08:00
yjlHub
09e7a7e036 Merge branch 'dev-yjl' into 'shenzhen-dev' 
中建四局（安全管理）图片显示

See merge request !72
 2022-12-14 19:33:59 +08:00
骆乐
c2add26a94 中建四局（安全管理）图片显示 2022-12-14 19:33:14 +08:00
yjl
a762f5bd7b Merge branch 'yanyan_dev' into shenzhen-dev 2022-12-14 18:57:04 +08:00
yjl
3fa1f3d8ec 新增光伏发电和双碳管设备 2022-12-14 18:53:30 +08:00
骆乐
34395c346e Merge branch 'shenzhen-dev' of http://10.0.0.60/dhp/zhgdyun into shenzhen-dev 2022-12-14 18:45:07 +08:00
骆乐
8aa6648aed 提交暂存代码103个文件 2022-12-14 18:31:34 +08:00
yjlHub
7ab6be3817 Merge branch 'dev-yjl' into 'shenzhen-dev' 
中建四局（双碳管理、政企联合）页面修改。

See merge request !71
 2022-12-14 17:33:51 +08:00
骆乐
6c9f9bd356 中建四局（双碳管理、政企联合）页面修改。 2022-12-14 17:32:59 +08:00
yjlHub
f7daf17c18 Merge branch 'dev-yjl' into 'shenzhen-dev' 
中建四局（质量管理）接口数据及后台页面

See merge request !70
 2022-12-13 10:50:09 +08:00
骆乐
5a54152d61 中建四局（质量管理）接口数据及后台页面 2022-12-13 10:48:43 +08:00
yjlHub
d4c95e94bb Merge branch 'dev-yjl' into 'shenzhen-dev' 
中建四局（安全管理页面）-大屏数据对接

See merge request !69
 2022-12-13 09:09:14 +08:00
骆乐
44004ced07 中建四局（安全管理页面）-大屏数据对接 2022-12-13 09:04:26 +08:00
yjlHub
294abc10c1 Merge branch 'dev-yjl' into 'shenzhen-dev' 
合并冲突解决

See merge request !68
 2022-12-12 13:58:36 +08:00
骆乐
2f45871c7d Merge branch 'shenzhen-dev' of http://10.0.0.60/dhp/zhgdyun into dev-yjl 2022-12-12 13:45:20 +08:00
骆乐
f65fc616c3 中建四局修改 2022-12-12 13:43:14 +08:00
jxj_gmj
600d607d4b 资源过来 2022-12-09 19:06:41 +08:00
yjl
c650b5fac2 Merge remote-tracking branch 'origin/yanyan_dev' into shenzhen-dev 2022-12-09 16:55:03 +08:00