wangpeng
/
integrated_traffic_vue
forked from integrated_whb/integrated_whb_vue
1
0
Fork 0
Code Pull Requests Activity
523 Commits
2 Branches
0 Tags
23 MiB
Commit Graph

511 Commits (f2e506b300e9525e081b1f09f3d1fb11fa506b97)

Author SHA1 Message Date
xiepeng 6f0b136a2f BUG优化 2024-05-07 18:03:26 +08:00
xiepeng b1f3b11945 BUG 优化 营运车辆和货运挂车的部门显示ID 
事故人员显示ID
 2024-05-06 17:42:14 +08:00
xiepeng 9f7a11dd3b BUG 优化 2024-04-30 17:54:33 +08:00
xiepeng df25c3b3f8 BUG 优化 2024-04-29 17:54:44 +08:00
277151821@qq.com db6c4bfaea 用户管理、从业人员 2024-04-29 09:23:04 +08:00
xiepeng 77c6a36092 BUG 优化 2024-04-28 17:58:01 +08:00
xiepeng 51756106a2 BUG 优化 2024-04-26 18:03:07 +08:00
LiuJiaNan c9e9f71e54 安全生产费用提取和使用管理合计 2024-04-26 11:03:06 +08:00
xiepeng 9a445bc29b BUG 优化 2024-04-25 18:01:55 +08:00
xiepeng d291a9b98e BUG 优化 2024-04-25 09:52:34 +08:00
wangpeng 202edf8c8e 代码格式化 
车辆颜色改为车牌颜色
自编号改为编号
 2024-04-23 22:17:15 +08:00
xiepeng 629e17a48f BUG 优化 2024-04-23 18:04:08 +08:00
xiepeng 143c0e5c96 BUG 优化 2024-04-22 17:56:27 +08:00
xiepeng 4fd3727c49 BUG 优化 2024-04-19 12:07:50 +08:00
xiepeng 6e324752fe Merge remote-tracking branch 'origin/dev' into dev 2024-04-18 17:50:38 +08:00
xiepeng a0780144ca BUG 优化 2024-04-18 17:49:12 +08:00
wangpeng 2be771dd52 行业培训类型组件编辑bug修改 2024-04-18 11:50:11 +08:00
鲁洪霞 afcf3545dd 鲁 2024-04-18 09:11:49 +08:00
xiepeng 18a5889e1f Merge remote-tracking branch 'origin/dev' into dev 2024-04-17 13:03:56 +08:00
xiepeng ddf52fc4ca BUG 优化 2024-04-17 13:02:05 +08:00
鲁洪霞 266c069378 鲁 2024-04-17 09:28:48 +08:00
wangpeng be4df46323 修改正式环境 
代码格式化
 2024-04-17 00:27:03 +08:00
xiepeng 16ae293b11 BUG 优化 2024-04-16 17:30:12 +08:00
xiepeng 8b8eab7b72 BUG 优化 2024-04-16 16:19:55 +08:00
xiepeng 258e02c2b6 BUG 优化 2024-04-16 11:23:07 +08:00
xiepeng 7b37c0fcf1 BUG 优化 2024-04-16 09:47:06 +08:00
xiepeng f4518ef360 BUG 优化 2024-04-15 18:00:07 +08:00
xiepeng 57487151d6 BUG 优化 2024-04-12 18:04:26 +08:00
LiuJiaNan f2e8d02867 环境变量 2024-04-12 10:26:05 +08:00
LiuJiaNan f77aa17083 登录页 2024-04-12 09:26:48 +08:00
wangpeng 426ed0b6a2 地点管理修改行政区域必填 2024-04-11 20:36:00 +08:00
xiepeng a9ae574aff BUG 优化 2024-04-11 18:29:01 +08:00
wangpeng d51784a22d Merge remote-tracking branch 'origin/dev' into dev 2024-04-11 16:12:24 +08:00
wangpeng 8267ffda49 js方法替换 2024-04-11 16:12:17 +08:00
LiuJiaNan d03a7f2a76 登录页 2024-04-11 15:25:53 +08:00
wangpeng a7b28c8e3d 课程管理编辑异常处理 2024-04-11 12:39:44 +08:00
wangpeng 30be7bc705 培训行业类型编辑异常 2024-04-11 11:26:01 +08:00
wangpeng 14a8be1d8d 调试安全通知选择人员回调问题 2024-04-11 10:38:24 +08:00
wangpeng edb4fc5c1a 调试安全通知选择人员回调问题 2024-04-10 19:54:11 +08:00
xiepeng ae3cba5fb8 BUG 优化 2024-04-10 16:53:36 +08:00
wangpeng 30c65501a6 安全费用投入 2024-04-09 21:58:03 +08:00
wangpeng db057467b2 补充替换CORPINFO_ID通用标识 2024-04-09 21:52:02 +08:00
xiepeng 680b3cc994 BUG 优化 2024-04-09 19:08:35 +08:00
wangpeng ba03a2fa12 删除统一样式 
修复安全体系管理
 2024-04-09 16:07:52 +08:00
