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

428 Commits (d51784a22d3b5039df63157668ea27f0ce3ab5f4)

Author SHA1 Message Date
277151821@qq.com 93e40741ad 北斗管理 2024-03-15 11:11:12 +08:00
zhangyanli da60a2c7c8 教培档案管理 2024-03-15 10:01:08 +08:00
LiuJiaNan a6a2fbc88b 视频播放增加去掉倍速和进度条 2024-03-15 09:23:39 +08:00
LiuJiaNan 2efc75601a 教育培训 2024-03-15 08:32:31 +08:00
LiuJiaNan 4a5dcf8b1f 教育培训 2024-03-15 08:19:56 +08:00
LiuJiaNan 1ad0b76160 删除console和禁止使用Object.assign 2024-03-14 10:46:49 +08:00
xiepeng c28033032f Merge remote-tracking branch 'origin/dev' into dev 2024-03-14 09:03:33 +08:00
xiepeng 5e3468343a 过户管理 报废管理 2024-03-14 09:03:11 +08:00
WenShiJun 3ec021ff30 Merge remote-tracking branch 'origin/dev' into dev 2024-03-13 18:06:07 +08:00
WenShiJun 68a22f3702 岗位安全承诺书、责任书，职业危害告知书，管理人员配备，安全生产目标，安全责任制考核模块开发，优化 2024-03-13 18:05:42 +08:00
LiuJiaNan 566eee266e 教育培训 2024-03-13 13:47:04 +08:00
zhangyanli f570e9dcc6 用户管理和企业管理修改 2024-03-12 09:15:23 +08:00
WenShiJun 3db91701d0 安全例会优化 
岗位安全承诺书开发
岗位安全责任书开发
 2024-03-11 18:09:41 +08:00
WenShiJun a1c8e248d6 Merge remote-tracking branch 'origin/dev' into dev 2024-03-08 18:06:25 +08:00
WenShiJun 4f57a393b1 新增劳务聘用合同，岗位安全责任书，职业危害告知书 
安全例会优化
 2024-03-08 18:06:21 +08:00
xiepeng f9bf755912 Merge remote-tracking branch 'origin/dev' into dev 2024-03-08 17:46:51 +08:00
xiepeng 2c7b50cc36 过户管理 2024-03-08 17:45:29 +08:00
277151821@qq.com c0944ad180 年检管理 2024-03-08 08:39:12 +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 33626cab78 删除没用的代码 2024-03-07 10:02:37 +08:00
LiuJiaNan 01cbe545c4 删除没用的代码 2024-03-07 10:00:45 +08:00
LiuJiaNan 0b7f1f65df 环境变量增加提示 2024-03-07 09:59:58 +08:00
277151821@qq.com 3a54b4ffdf 货运挂车 2024-03-07 09:33:21 +08:00
WenShiJun a3b0cded3f 安全例会模块优化->参会人员页，详情页 2024-03-06 16:11:13 +08:00
277151821@qq.com 3accb1e683 货运挂车 增加校验 2024-03-06 12:02:19 +08:00
xiepeng 4b724f5560 运营车辆 2024-03-06 09:26:27 +08:00
WenShiJun 043e071b64 安全例会模块优化 2024-03-05 18:13:53 +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 bd44a63496 代码合并后当前项目配置信息修改 2024-03-04 11:32:03 +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
wangpeng 3a29de3267 临时修改，代码合并完后再改回 2024-03-04 11:19:52 +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
鲁洪霞 94feeeb9bf 样式修改 2024-03-04 09:05:22 +08:00
LiuJiaNan 89c446c291 BI页 2024-03-04 08:30:58 +08:00
WenShiJun 37f176bd1a 新增从业人员相关页面 2024-03-01 18:05:17 +08:00
LiuJiaNan df1dcef265 实时追踪 2024-03-01 17:58:20 +08:00
LiuJiaNan b7727b0f5e 实时追踪 2024-03-01 17:51:02 +08:00
fangjiakai 3ad5910d14 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/views/BI/js/trajectory.js
 2024-03-01 17:14:34 +08:00
