wangpeng
/
integrated_traffic_uniapp
forked from integrated_whb/UniApp_integrated_whb
1
0
Fork 0
Code Pull Requests Activity
145 Commits
2 Branches
0 Tags
38 MiB
Commit Graph

145 Commits (198927a26502f393013043be8aaef8ef091ceffc)

Author SHA1 Message Date
zhangyanli 198927a265 Merge remote-tracking branch 'origin/dev' into dev 2024-05-20 10:38:46 +08:00
xiepeng c45fa85a3f BUG优化 2024-05-17 17:57:47 +08:00
zhangyanli 52f23a7647 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	pages/basics/basic-info/components/baseInfo.vue
#	pages/basics/basic-info/components/certificate.vue
 2024-05-17 16:00:49 +08:00
wangpeng 57a2833e51 行车三检水印地点undefined内容替换 2024-05-17 15:47:00 +08:00
xiepeng c7cd69ad26 BUG优化 2024-05-17 09:21:41 +08:00
xiepeng b73c4da3c5 BUG优化 2024-05-16 18:01:12 +08:00
xiepeng 3ac6e233e1 BUG优化 
我的学习人脸比对
 2024-05-15 14:16:58 +08:00
zhangyanli 145ceb69da Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	common/tool.js
#	pages/login/register/baseInfo.vue
#	pages/login/register/certificate.vue
 2024-05-13 16:06:05 +08:00
xiepeng 84faaaca3d BUG优化 2024-05-11 18:01:06 +08:00
xiepeng f756e12e71 BUG优化 
行车 添加承诺选项
 2024-05-10 17:53:18 +08:00
xiepeng eeb58ba02c BUG优化 2024-05-09 18:08:07 +08:00
wangpeng 9b90a9f9a5 名称替换 2024-05-07 11:27:19 +08:00
wangpeng 7157c910cf 图片替换 2024-05-07 11:25:40 +08:00
xiepeng d795ca102c 注册从业人员 人员类型多选 有驾驶员的驾驶信息必填 人员类型回显 2024-05-06 17:39:59 +08:00
xiepeng 57324bccdd BUG 优化 2024-04-30 17:55:25 +08:00
wangpeng 0923bb456d 页面显示优化 
修改正式环境
 2024-04-17 00:29:20 +08:00
xiepeng d8b2081e39 添加通知 2024-04-01 18:56:06 +08:00
wangpeng a2f671f125 清理测试信息 2024-04-01 09:26:01 +08:00
zhangyanli 39b128660b 教培功能bug修复 2024-04-01 08:33:09 +08:00
WenShiJun 996a13153e 通知未显示通知标题bug优化， 
行车三检bug优化
 2024-03-30 16:03:50 +08:00
WenShiJun 3b649ae9cc 行车检查未进行行车前检查不可进行行车中检查优化 2024-03-29 18:07:40 +08:00
WenShiJun c52adbb7f9 安全例会未开始或已结束仍可进入问题优化 2024-03-29 14:23:32 +08:00
WenShiJun cde8497a62 Merge remote-tracking branch 'origin/dev' into dev 2024-03-29 14:17:03 +08:00
WenShiJun 0a0263cd1e 安全例会当前登录用户只能查看自己可参与的会议优化 2024-03-29 14:16:58 +08:00
zhangyanli dec7e09622 教培功能bug修复 2024-03-27 15:54:26 +08:00
LiuJiaNan 9d4435e6b5 人员信息 2024-03-26 09:52:10 +08:00
wangpeng 968d04c22f Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	pages/basics/home.vue
 2024-03-25 19:24:09 +08:00
wangpeng 59ebc64921 清理测试信息 2024-03-25 19:17:10 +08:00
LiuJiaNan 4f1f2f3b62 学习园地 2024-03-25 19:16:41 +08:00
chenxinying 5c298c2e41 Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 17:43:19 +08:00
chenxinying c0fc40cb94 行车三检带水印实时拍照 2024-03-22 17:43:13 +08:00
WenShiJun a978688811 Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 17:16:20 +08:00
WenShiJun adb2ba0ab2 安全例会优化->实时照片水印添加当前时间 2024-03-22 17:16:00 +08:00
chenxinying 644b805ea1 Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 15:27:34 +08:00
wangpeng a869f32c8e 从业人员管理 2024-03-22 15:26:43 +08:00
chenxinying a7cf3c1a10 Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 15:09:50 +08:00
chenxinying 32efb53c27 行车三检 2024-03-22 15:09:31 +08:00
wangpeng 9e7b0b5420 从业人员管理 2024-03-22 15:08:55 +08:00
WenShiJun 081d0dab1d 安全例会优化->实时照片添加水印，实时照片和签字图片上传优化 2024-03-11 18:08:35 +08:00
WenShiJun 5be53f55b0 安全例会优化 2024-03-08 18:08:39 +08:00
WenShiJun 869c0a6cda 安全例会模块开发->参会人员上传证明 2024-03-06 16:11:38 +08:00
WenShiJun 44dd6ba00b Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	pages/basics/home.vue
 2024-03-05 18:15:17 +08:00
WenShiJun 0f75d87d73 安全例会模块开发 2024-03-05 18:13:32 +08:00
wangpeng fed09e1677 更新忽略文件 2024-03-04 10:43:42 +08:00
wangpeng d965cadb04 还原配置 2024-03-04 10:41:39 +08:00
wangpeng 6250ce0ba4 Merge pull request 'dev' (#5) from integrated_whb/UniApp_integrated_whb:dev into dev 
Reviewed-on: #5
 2024-03-04 10:37:48 +08:00
wangpeng 7e7cf1b9c0 还原配置 2024-03-04 10:30:16 +08:00
chenxinying d5129650de 特殊作业作业人显示 2024-03-01 17:53:14 +08:00
fangjiakai 29a9391bb7 Merge remote-tracking branch 'origin/dev' into dev 2024-03-01 08:19:33 +08:00
fangjiakai 82f0aa3233 隐患样式 2024-03-01 08:19:27 +08:00