骆乐
|
181557d73d
|
该路径
|
2022-07-22 18:11:05 +08:00 |
|
骆乐
|
65ee808726
|
Merge branch 'dev-xiaole' into shenzhen-dev
|
2022-07-22 16:00:07 +08:00 |
|
骆乐
|
d3b3d3abe2
|
冲突
|
2022-07-22 15:59:51 +08:00 |
|
骆乐
|
9a144b9101
|
解决冲突
|
2022-07-22 15:58:50 +08:00 |
|
骆乐
|
24ad27a570
|
修复
|
2022-07-22 15:53:09 +08:00 |
|
|
|
32846230ee
|
axios：新增兼容分屏插件请求拦截配置
|
2022-07-22 15:15:37 +08:00 |
|
|
|
4099756085
|
添加分屏插件
|
2022-07-22 11:50:00 +08:00 |
|
骆乐
|
0c5f6e8e21
|
Merge branch 'dev-xiaole' into shenzhen-dev
|
2022-07-21 16:20:19 +08:00 |
|
骆乐
|
2bab395e89
|
修复衢州版的样式以及跳转
|
2022-07-21 16:19:45 +08:00 |
|
|
|
b8614392e2
|
安装分屏插件依赖
|
2022-07-21 15:44:44 +08:00 |
|
骆乐
|
70fd7a9eb2
|
Merge branch 'dev-xiaole' into shenzhen-dev
|
2022-07-21 14:22:07 +08:00 |
|
骆乐
|
e281d53283
|
设备中台添加了国密种类
|
2022-07-21 14:21:23 +08:00 |
|
骆乐
|
56bccb157e
|
解决冲突
|
2022-07-19 16:14:53 +08:00 |
|
骆乐
|
b86a3f0234
|
Merge branch 'shenzhen-dev' of http://10.0.0.60/dhp/zhgdyun into shenzhen-dev
|
2022-07-19 16:09:30 +08:00 |
|
骆乐
|
c0951b378b
|
修复安全教育安全培训记录
|
2022-07-19 16:08:57 +08:00 |
|
骆乐
|
f58a8d1a44
|
看板
|
2022-07-18 16:57:42 +08:00 |
|
骆乐
|
ef3f315905
|
Merge branch 'shenzhen-dev' into dev-xiaole
|
2022-07-18 15:59:49 +08:00 |
|
骆乐
|
63f0b68157
|
Merge branch 'shenzhen-dev' of http://10.0.0.60/dhp/zhgdyun into shenzhen-dev
|
2022-07-18 15:58:58 +08:00 |
|
骆乐
|
e766899905
|
数据看板的跳转
|
2022-07-18 15:57:29 +08:00 |
|
|
|
cbb7d4138d
|
改字段idcardnumber
|
2022-07-16 23:07:09 +08:00 |
|
|
|
6295da7bb7
|
安全培训管理：更改鼠标悬浮教育类型样式
|
2022-07-16 18:28:45 +08:00 |
|
|
|
6793246479
|
安全培训管理：完成培训详情查看功能
|
2022-07-16 18:12:23 +08:00 |
|
骆乐
|
8cae38f9b4
|
Merge branch 'shenzhen-dev' of http://10.0.0.60/dhp/zhgdyun into shenzhen-dev
|
2022-07-16 18:05:28 +08:00 |
|
骆乐
|
d51d8ffea6
|
修复了数字工地司机信息
|
2022-07-16 18:01:49 +08:00 |
|
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 |
|
