袁晶琳
|
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 |
|
shi
|
6a2015760e
|
Merge branch 'yanyan_dev' into 'shenzhen-dev'
Yanyan dev
See merge request !90
|
2023-01-11 13:58:00 +08:00 |
|
605875155@qq.com
|
802f34713a
|
质量管理
标养室管理接口对接
|
2023-01-11 13:47:03 +08:00 |
|
shi
|
5941472e20
|
Merge branch 'shenzhen-dev' into 'yanyan_dev'
Shenzhen dev
See merge request !89
|
2023-01-11 12:57:34 +08:00 |
|
shi
|
c994e01545
|
Merge branch 'yanyan_dev' into 'shenzhen-dev'
设备点位配置
See merge request !88
|
2023-01-11 02:40:15 +08:00 |
|
605875155@qq.com
|
27164d652e
|
设备点位配置
优化点位名称样式
|
2023-01-11 02:39:29 +08:00 |
|
骆乐
|
053a951511
|
Merge branch 'shenzhen-dev' of http://10.0.0.60/dhp/zhgdyun into dev-yjl
|
2023-01-11 02:31:57 +08:00 |
|
骆乐
|
bc7c66de4b
|
Revert "政企联合"
This reverts commit 50d39d1bd40dc1aa7e5082b731f3b032fcefa13f.
|
2023-01-11 02:31:13 +08:00 |
|
605875155@qq.com
|
50d39d1bd4
|
政企联合
数据修改
|
2023-01-11 02:27:19 +08:00 |
|
605875155@qq.com
|
3139ddaf49
|
双碳管理
替换图片
|
2023-01-11 02:23:45 +08:00 |
|
骆乐
|
7c9d5a37f7
|
中建四局-大屏调整
|
2023-01-11 02:18:25 +08:00 |
|
shi
|
b70f7ad3fc
|
Merge branch 'yanyan_dev' into 'shenzhen-dev'
Yanyan dev
See merge request !87
|
2023-01-11 02:13:17 +08:00 |
|
605875155@qq.com
|
3b670b6e3e
|
双碳管理
替换图片
|
2023-01-11 02:11:54 +08:00 |
|
605875155@qq.com
|
381cc1d26a
|
政企联合
数据修改
|
2023-01-11 01:59:57 +08:00 |
|
605875155@qq.com
|
af5d83b168
|
政企联合
修改数据
|
2023-01-11 01:11:49 +08:00 |
|
骆乐
|
e2e82c2192
|
安全管理（数字工地）
|
2023-01-10 23:53:26 +08:00 |
|
骆乐
|
c6a081c0cb
|
Merge branch 'shenzhen-dev' of http://10.0.0.60/dhp/zhgdyun into dev-yjl
|
2023-01-10 21:17:52 +08:00 |
|
骆乐
|
6cd003c24c
|
中建四局大屏修改
|
2023-01-10 21:11:37 +08:00 |
|
605875155@qq.com
|
dc995e1b1d
|
安全管理
动态获取设备点位并标注在地图上
|
2023-01-10 19:33:52 +08:00 |
|
605875155@qq.com
|
5708849810
|
文件名修改
LeftThree改为leftThree
|
2023-01-10 18:05:21 +08:00 |
|
yjlHub
|
c13a7424bc
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
中建四-大屏修改
See merge request !86
|
2023-01-08 23:59:22 +08:00 |
|
骆乐
|
7c4abc4d3f
|
中建四-大屏修改
|
2023-01-08 23:58:49 +08:00 |
|