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 |
|
yjl
|
a52ff02c7a
|
资源管理大屏接口
|
2022-12-09 16:53:04 +08:00 |
|
jxj_gmj
|
5f6fa7ccc1
|
动态表单
|
2022-12-09 16:52:03 +08:00 |
|
jxj_gmj
|
140a53a773
|
安全教育
|
2022-12-09 09:07:40 +08:00 |
|
jxj_gmj
|
e28b562b84
|
安全模块
|
2022-12-08 15:02:12 +08:00 |
|
yjl
|
d2bde9ee67
|
金林湾大屏安全管理
|
2022-12-07 13:42:49 +08:00 |
|
yjlHub
|
7917b5e31f
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
修改（金林湾）大屏模块数据对接
See merge request !67
|
2022-12-03 18:07:12 +08:00 |
|
骆乐
|
f91d9ddb54
|
修改（金林湾）大屏模块数据对接
|
2022-12-03 18:06:25 +08:00 |
|
yjlHub
|
f05eb95189
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
项目版（巡检点页面需求变更、分页修改）
See merge request !66
|
2022-12-01 10:20:55 +08:00 |
|
骆乐
|
3a70880fc5
|
项目版（巡检点页面需求变更、分页修改）
|
2022-12-01 10:20:19 +08:00 |
|
yjlHub
|
93f612c187
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
修改项目版分页、金林湾跳转bug
See merge request !65
|
2022-11-24 12:58:03 +08:00 |
|
骆乐
|
4d8f8a2aae
|
修改项目版分页、金林湾跳转bug
|
2022-11-24 12:56:54 +08:00 |
|
yjlHub
|
d77c2bde34
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
修改（视频管理系统）nvr下拉数据显示
See merge request !64
|
2022-11-23 16:47:52 +08:00 |
|
骆乐
|
0a6ac5163c
|
修改（视频管理系统）nvr下拉数据显示
|
2022-11-23 16:46:33 +08:00 |
|
yjlHub
|
c6bfea0dec
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
甘特图页面、及bug修复
See merge request !63
|
2022-11-23 16:18:35 +08:00 |
|
骆乐
|
675ea79dcb
|
甘特图页面、及bug修复
|
2022-11-23 16:17:34 +08:00 |
|
yjlHub
|
ff9b98d091
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
中建四局-(安全管理页面)-注释无用接口
See merge request !62
|
2022-11-22 16:56:53 +08:00 |
|
骆乐
|
6a84302ef0
|
中建四局-(安全管理页面)-注释无用接口
|
2022-11-22 16:56:18 +08:00 |
|
yjlHub
|
78c351c098
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
进度管理-（甘特图）页面
See merge request !61
|
2022-11-22 16:32:11 +08:00 |
|
骆乐
|
ac241956ea
|
进度管理-（甘特图）页面
|
2022-11-22 16:31:07 +08:00 |
|
yjlHub
|
3df5e71c49
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
修改人员定位系统页面-(点位配置、人员定位)平面图显示图标
See merge request !60
|
2022-11-19 17:48:26 +08:00 |
|
骆乐
|
98f4621d26
|
修改人员定位系统页面-(点位配置、人员定位)平面图显示图标
|
2022-11-19 17:47:07 +08:00 |
|
yjlHub
|
0b3bfb0824
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
人员定位系统-（人员定位实时数据页面）页面新增及功能完善
See merge request !59
|
2022-11-18 21:41:03 +08:00 |
|
骆乐
|
cef1f434b6
|
人员定位系统-（人员定位实时数据页面）页面新增及功能完善
|
2022-11-18 21:39:31 +08:00 |
|