|
|
d83bd2b5d3
|
Merge branch 'dev-xiaole' into 'master'
衢州版第二版路由
See merge request !37
|
2022-07-16 09:05:37 +08:00 |
|
骆乐
|
f7ee226d6e
|
衢州版第二版路由
|
2022-07-16 09:03:25 +08:00 |
|
|
|
acab270348
|
merge
|
2022-07-15 15:12:46 +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 |
|
骆乐
|
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 |
|
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 |
|
骆乐
|
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 |
|
骆乐
|
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 |
|
骆乐
|
ff255c7e94
|
修复
|
2022-06-29 17:51:19 +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 |
|
骆乐
|
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 |
|
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 |
|
|
|
22aaa1efe0
|
Merge branch 'dev-gmj' into 'master'
修改表单星号样式及修改核酸过期人员列表分页样式
See merge request !21
|
2022-06-27 15:58:20 +08:00 |
|
骆乐
|
1941d45586
|
修复了广西联通的一些bug
|
2022-06-27 15:56:25 +08:00 |
|
骆乐
|
f92db374b1
|
添加了安全教育 上传下载上传材料 骆乐
|
2022-06-24 14:58:54 +08:00 |
|
骆乐
|
a01a3502b1
|
更改了标头配置 人员考勤打印 设备中台bug修复 骆乐
|
2022-06-23 16:29:13 +08:00 |
|
骆乐
|
f1d3b8879c
|
人员管理 添加 下发通行设备 以及修复了设备中台跳转 骆乐
|
2022-06-21 17:38:52 +08:00 |
|
骆乐
|
c51e0d347e
|
项目后台设备中台企业前台企业后台切换 骆乐
|
2022-06-21 15:26:23 +08:00 |
|
骆乐
|
06659d6804
|
修复南昌地铁的bug
|
2022-06-20 13:36:29 +08:00 |
|
jxjgmj
|
f1031d60fd
|
修改表单星号样式
|
2022-06-17 17:15:07 +08:00 |
|
jxjgmj
|
b890ba517f
|
修改核酸超时人员列表分页样式
|
2022-06-17 15:23:55 +08:00 |
|
jxjgmj
|
a67458d58a
|
修改核酸超时人员列表分页样式
|
2022-06-17 15:21:27 +08:00 |
|
jxjgmj
|
838edc04a9
|
修复bug
|
2022-06-17 11:22:57 +08:00 |
|
|
|
349279f46f
|
Merge branch 'dev-xiaole' into 'master'
更改了人员培训是否合格列表
See merge request !16
|
2022-06-17 11:13:57 +08:00 |
|
骆乐
|
855a683b30
|
更改了人员培训是否合格列表
|
2022-06-17 11:08:09 +08:00 |
|
jxjgmj
|
2ba8f20bd4
|
Merge branch 'master' into dev-gmj
|
2022-06-17 11:00:27 +08:00 |
|
jxjgmj
|
13f13febdb
|
修复bug
|
2022-06-17 10:59:25 +08:00 |
|