LiuJiaNan b6ba08a005 人员定位区域人员统计增加自动滚动 2024-03-01 16:26:47 +08:00
fangjiakai 5fef270f7e 人员实时追踪 2024-03-01 16:21:19 +08:00
LiuJiaNan ece4403288 人员定位区域人员统计增加自动滚动 2024-03-01 15:49:32 +08:00
dearlin cf1c3bbc13 告警类型统计与 区域人员统计 2024-03-01 15:34:00 +08:00
dearlin 7145e51ebb 告警类型统计与 区域人员统计 2024-03-01 15:08:30 +08:00
WenShiJun c2c9d83777 Merge remote-tracking branch 'origin/dev' into dev 2024-03-01 14:37:48 +08:00
xiepeng 845c162aad 运营车辆 2024-03-01 14:32:47 +08:00
WenShiJun 4376e3a942 安全通知，运单登记，客户管理，地点管理功能优化 2024-03-01 13:53:42 +08:00
LiuJiaNan 481750be3f 更改历史轨迹组件引入位置 2024-03-01 13:52:31 +08:00
fangjiakai 75c44cf1ef Merge remote-tracking branch 'origin/dev' into dev 2024-03-01 12:05:07 +08:00
fangjiakai 5cd0408124 人员移动增加楼层显示,解决中定点偏移 2024-03-01 12:03:28 +08:00
dearlin 7da60f0fbb 八项作业扎点与弹窗 2024-03-01 11:38:49 +08:00
LiuJiaNan 3aef4d21fe 修改电子围栏添加样式 2024-03-01 10:53:50 +08:00
LiuJiaNan 09618493c1 修复关系图警告、电子围栏和组织机构共用一个关系图组件 2024-03-01 10:49:18 +08:00
LiuJiaNan cfd0f1ae63 bug：14355、14342、14333 2024-03-01 10:37:52 +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
LiuJiaNan 0167dfcd75 人员报警增加动画 2024-03-01 09:53:41 +08:00
dearlin 0f14838296 八项作业与部分bug 2024-03-01 09:05:21 +08:00
WenShiJun 2a719a791e 客户管理模块->新增列表，添加页面功能 
地点管理模块->新增列表，添加页面功能
 2024-02-29 18:28:57 +08:00
LiuJiaNan 30233b73bd 去除rules用ref包装 2024-02-29 16:03:04 +08:00
LiuJiaNan 077432b715 修复清单管理table的row-key写成变量报错 2024-02-29 10:37:01 +08:00
LiuJiaNan 13b86add48 修复一人一档左侧树跳转链接错误 2024-02-29 09:57:20 +08:00
chenxinying 3915c76463 Merge remote-tracking branch 'origin/dev' into dev 2024-02-29 08:47:15 +08:00
chenxinying 305800c71a PC端八项作业 2024-02-29 08:46:56 +08:00
WenShiJun a11e809c8c 安全通知功能优化 
新增运单登记列表页，添加页
 2024-02-28 19:30:39 +08:00
dearlin a350dc1b26 14328 地图BI页显示优化建议：1.特殊作业图标修改优化例如动火是红色火苗依次类推 2.显示作业添加特殊作业简称 2024-02-28 17:14:37 +08:00
wangpeng 69cfc999a2 企业信息编辑 2024-02-28 16:45:10 +08:00
dearlin 32a110bdf3 14132 这几种隐患来源的显示不正确 需要统一 2024-02-28 14:26:13 +08:00
zhangqihang a63696c5e7 修复bug 2024-02-28 13:45:17 +08:00
dearlin 55d7356a8b 展示本月工作 2024-02-28 11:52:03 +08:00
fangjiakai dfd1a6dd1a 人员聚集告警地图显示 2024-02-28 10:50:02 +08:00
fangjiakai c33eaadd63 Revert "1" 
This reverts commit 858e2ff33d.
 2024-02-28 10:49:36 +08:00
