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

249 Commits (3a29de326710e79dad5648adf3ddabe4ffdd7012)

Author SHA1 Message Date
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
WenShiJun 37f176bd1a 新增从业人员相关页面 2024-03-01 18:05:17 +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
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
WenShiJun a11e809c8c 安全通知功能优化 
新增运单登记列表页，添加页
 2024-02-28 19:30:39 +08:00
wangpeng 69cfc999a2 企业信息编辑 2024-02-28 16:45:10 +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
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
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