wangpeng 02d7364a6e 代码格式化 2024-04-09 10:27:59 +08:00
鲁洪霞 ad790b4ce9 鲁 2024-04-09 10:09:47 +08:00
wangpeng ce38a19607 优化人员选择 2024-04-08 20:11:06 +08:00
xiepeng df72d06332 BUG 优化 2024-04-08 18:02:34 +08:00
wangpeng cabb170582 合并菜单 2024-04-08 17:08:01 +08:00
xiepeng edc013140f BUG 优化 2024-04-07 18:51:27 +08:00
LiuJiaNan 3171a705a0 修改useListData函数签名 2024-04-07 15:04:03 +08:00
xiepeng c57edc5b22 BUG 优化 2024-04-03 17:57:47 +08:00
xiepeng 43b9287721 BUG 优化 2024-04-02 18:52:04 +08:00
xiepeng a090f54ecf Merge remote-tracking branch 'origin/dev' into dev 2024-04-02 08:26:09 +08:00
wangpeng 57dfe8f8c5 批量屏蔽经营企业和经营类型 
消除代码编译的警告、错误
 2024-04-02 08:23:59 +08:00
xiepeng 83faf65bb4 BUG 优化 2024-04-01 18:55:28 +08:00
鲁洪霞 456855000a 鲁 2024-04-01 17:25:09 +08:00
xiepeng 1306882ed0 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue
#	src/views/mechanical_files/inspect_annually/index.vue
 2024-04-01 10:44:15 +08:00
xiepeng 3de96ec2c2 BUG 优化 2024-04-01 10:37:47 +08:00
wangpeng 8619753b0a 消除代码编译的警告、错误 2024-04-01 10:04:41 +08:00
wangpeng f2d72723ef 从危化版同步隐患排查所有功能 2024-04-01 09:21:56 +08:00
zhangyanli d7dd618c8a 档案管理和效果评估bug 2024-04-01 08:32:32 +08:00
WenShiJun 287ca601e4 Merge remote-tracking branch 'origin/dev' into dev 2024-03-30 17:42:42 +08:00
WenShiJun e7e07310bc 页面控制台警告优化 2024-03-30 17:42:01 +08:00
WenShiJun 6e8d9f4154 点击编辑附件名称没有回显bug优化 2024-03-30 16:01:37 +08:00
zhangyanli b2813297c6 档案管理和效果评估bug 2024-03-30 14:57:28 +08:00
xiepeng f96eb0701c Merge remote-tracking branch 'origin/dev' into dev 2024-03-29 18:07:14 +08:00
xiepeng 328b76dcde BUG 优化 2024-03-29 18:07:08 +08:00
WenShiJun c60f698ef5 Merge remote-tracking branch 'origin/dev' into dev 2024-03-29 18:06:42 +08:00
WenShiJun adf753755b bug优化 2024-03-29 18:06:37 +08:00
xiepeng 3e709eb383 Merge remote-tracking branch 'origin/dev' into dev 2024-03-29 13:38:52 +08:00
xiepeng d77a118fc8 BUG 优化 2024-03-29 13:38:39 +08:00
WenShiJun 88b97b8037 生成安全事故档案bug优化 2024-03-29 10:48:10 +08:00
WenShiJun c57033a56f Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/views/mechanical_files/taxation_manage/index.vue
#	src/views/production_course_regulate/violation_registration/index.vue
 2024-03-28 18:39:17 +08:00
