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 |
|
yjlHub
|
f7e3e24734
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
修改 金林湾bug（安全教育页面）分类回显、新增显示
See merge request !58
|
2022-11-18 13:55:38 +08:00 |
|
骆乐
|
ed3c060124
|
修改 金林湾bug（安全教育页面）分类回显、新增显示
|
2022-11-18 13:54:38 +08:00 |
|
yjlHub
|
301bfc31b6
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
人员定位系统（点位配置）基站、楼栋页面功能完成
See merge request !57
|
2022-11-18 09:18:41 +08:00 |
|
骆乐
|
9c0d409744
|
人员定位系统（点位配置）基站、楼栋页面功能完成
|
2022-11-18 09:16:16 +08:00 |
|
yjlHub
|
515236e7a8
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
修改中建四局（质量管理）通知人回显
See merge request !56
|
2022-11-17 10:42:14 +08:00 |
|
骆乐
|
c09e4c3ba7
|
修改中建四局（质量管理）通知人回显
|
2022-11-17 10:40:03 +08:00 |
|
yjlHub
|
c5c647831d
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
修改中建四局（指挥中心）环境监测数据显示bug
See merge request !55
|
2022-11-16 09:48:48 +08:00 |
|
骆乐
|
6e0709b6a7
|
修改中建四局（指挥中心）环境监测数据显示bug
|
2022-11-16 09:47:14 +08:00 |
|
yjlHub
|
1b0e9df1e2
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
项目版-人员定位-（点位配置）基站、楼栋
See merge request !54
|
2022-11-11 18:38:15 +08:00 |
|
yjl
|
bdbb045f43
|
项目版-人员定位-（点位配置）基站、楼栋
|
2022-11-11 18:37:32 +08:00 |
|
yjlHub
|
4e68284f05
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
项目版（新增点位配置、人员定位页面）
See merge request !53
|
2022-11-10 18:30:46 +08:00 |
|
yjl
|
733f364dd0
|
项目版（新增点位配置、人员定位页面）
|
2022-11-10 18:29:13 +08:00 |
|
骆乐
|
fa224dd4f8
|
Merge branch 'dev-xiaole' into shenzhen-dev
|
2022-11-10 09:20:52 +08:00 |
|
骆乐
|
31585c3b89
|
甘特图请求不稳定处理
|
2022-11-10 09:18:38 +08:00 |
|
yjlHub
|
ba742ee5ea
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
修改中建四局（双碳管理页面）-预警列表表格调整
See merge request !52
|
2022-11-08 18:17:47 +08:00 |
|
yjl
|
f78a6bfa8e
|
修改中建四局（双碳管理页面）-预警列表表格调整
|
2022-11-08 18:16:39 +08:00 |
|
骆乐
|
73f3819623
|
Merge branch 'dev-xiaole' into shenzhen-dev
|
2022-11-08 17:07:32 +08:00 |
|
骆乐
|
937a9c9c31
|
时间获取和单位添加
|
2022-11-08 17:05:30 +08:00 |
|
yjlHub
|
46bfcb7e97
|
Merge branch 'dev-yjl' into 'shenzhen-dev'
修改中建四局（双碳管理页面）下拉框文字居中
See merge request !51
|
2022-11-08 16:49:19 +08:00 |
|
yjl
|
fe363dbad8
|
修改中建四局（双碳管理页面）下拉框文字居中
|
2022-11-08 16:48:17 +08:00 |
|
骆乐
|
d13dc96821
|
中建四局大屏细节 处理
|
2022-11-08 15:11:01 +08:00 |
|
骆乐
|
8ed86ce22d
|
存储sn
|
2022-11-08 13:53:49 +08:00 |
|
骆乐
|
0651a77dab
|
空指针修复
|
2022-11-08 10:59:30 +08:00 |
|
骆乐
|
4079526950
|
中建四局大屏跳转参数问题修复
|
2022-11-07 18:47:58 +08:00 |
|
骆乐
|
ec1a22d1b1
|
中建四局(项目帐号默认跳转到大屏)
|
2022-11-07 16:08:38 +08:00 |
|