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

91 Commits (b2813297c696b515dbf143a1d7755adc758967ec)

Author SHA1 Message Date
zhangyanli b2813297c6 档案管理和效果评估bug 2024-03-30 14:57:28 +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 0369b0a784 bug优化 2024-03-28 18:36:17 +08:00
xiepeng 0fc9cd9a76 BUG 优化 2024-03-28 18:31:58 +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
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 b098bf7dcd 部署异常修复 2024-03-25 09:27:54 +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
WenShiJun 037e723d71 Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 17:18:20 +08:00
WenShiJun cd5110f5c5 年检管理，保险管理优化 2024-03-22 17:18:08 +08:00
wangpeng 3213c25bc1 从业人员管理 2024-03-22 14:59:41 +08:00
LiuJiaNan 82f7c1709b dialog的:on-close换成@close 2024-03-21 11:49:21 +08:00
WenShiJun 02a0c7fcae Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/views/enterprise_management/department/components/add.vue
 2024-03-20 16:58:48 +08:00
WenShiJun f4606dfdde 安全生产月活动，安全知识手册模块开发 
运单登记，地点管理模块优化，
 2024-03-20 16:58:12 +08:00
LiuJiaNan 80f0ffbbe1 element新版本api弃用警告 2024-03-20 15:45:42 +08:00
xiepeng abafba83fb Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/assets/js/constant.js
#	src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue
#	src/views/mechanical_files/assigned_manage/add.vue
 2024-03-19 14:08:38 +08:00
xiepeng 6419d6c50c 过户管理 
报废管理
企业安全生产值班记录
生产设备设施台账
劳动防护用品发放记录
消防设备设施台账
上报事件处理台账
 2024-03-19 14:04:17 +08:00
WenShiJun 375021971d Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/assets/js/constant.js
#	src/views/safety_production_related/things_check/index.vue
 2024-03-15 17:55:34 +08:00
WenShiJun 9472c26770 生产安全事故档案模块开发 2024-03-15 17:54:28 +08:00
zhangyanli da60a2c7c8 教培档案管理 2024-03-15 10:01:08 +08:00
LiuJiaNan 1ad0b76160 删除console和禁止使用Object.assign 2024-03-14 10:46:49 +08:00
zhangyanli f570e9dcc6 用户管理和企业管理修改 2024-03-12 09:15:23 +08:00
WenShiJun a1c8e248d6 Merge remote-tracking branch 'origin/dev' into dev 2024-03-08 18:06:25 +08:00
xiepeng f9bf755912 Merge remote-tracking branch 'origin/dev' into dev 2024-03-08 17:46:51 +08:00
WenShiJun 908f306f80 Merge remote-tracking branch 'origin/dev' into dev 2024-03-07 13:23:39 +08:00
xiepeng 09e9820603 运营车辆 修改 车船税 2024-03-07 10:26:07 +08:00
LiuJiaNan 01cbe545c4 删除没用的代码 2024-03-07 10:00:45 +08:00
277151821@qq.com 3accb1e683 货运挂车 增加校验 2024-03-06 12:02:19 +08:00
xiepeng 4b724f5560 运营车辆 2024-03-06 09:26:27 +08:00
277151821@qq.com 0bd143e47d 货运挂车 2024-03-05 11:00:34 +08:00
WenShiJun fa170fe4d0 Merge remote-tracking branch 'origin/dev' into dev 2024-03-04 11:57:44 +08:00
WenShiJun 42e79f21be 功能优化 2024-03-04 11:57:38 +08:00
wangpeng e7f2af2492 Merge pull request 'dev' (#3) from integrated_whb/integrated_whb_vue:dev into dev 
Reviewed-on: #3
 2024-03-04 11:20:53 +08:00
xiepeng cb7561603b Merge remote-tracking branch 'origin/dev' into dev 2024-03-04 09:32:27 +08:00
xiepeng a9ee3e6942 运营车辆 2024-03-04 09:31:17 +08:00
WenShiJun 37f176bd1a 新增从业人员相关页面 2024-03-01 18:05:17 +08:00
xiepeng 845c162aad 运营车辆 2024-03-01 14:32:47 +08:00