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

255 Commits (c33eaadd6355f774df30cf1535c37c2d2635949b)

Author SHA1 Message Date
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
LiuJiaNan 939817eff8 取消三项制度库代理 2024-02-27 16:02:06 +08:00
LiuJiaNan d50245b985 logo 2024-02-27 12:00:42 +08:00
fangjiakai 5122d11abb Merge remote-tracking branch 'origin/dev' into dev 2024-02-27 10:47:15 +08:00
fangjiakai 848b623cf3 三项制度库代理 2024-02-27 10:47:03 +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
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
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