 huangyuxuan
|
996c52dd8b
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-11-18 10:17:33 +08:00 |
|
huangyuxuan
|
3b503e6eac
|
[问题修复](pet):
注释人员数这一列
|
2024-11-18 10:17:24 +08:00 |
 shanao
|
4d3c07c9ca
|
Merge branch 'dev' into pet
|
2024-11-15 17:03:43 +08:00 |
|
shanao
|
ccea6bf39a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-11-14 10:34:06 +08:00 |
|
shanao
|
8d6a314800
|
【bug修改】
1. 添加隐患发现时间
2. 在考评过程，查看完隐患详情后点击“返回”，系统直接跳转到隐患列表的首页，缺少页面定位的功能
|
2024-11-14 10:33:41 +08:00 |
|
huangyuxuan
|
226ca88789
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-11-13 16:50:13 +08:00 |
|
huangyuxuan
|
08c1681ba3
|
[问题修复](pet):
修复相关方所有人员信息详情查看一直加载问题
|
2024-11-13 16:50:05 +08:00 |
guoyuepeng
|
4c6d4b7709
|
1.修改口门门禁系统的菜单
2.修改首页的人员定位统计
|
2024-11-12 10:50:48 +08:00 |
 liujun
|
b974030b5f
|
企业端人员定位优化
|
2024-11-01 17:50:31 +08:00 |
|
liujun
|
a3f070819a
|
Merge branch 'refs/heads/pet' into dev
|
2024-10-30 18:41:15 +08:00 |
1261008090@qq.com
|
c85d5a5466
|
优化人员定位标记点
|
2024-10-30 14:35:27 +08:00 |
|
liujun
|
3a4e8ceb98
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-28 13:57:56 +08:00 |
|
liujun
|
265a24170d
|
bug修复：监管端九公司人员定位系统不显示定位电
|
2024-10-28 13:57:41 +08:00 |
 fufeifei
|
d140f7b27b
|
1、风险分级管控系统中的：风险四色图、三人以上作业分布图、人员聚集分布图的三个前端页面
|
2024-10-24 17:17:38 +08:00 |
|
fufeifei
|
9f0703e91a
|
1、隐患重复次数统计,包含重复隐患图片的列表、每一个重复隐患图片的详情列表、每一个隐患信息的详情信息
|
2024-10-24 17:13:35 +08:00 |
|
shanao
|
dfd8d9289c
|
删除隐患的二次提示加上“删除隐患后，隐患相关的处罚信息也会删除”
|
2024-10-23 20:55:17 +08:00 |
|
huangyuxuan
|
80a3a92e7d
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-10-23 14:45:15 +08:00 |
|
huangyuxuan
|
d366785090
|
[新增功能](pet)
相关方人员校验
|
2024-10-23 14:45:03 +08:00 |
|
shanao
|
4dcae30533
|
优化缓存页面 修复缓存页面导致数据不一致的问题
|
2024-10-23 14:31:03 +08:00 |
|
shanao
|
999fbe52e5
|
Merge remote-tracking branch 'origin/pet' into 2024年9月9日shanao
|
2024-10-21 11:53:54 +08:00 |
|
huangyuxuan
|
7083c67619
|
[新增功能](hyx_2024-9-29_tongbu)
|
2024-10-21 11:53:23 +08:00 |
|
shanao
|
d43c03f1b1
|
Merge remote-tracking branch 'origin/pet' into 2024年9月9日shanao
|
2024-10-21 10:42:02 +08:00 |
|
huangyuxuan
|
6dbb0c3839
|
Merge branch 'refs/heads/hyx_2024-9-29_tongbu' into pet
|
2024-10-21 09:35:22 +08:00 |
|
shanao
|
f8cb7da6f7
|
11111
|
2024-10-19 17:35:10 +08:00 |
|
liujun
|
2c457a46e6
|
监管端点击待审批消息自动跳转至审批页面
|
2024-10-16 11:25:05 +08:00 |
|
shanao
|
ab28e7148d
|
11111
|
2024-10-15 18:14:18 +08:00 |
|
huangyuxuan
|
fa07a7fb58
|
[新增功能](hyx_2024-9-29_tongbu)
人员信息同步
证件信息管理列表
人员证件信息列表
|
2024-10-12 09:12:54 +08:00 |
 LiuJiaNan
|
5c7df2fe8d
|
地图四色图和边界单独控制
|
2024-09-14 10:30:15 +08:00 |
|
guoyuepeng
|
22fc0a5f81
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-09-13 18:49:54 +08:00 |
water_xu
|
67886be043
|
Merge branch 'refs/heads/pet' into dev
|
2024-09-13 18:44:23 +08:00 |
|
water_xu
|
c427a58f28
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-09-13 18:43:51 +08:00 |
|
guoyuepeng
|
87b9a20614
|
Merge branch 'pet' into dev
# Conflicts:
# src/views/map/index.vue
# src/views/map/js/dragentity.js
|
2024-09-13 18:28:37 +08:00 |
|
shanao
|
82a1792bda
|
Merge remote-tracking branch 'origin/2024年9月9日shanao' into dev
|
2024-09-13 17:53:16 +08:00 |
|
shanao
|
364bbe40cd
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-09-13 17:52:42 +08:00 |
|
shanao
|
e71c0b717f
|
Merge remote-tracking branch 'origin/2024年9月9日shanao' into pet
|
2024-09-13 17:52:13 +08:00 |
|
shanao
|
4fb73fab50
|
完成测试
|
2024-09-13 17:50:44 +08:00 |
|
LiuJiaNan
|
fe994efdda
|
地图四色图和边界单独控制
|
2024-09-13 08:51:38 +08:00 |
|
shanao
|
ce9d974e99
|
开发完成
|
2024-09-12 18:03:09 +08:00 |
|
water_xu
|
d526d97f4e
|
人员中台 - 去掉人员中台校验
|
2024-09-12 16:17:46 +08:00 |
|
water_xu
|
ae4f124223
|
人员中台bug修复 - 用户新增, 用户编辑, 校验去掉身份证号民族邮箱限制
|
2024-09-11 15:39:36 +08:00 |
|
shanao
|
5b483cbdf6
|
上传事故调查管理代码
|
2024-09-10 17:19:18 +08:00 |
|
liujun
|
c1800c43ad
|
九公司人员定位兼容杂货公司
|
2024-09-05 20:26:00 +08:00 |
|
liujun
|
f15ebbc735
|
九公司人员定位兼容杂货公司
|
2024-09-05 20:02:47 +08:00 |
|
water_xu
|
412f777fe4
|
Merge remote-tracking branch 'origin/pet' into dev
|
2024-09-05 18:39:14 +08:00 |
|
guoyuepeng
|
aaf496ca34
|
1.口门门禁
|
2024-09-05 18:37:31 +08:00 |
|
liujun
|
9f46d5a1e4
|
Merge branch 'liujun-2024-09-04-九公司人员定位' into dev
# Conflicts:
# src/views/map/index.vue
|
2024-09-05 18:34:33 +08:00 |
 fangjiakai
|
5733af5ba5
|
海康口门门禁地图显示
|
2024-09-05 17:27:47 +08:00 |
|
fangjiakai
|
8862295f29
|
海康口门门禁 摄像头地图显示
|
2024-09-05 17:25:39 +08:00 |
|
fangjiakai
|
e8f63e7d40
|
海康口门门禁地图显示
|
2024-09-05 16:45:05 +08:00 |
|
guoyuepeng
|
a9b9fe0b4f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-09-05 16:03:45 +08:00 |