fangjiakai 858e2ff33d 1 2024-02-28 10:49:12 +08:00
fangjiakai 3e43c731bb Merge remote-tracking branch 'origin/dev' into dev 2024-02-28 10:44:30 +08:00
fangjiakai ab5d7f4378 人员聚集告警地图显示 2024-02-28 10:44:18 +08:00
LiuJiaNan a863a386e0 跳转到BI页关闭持证作业人员到期提示 2024-02-28 10:27:08 +08:00
LiuJiaNan f0590c087c 修复echarts警告 2024-02-28 10:15:13 +08:00
fangjiakai 46f099a696 Merge remote-tracking branch 'origin/dev' into dev 2024-02-28 09:57:53 +08:00
dearlin aa529766d9 Merge remote-tracking branch 'origin/dev' into dev 2024-02-28 09:56:53 +08:00
dearlin 0ddaedd8bb 聚集告警记录 2024-02-28 09:56:46 +08:00
LiuJiaNan fb94683b9b bug14305 2024-02-28 09:49:13 +08:00
LiuJiaNan 5024a89dbe bug14306 2024-02-28 09:48:39 +08:00
LiuJiaNan a4ce310e83 更改logo 2024-02-28 09:47:49 +08:00
zhangqihang 3c7c37d7f2 修复bug 2024-02-28 09:02:04 +08:00
fangjiakai abd9830dfd Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/views/BI/components/rightico.vue
 2024-02-28 08:42:37 +08:00
fangjiakai e92fd99252 历史轨迹增加计算移动速度逻辑 2024-02-28 08:41:42 +08:00
dearlin 4bce1b3a71 解决了 Bug 添加人应该是中文名称 不是登录账号 14304 2024-02-27 17:28:24 +08:00
LiuJiaNan ac61aad982 增加动画 2024-02-27 17:02:54 +08:00
LiuJiaNan d7200aba12 增加动画 2024-02-27 17:02:30 +08:00
LiuJiaNan 92c577a110 去除圆角 2024-02-27 16:38:36 +08:00
LiuJiaNan 8d91edbab0 BI页面四色图 2024-02-27 16:33:44 +08:00
鲁洪霞 14c5bcc617 样式修改 2024-02-27 16:21:41 +08:00
LiuJiaNan 9f58dbdd9c 纯净地图和增加动画 2024-02-27 16:02:35 +08:00
wangpeng 52dd3e36e7 同步危化版已修复bug 
修改系统名称
 2024-02-27 15:44:17 +08:00
