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

86 Commits (7c7f5fda2639c95ebcd050e349a466fe272abeae)

Author SHA1 Message Date
wangpeng 2be771dd52 行业培训类型组件编辑bug修改 2024-04-18 11:50:11 +08:00
LiuJiaNan d03a7f2a76 登录页 2024-04-11 15:25:53 +08:00
zhangyanli 3cb8221676 教培功能bug修复 2024-03-27 15:53:32 +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
LiuJiaNan fa41f42465 班级管理 2024-03-18 18:01:48 +08:00
LiuJiaNan a6a2fbc88b 视频播放增加去掉倍速和进度条 2024-03-15 09:23:39 +08:00
LiuJiaNan 566eee266e 教育培训 2024-03-13 13:47:04 +08:00
LiuJiaNan 01cbe545c4 删除没用的代码 2024-03-07 10:00:45 +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
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
LiuJiaNan cfd0f1ae63 bug：14355、14342、14333 2024-03-01 10:37:52 +08:00
xiepeng b3dd58b4ce 运营车辆 2024-03-01 10:27:00 +08:00
dearlin a350dc1b26 14328 地图BI页显示优化建议：1.特殊作业图标修改优化例如动火是红色火苗依次类推 2.显示作业添加特殊作业简称 2024-02-28 17:14:37 +08:00
dearlin 32a110bdf3 14132 这几种隐患来源的显示不正确 需要统一 2024-02-28 14:26:13 +08:00
zhangqihang a63696c5e7 修复bug 2024-02-28 13:45:17 +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 ab5d7f4378 人员聚集告警地图显示 2024-02-28 10:44:18 +08:00
zhangqihang 3c7c37d7f2 修复bug 2024-02-28 09:02:04 +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
fangjiakai 97b43e070f 人员路径和绘制电子围栏 2024-02-26 08:47:12 +08:00
LiuJiaNan e988d6014d 定位管理 2024-02-23 15:05:53 +08:00
LiuJiaNan e0450b2e11 更改eslint规则 2024-02-21 09:42:49 +08:00
dearlin 480013c3d2 地图上报警信息 2024-02-21 09:04:28 +08:00
LiuJiaNan 6b17aa7db0 BI 2024-02-20 14:57:09 +08:00
zhangyanli 847b82afbf 隐患查看报错 2024-02-20 13:51:01 +08:00
zhangyanli a42da670f0 查看隐患信息报错 2024-02-20 11:12:06 +08:00
dearlin 4a84899838 安全例会，14082bug 2024-02-20 08:39:01 +08:00
zhangyanli 9a6b2ea3a0 bug修复 2024-02-06 14:27:22 +08:00
fangjiakai aade1f3c01 Merge remote-tracking branch 'origin/dev' into dev 2024-02-05 09:28:04 +08:00
fangjiakai 4a56fab4d8 地图改为天地图 2024-02-05 09:27:49 +08:00
dearlin 07f2a683b5 清单排查 2024-02-04 17:00:00 +08:00
fangjiakai ecf918bc38 Merge remote-tracking branch 'origin/dev' into dev 2024-02-04 09:16:51 +08:00
fangjiakai 0a52cca78b 地图电子围栏 2024-02-04 09:16:40 +08:00
LiuJiaNan eb43ac1e95 init 2024-02-03 18:00:44 +08:00
LiuJiaNan 4ee2018f16 init 2024-02-03 14:07:23 +08:00
LiuJiaNan 2324d1110d init 2024-02-01 17:37:47 +08:00
zhangyanli e24a7c48aa 隐患排查清单 2024-02-01 15:35:37 +08:00
LiuJiaNan 632b540938 init 2024-02-01 08:21:01 +08:00
LiuJiaNan 6884d11144 init 2024-01-31 16:57:16 +08:00
LiuJiaNan 440a1bd252 init 2024-01-31 16:44:17 +08:00
LiuJiaNan 62798bee5f init 2024-01-31 15:38:40 +08:00