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

1018 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jxjgmj
4d6017d51d Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into dev-gmj 2022-07-16 16:39:24 +08:00
jxjgmj
4b4278f348 视频优化 2022-07-16 14:54:53 +08:00
骆乐
53eb10156b 调整了衢州版样式 2022-07-16 14:06:57 +08:00
杜海鹏
d83bd2b5d3 Merge branch 'dev-xiaole' into 'master' 
衢州版第二版路由

See merge request !37
 2022-07-16 09:05:37 +08:00
杜海鹏
38b58b7978 Merge branch 'dev-jack' into 'master' 
Dev jack

See merge request !36
 2022-07-16 09:05:24 +08:00
骆乐
f7ee226d6e 衢州版第二版路由 2022-07-16 09:03:25 +08:00
杜海鹏
acab270348 merge 2022-07-15 15:12:46 +08:00
杜海鹏
d539b2aa1c Merge branch 'dev-xiaole' into 'master' 
添加了衢州版的结构

See merge request !35
 2022-07-15 10:10:34 +08:00
骆乐
889653d56d 添加了衢州版的结构 2022-07-15 09:47:14 +08:00
杜海鹏
6bd6896d86 安全培训管理：更改培训时间布局 2022-07-15 09:27:11 +08:00
杜海鹏
ef76f2b97a 安全培训管理：完成视频上传 2022-07-14 18:39:09 +08:00
杜海鹏
cfb6fd20ab 安全培训管理：新增 教育类型 选项 2022-07-14 16:58:09 +08:00
杜海鹏
a4cfd15bfd 安全培训管理：新增培训时间表单项 2022-07-14 16:22:11 +08:00
杜海鹏
70391446e5 安全培训管理：完成编辑弹框，培训照片上传 2022-07-14 11:26:24 +08:00
杜海鹏
ce54b6fd29 安全培训管理：更改编辑弹框，添加培训照片表单项 2022-07-14 10:55:30 +08:00
杜海鹏
ffb0b1c3a2 Merge branch 'dev-xiaole' into 'master' 
添加衢州版

See merge request !34
 2022-07-06 18:28:09 +08:00
骆乐
2c3bec4b46 Merge branch 'master' of http://10.0.0.60/dhp/zhgdyun into dev-xiaole 2022-07-06 18:26:59 +08:00
骆乐
a56e1ec1da 添加衢州版 2022-07-06 18:24:37 +08:00
杜海鹏
aab57580f3 Merge branch 'dev-xiaomi' into 'master' 
Dev xiaomi

See merge request !32
 2022-07-06 18:22:52 +08:00
Luck-Xiaomi
37d9a2de00 优化大屏的返回操作 2022-07-06 18:05:01 +08:00
Luck-Xiaomi
461a82ad2d Merge branch 'master' of http://139.9.66.234:18023/dhp/zhgdyun into dev-xiaomi 2022-07-06 13:58:48 +08:00
Luck-Xiaomi
2655aab205 . 2022-07-06 13:56:34 +08:00
杜海鹏
67bd225897 Merge branch 'dev-xiaole' into 'master' 
Dev xiaole

See merge request !31
 2022-07-06 10:40:45 +08:00
骆乐
4d98dab01d Merge branch 'master' of http://10.0.0.60/dhp/zhgdyun into dev-xiaole 2022-07-06 10:38:19 +08:00
骆乐
3e76c85cf1 添加了培训记录导出功能 2022-07-06 10:27:28 +08:00
Luck-Xiaomi
9091e6b007 . 2022-07-06 10:14:24 +08:00
骆乐
ef285b0caa Merge branch 'master' into dev-xiaole 2022-07-04 13:58:05 +08:00
骆乐
823769e6c0 logo 2022-07-04 13:51:19 +08:00
杜海鹏
31a0974e7f Merge branch 'dev-xiaomi' into 'master' 
Dev xiaomi

See merge request !27
 2022-07-02 19:02:49 +08:00
骆乐
14da9285c0 一键下发 2022-07-02 18:56:35 +08:00
Luck-Xiaomi
dc8bc65527 Merge branch 'master' of http://139.9.66.234:18023/dhp/zhgdyun into dev-xiaomi 2022-07-01 10:42:32 +08:00
Luck-Xiaomi
34d57b91c4 优化星璇已知问题 2022-07-01 10:39:23 +08:00
骆乐
7e125332ed Merge branch 'master' into dev-xiaole 2022-06-30 17:44:13 +08:00
骆乐
efc0b77542 修复发放到外部 2022-06-30 17:42:32 +08:00
杜海鹏
f9f235a7d3 Merge branch 'dev-gmj' into 'master' 
高支模图片放大缩小

See merge request !25
 2022-06-30 17:37:59 +08:00
杜海鹏
a99a934914 Merge branch 'dev-xiaomi' into 'master' 
Dev xiaomi

See merge request !26
 2022-06-30 17:37:50 +08:00
骆乐
ff255c7e94 修复 2022-06-29 17:51:19 +08:00
Luck-Xiaomi
db90a25b15 . 2022-06-28 16:39:37 +08:00
jxjgmj
4cf1ac2faa 高支模图片放大缩小 2022-06-28 15:40:17 +08:00
Luck-Xiaomi
1527cab8ee . 2022-06-28 15:40:10 +08:00
Luck-Xiaomi
9f21cb8247 优化星璇自动登录的跳转问题 2022-06-28 15:38:29 +08:00
杜海鹏
9076eab3ff Merge branch 'dev-xiaole' into 'master' 
Dev xiaole

See merge request !24
 2022-06-28 14:20:03 +08:00
骆乐
a65b3e245e 冲突 2022-06-28 14:17:53 +08:00
骆乐
2b5c3e51c8 角色管理 2022-06-28 14:08:21 +08:00
骆乐
71a4c95e0c 新增防控管理的页面 2022-06-28 14:04:39 +08:00
骆乐
b49ab92983 解决冲突 2022-06-28 13:54:19 +08:00
骆乐
a58bada03b 修复广西联通的bug 2022-06-28 13:46:23 +08:00
杜海鹏
845b4901de Merge branch 'dev-gmj' into 'master' 
中建4

See merge request !23
 2022-06-28 13:42:50 +08:00
jxjgmj
835f87d8ea 中建4 2022-06-28 09:09:51 +08:00
骆乐
ed8c265034 Merge branch 'master' into dev-xiaole 2022-06-27 16:01:00 +08:00