wangpeng 348f673286 Merge pull request 'dev' (#1) from integrated_whb/integrated_whb_vue:dev into dev 
Reviewed-on: #1
 2024-02-27 14:21:32 +08:00
LiuJiaNan d50245b985 logo 2024-02-27 12:00:42 +08:00
dearlin 5ee12913dd ai视频报警 移除告警来源。因为与实时告警监控冗余 2024-02-27 10:32:38 +08:00
LiuJiaNan 60eae2d306 axios 2024-02-27 09:28:08 +08:00
LiuJiaNan 57c0b9a589 bug14199 2024-02-27 09:27:50 +08:00
zhangqihang 539c10309a 修复bug 2024-02-27 08:47:24 +08:00
LiuJiaNan 3bed69c2c3 element样式 2024-02-27 08:37:48 +08:00
WenShiJun 83cc22ebf8 安全例会->新增列表、新增、详情页面 2024-02-26 18:30:21 +08:00
LiuJiaNan 5751d75241 修改echarts警告、数字增加滚动效果 2024-02-26 17:59:52 +08:00
dearlin cb1f9bae82 Merge remote-tracking branch 'origin/dev' into dev 2024-02-26 17:25:15 +08:00
dearlin 53175a7546 修改地图图层 2024-02-26 17:25:08 +08:00
LiuJiaNan fbc858cdef 首页公告增加滚动 2024-02-26 17:17:20 +08:00
dearlin 15e017eda5 修改地图图层 2024-02-26 16:42:30 +08:00
LiuJiaNan 28e6e12999 选点样式 2024-02-26 16:15:58 +08:00
LiuJiaNan da2dfa5f67 通知公告、通知模板配置 2024-02-26 15:53:09 +08:00
fangjiakai 1fa8b0a609 Merge remote-tracking branch 'origin/dev' into dev 2024-02-26 15:37:56 +08:00
fangjiakai d9308c7fad 摄像头摆放 2024-02-26 15:37:47 +08:00
zhangqihang 503061f7aa 修复bug 2024-02-26 15:32:44 +08:00
dearlin 691796b63b Merge remote-tracking branch 'origin/dev' into dev 2024-02-26 11:38:30 +08:00
dearlin 6bdbeaf4b4 允许进入部门，允许进入人员 2024-02-26 11:38:17 +08:00
LiuJiaNan 2f7623585f 聚集告警记录、聚集概览 2024-02-26 11:27:02 +08:00
zhangyanli 47dd8dffb6 bug：14263修复 2024-02-26 11:17:37 +08:00
fangjiakai 97b43e070f 人员路径和绘制电子围栏 2024-02-26 08:47:12 +08:00
WenShiJun f025e90a0a 安全通知模块->新增列表、新增、详情页面 2024-02-23 19:07:36 +08:00
zhangqihang 626c1a4bb9 修复bug 2024-02-23 18:03:26 +08:00
LiuJiaNan ff65a74e6d 定位管理 2024-02-23 16:54:19 +08:00
LiuJiaNan dd513a4120 Merge remote-tracking branch 'origin/dev' into dev 2024-02-23 15:06:15 +08:00
LiuJiaNan e988d6014d 定位管理 2024-02-23 15:05:53 +08:00
zhangyanli df7071258f bug：14267修复 2024-02-23 14:54:46 +08:00
LiuJiaNan af9cdad62e bug14254 2024-02-23 11:22:53 +08:00
LiuJiaNan c5f137a2f1 bug14255 2024-02-23 11:12:47 +08:00
zhangqihang 8e436724ae 修复bug 2024-02-23 09:07:12 +08:00
LiuJiaNan 2e172df365 地图设置 2024-02-23 09:06:53 +08:00
dearlin d977e8e4cb 部门新加外来人员部门属性，摄像头定位接口 2024-02-22 17:31:14 +08:00
LiuJiaNan 10eb0933dd element样式 2024-02-22 16:32:49 +08:00
LiuJiaNan 8f8efc7a42 首页 2024-02-22 16:30:07 +08:00
wangpeng d3be2a8f2a 更换系统主菜单 2024-02-22 16:18:58 +08:00
zhangyanli 31f1afa126 bug：14232修复 2024-02-22 16:14:38 +08:00
LiuJiaNan 5311ae417d 历史轨迹 2024-02-22 13:52:52 +08:00
LiuJiaNan 55ccefb142 历史轨迹 2024-02-22 11:57:42 +08:00
dearlin 4a5bd7df58 人员卡管理 2024-02-22 09:16:01 +08:00
zhangqihang 1125d63044 修复bug 2024-02-22 08:41:26 +08:00
zhangyanli 58bd9444ca bug修复 2024-02-21 18:09:05 +08:00
LiuJiaNan b82fce61b9 pdf导出改为打印 2024-02-21 17:31:16 +08:00
LiuJiaNan 8bf89a3736 历史轨迹 2024-02-21 16:35:31 +08:00
LiuJiaNan f7a81d10f3 历史轨迹 2024-02-21 16:32:24 +08:00
LiuJiaNan 96b7ae4aaf 历史轨迹 2024-02-21 16:18:58 +08:00
zhangyanli 2530d035c5 隐患治理和清单统计bug修复 2024-02-21 16:14:40 +08:00
wangpeng 91457d22d4 特种作业人员证件临期提醒（迁表） 2024-02-21 11:45:23 +08:00
chenxinying 7e8ac114fe 特种作业人员 2024-02-21 11:18:02 +08:00
fangjiakai f645b8fbe8 八项作业流程图 2024-02-21 10:48:25 +08:00
dearlin 287201927d 人员定位菜单 2024-02-21 10:41:40 +08:00
dearlin 0b5ab067fd 人员定位告警 2024-02-21 10:16:35 +08:00