WenShiJun 0369b0a784 bug优化 2024-03-28 18:36:17 +08:00
xiepeng 0fc9cd9a76 BUG 优化 2024-03-28 18:31:58 +08:00
xiepeng 5f167d98da Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/views/mechanical_files/production_accident/add.vue
 2024-03-27 18:17:57 +08:00
xiepeng 3b29fb05fc BUG 优化 2024-03-27 18:09:02 +08:00
WenShiJun 5cfc44479c Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/views/mechanical_files/beidou/index.vue
#	src/views/mechanical_files/taxation_manage/index.vue
 2024-03-27 18:08:03 +08:00
WenShiJun 301b97d4f4 bug优化 2024-03-27 18:05:30 +08:00
zhangyanli 3cb8221676 教培功能bug修复 2024-03-27 15:53:32 +08:00
xiepeng 40a5fd2496 提醒天数 下拉 2024-03-27 10:02:58 +08:00
xiepeng 25680c9e26 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/assets/js/constant.js
 2024-03-26 18:04:58 +08:00
xiepeng cfec695c81 修改车牌号、车架号、发动机号校验 
图片显示
 2024-03-26 18:04:04 +08:00
WenShiJun cf7e5686e4 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/views/enterprise_management/basics_info_management/freight_trailer/add.vue
#	src/views/enterprise_management/basics_info_management/freight_trailer/index.vue
 2024-03-26 18:03:19 +08:00
WenShiJun 558799d0c9 bug优化 2024-03-26 18:02:32 +08:00
wangpeng ab68b10197 修改 名称 2024-03-25 19:02:07 +08:00
WenShiJun 6c1000d5f9 页面样式优化，输入框内容清除 2024-03-25 14:27:52 +08:00
WenShiJun 4c69d2f8a7 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/views/mechanical_files/inspect_annually/index.vue
#	src/views/mechanical_files/insure/index.vue
#	src/views/mechanical_files/taxation_manage/add.vue
 2024-03-25 11:42:37 +08:00
WenShiJun 8cfa203273 保险管理，运营管理，维保管理，北斗管理优化 2024-03-25 11:39:42 +08:00
xiepeng 0e10930e28 Merge remote-tracking branch 'origin/dev' into dev 2024-03-25 10:17:49 +08:00
wangpeng 097433eaf4 Merge remote-tracking branch 'origin/dev' into dev 2024-03-25 09:41:59 +08:00
zhangyanli 5e1b790772 教培建班 2024-03-25 09:37:38 +08:00
wangpeng b098bf7dcd 部署异常修复 2024-03-25 09:27:54 +08:00
鲁洪霞 9684793f2d 鲁 2024-03-25 09:22:27 +08:00
LiuJiaNan 6df0f3f247 企业用户管理、档案管理、效果评估 2024-03-25 09:13:10 +08:00
xiepeng 8a90839b14 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/assets/js/constant.js
#	src/request/assigned_manage.js
#	src/request/enterprise_management.js
#	src/request/operation_vehicle.js
#	src/request/scrap_manage.js
#	src/request/taxation_manage.js
#	src/views/enterprise_management/basics_info_management/freight_trailer/index.vue
#	src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue
#	src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue
#	src/views/mechanical_files/inspect_annually/index.vue
#	src/views/mechanical_files/insure/index.vue
#	src/views/mechanical_files/scrap_manage/add.vue
#	src/views/mechanical_files/taxation_manage/add.vue
#	src/views/mechanical_files/taxation_manage/edit.vue
 2024-03-25 08:52:36 +08:00
xiepeng 70f430b6b6 修改车船税过户显示 营运车辆车牌号唯一 2024-03-25 08:47:41 +08:00
chenxinying 2d1eb54c60 Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 17:43:42 +08:00
chenxinying d7cccbed87 行车三检检查日志 2024-03-22 17:29:59 +08:00