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

138 Commits (126c2f048e1d0fb1bd43373e66908ab721cde1eb)

Author SHA1 Message Date
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
LiuJiaNan 3aef4d21fe 修改电子围栏添加样式 2024-03-01 10:53:50 +08:00
LiuJiaNan 09618493c1 修复关系图警告、电子围栏和组织机构共用一个关系图组件 2024-03-01 10:49:18 +08:00
xiepeng 62597aa135 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	.env
 2024-03-01 10:27:32 +08:00
xiepeng b3dd58b4ce 运营车辆 2024-03-01 10:27:00 +08:00
WenShiJun 2a719a791e 客户管理模块->新增列表，添加页面功能 
地点管理模块->新增列表，添加页面功能
 2024-02-29 18:28:57 +08:00
wangpeng 69cfc999a2 企业信息编辑 2024-02-28 16:45:10 +08:00
fangjiakai e92fd99252 历史轨迹增加计算移动速度逻辑 2024-02-28 08:41:42 +08:00
zhangqihang 539c10309a 修复bug 2024-02-27 08:47:24 +08:00
dearlin 15e017eda5 修改地图图层 2024-02-26 16:42:30 +08:00
dearlin d977e8e4cb 部门新加外来人员部门属性，摄像头定位接口 2024-02-22 17:31:14 +08:00
LiuJiaNan e0450b2e11 更改eslint规则 2024-02-21 09:42:49 +08:00
zhangyanli 855daed2ab bug修复 2024-02-05 14:29:54 +08:00
LiuJiaNan 2da5e720d3 init 2024-02-04 16:18:49 +08:00
LiuJiaNan 440a1bd252 init 2024-01-31 16:44:17 +08:00
LiuJiaNan 9169935d67 init 2024-01-30 17:36:49 +08:00
dearlin 307b9fcc4d 电子围栏必选,电子围栏区域名称 必填项 2024-01-30 15:24:17 +08:00
dearlin 253e5ae799 电子围栏 2024-01-30 15:22:17 +08:00
LiuJiaNan 71eea9850c init 2024-01-29 17:43:23 +08:00
dearlin 04f28b4acc ai视频报警 2024-01-26 15:52:00 +08:00
LiuJiaNan 41f08a759e init 2024-01-26 10:24:28 +08:00
LiuJiaNan 3c06405a40 init 2024-01-25 18:00:08 +08:00
dearlin 659469ec58 清单检查要有电子围栏禁止排查 2024-01-25 17:35:13 +08:00
dearlin f7859bdb34 Merge remote-tracking branch 'origin/dev' into dev 2024-01-25 14:22:20 +08:00
dearlin 53b63fabc1 人员与辨别部位对接第三方 2024-01-25 14:22:04 +08:00
LiuJiaNan 70f10de762 init 2024-01-24 18:08:04 +08:00
z e181a0ef35 init 2024-01-17 17:56:46 +08:00
z 2fe776a3f6 init 2024-01-12 18:21:07 +08:00
z f12ae4a5bc init 2024-01-11 18:01:45 +08:00
z 82f63b7698 init 2024-01-10 18:01:56 +08:00
z 0bba51d4d9 init 2024-01-09 18:02:04 +08:00
z f8b71eccbf init 2024-01-09 16:20:28 +08:00
z 0525bed574 init 2024-01-08 18:04:31 +08:00
z fb75396024 init 2024-01-08 17:47:50 +08:00
z 079e4c17b9 init 2024-01-08 14:31:18 +08:00
z 3ad49a0620 init 2024-01-06 17:44:23 +08:00
z b5861440f2 init 2024-01-05 18:02:22 +08:00
z 1fc7e96f0d init 2024-01-05 17:33:18 +08:00
z 474c5ee580 init 2024-01-05 14:32:49 +08:00
liujianan 0180e34d6e init 2024-01-04 09:26:49 +08:00
liujianan 38e615ca83 init 2024-01-04 09:23:56 +08:00
liujianan 0cdce1c49f init 2024-01-04 09:02:38 +08:00