骆乐
|
0ccf899387
|
gai
|
2022-07-29 09:53:57 +08:00 |
|
骆乐
|
241db8fa35
|
xiugai
|
2022-07-29 09:53:02 +08:00 |
|
骆乐
|
f8ee19bc4e
|
Merge branch 'shenzhen-dev' of http://10.0.0.60/dhp/zhgdyun into shenzhen-dev
|
2022-07-29 09:51:55 +08:00 |
|
骆乐
|
aa348c88ba
|
添加判断项目的变量
|
2022-07-29 09:50:04 +08:00 |
|
Jack
|
707669712c
|
Merge branch 'dev-jack' into shenzhen-dev
|
2022-07-29 09:47:41 +08:00 |
|
Jack
|
776c34b6b1
|
人员管理(管理人员)：新增上传现场采集人脸图片压缩逻辑
|
2022-07-29 09:46:10 +08:00 |
|
Jack
|
7d0ecdebe4
|
人员管理(管理人员)：新增上传身份证头像压缩逻辑
|
2022-07-28 19:28:21 +08:00 |
|
骆乐
|
5387f9338d
|
解决冲突
|
2022-07-28 19:20:00 +08:00 |
|
骆乐
|
03093230c5
|
解决了人脸设备问题 添加场地码
|
2022-07-28 19:18:08 +08:00 |
|
Jack
|
a5fc697513
|
人员管理(劳务人员)：新增上传现场采集人脸压缩逻辑
|
2022-07-28 19:07:06 +08:00 |
|
Jack
|
127eac97b1
|
人员管理(劳务人员)：更改 handleUpload 图片绑定逻辑
|
2022-07-28 18:24:33 +08:00 |
|
Jack
|
9bc6007ba1
|
人员管理(劳务人员)：新增上传身份证头像压缩逻辑
|
2022-07-28 17:57:29 +08:00 |
|
Jack
|
e8fa8824ab
|
merge dev-jack into shenzhen-dev
|
2022-07-28 16:49:33 +08:00 |
|
Jack
|
5424002336
|
人员管理(劳务人员)：更改身份证头像上传方式为 http-request
|
2022-07-28 16:45:40 +08:00 |
|
骆乐
|
38b596f0dd
|
解决再次进场问题
|
2022-07-28 15:00:52 +08:00 |
|
Jack
|
d3b74de6f4
|
Merge branch 'shenzhen-dev' into dev-jack
|
2022-07-28 14:16:33 +08:00 |
|
骆乐
|
4d4299840b
|
团队职务更改
|
2022-07-28 11:28:47 +08:00 |
|
骆乐
|
737a646f4e
|
解决冲突
|
2022-07-28 11:24:23 +08:00 |
|
骆乐
|
551def98d5
|
Merge branch 'shenzhen-dev' of http://10.0.0.60/dhp/zhgdyun into shenzhen-dev
|
2022-07-28 11:22:29 +08:00 |
|
jxjgmj
|
9eaf84f5c1
|
Merge branch 'dev-gmj' into shenzhen-dev
|
2022-07-28 09:29:02 +08:00 |
|
jxjgmj
|
91096db39d
|
显示银行
|
2022-07-27 19:09:30 +08:00 |
|
Jack
|
05873b87c0
|
代码格式化
|
2022-07-27 16:16:05 +08:00 |
|
Jack
|
0da407e488
|
人员管理(管理人员)：更改人员录入表单，添加开户行与银行卡号
|
2022-07-27 15:21:26 +08:00 |
|
骆乐
|
fbeb862bb8
|
添加了湖里要求的背景
|
2022-07-27 14:05:49 +08:00 |
|
Jack
|
14ce8abda3
|
package.json：新增 npm start 配置
|
2022-07-25 19:30:58 +08:00 |
|
骆乐
|
56979c7d88
|
对接插件
|
2022-07-22 20:00:46 +08:00 |
|
骆乐
|
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 |
|
