 liujun
|
23aa4ca7f7
|
Merge remote-tracking branch 'origin/dev' into 5_7_地图同步
# Conflicts:
# src/views/map/dialog/index.vue
# src/views/map/index.vue
|
2024-05-20 20:31:16 +08:00 |
|
liujun
|
962b9ec6d0
|
Merge remote-tracking branch 'origin/pet' into dev
|
2024-05-20 18:10:45 +08:00 |
|
liujun
|
83a324ee44
|
代码回滚调整
|
2024-05-20 18:05:34 +08:00 |
limingyu
|
25bbff74f0
|
Merge branch 'limingyu-20240520-一公司门口门禁地图' into pet
|
2024-05-20 16:51:43 +08:00 |
|
liujun
|
80df79c653
|
修改在线人员数bug修复
|
2024-05-20 16:08:39 +08:00 |
|
limingyu
|
93ffe2b5af
|
一公司门口门禁地图人员点位详情显示
|
2024-05-20 14:46:11 +08:00 |
|
liujun
|
ece26192aa
|
九公司定位系统配置文件更新
|
2024-05-20 13:51:32 +08:00 |
|
limingyu
|
da01631b41
|
一公司监管端地图门口门禁展示改为和企业端一致
|
2024-05-20 13:44:46 +08:00 |
|
liujun
|
5266f99963
|
Merge remote-tracking branch 'origin/pet' into dev
|
2024-05-15 19:46:11 +08:00 |
|
liujun
|
77615123da
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-05-15 19:43:11 +08:00 |
|
liujun
|
0e56d36d7f
|
1、相关方部门自动展开
|
2024-05-15 19:42:36 +08:00 |
|
liujun
|
bf6076a1d1
|
Merge remote-tracking branch 'origin/pet' into dev
|
2024-05-15 19:10:52 +08:00 |
water_xu
|
19bd9b1ab2
|
重点工程隐患考评-分公司隐患考评页面去掉了重点工程安全环保奖惩的企业端和监管端的分类列，合并为一列。
|
2024-05-15 14:16:13 +08:00 |
|
liujun
|
5e6fca9a0e
|
正式环境配置更改
|
2024-05-15 13:52:37 +08:00 |
|
water_xu
|
723c46e581
|
Merge branch 'pet' of http://47.92.113.182:3000/guoyuepeng/qa-regulatory-gwj-vue into pet
|
2024-05-15 11:26:10 +08:00 |
|
water_xu
|
2db2046f6e
|
重点工程-处罚管理中删除了“处罚处理状态”无效字段
|
2024-05-15 11:25:20 +08:00 |
|
limingyu
|
f5053e2200
|
显示超期未动火，动火后未签字，但却有个时间
|
2024-05-15 11:00:49 +08:00 |
|
water_xu
|
1fc75b9d56
|
重点工程-重点工程页面下的所有子页面统一返回按钮
|
2024-05-14 18:43:46 +08:00 |
|
water_xu
|
ece75ce855
|
Merge branch 'pet' of http://47.92.113.182:3000/guoyuepeng/qa-regulatory-gwj-vue into pet
|
2024-05-13 14:16:41 +08:00 |
|
water_xu
|
11ad8664a2
|
重点工程-增加了处罚相关提示信息: AI报警的处罚人员为AI报警的处置人
|
2024-05-13 14:02:27 +08:00 |
|
liujun
|
6f3c8b28a6
|
Merge remote-tracking branch 'origin/dev' into 5_7_地图同步
# Conflicts:
# src/views/map/dialog/hotworkFirst.vue
# src/views/map/dialog/index.vue
# src/views/map/js/dragentity.js
|
2024-05-10 21:20:58 +08:00 |
|
liujun
|
fc2a1af041
|
1、定位系统端口更新
2、代码根式化
|
2024-05-10 18:57:43 +08:00 |
|
liujun
|
f6aedd2b1e
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-05-10 15:59:47 +08:00 |
|
liujun
|
e423427da5
|
15520 监管端数据保存到企业端后 查看监管端数据报错 注意三项库的每个菜单都看一下
|
2024-05-10 15:59:22 +08:00 |
|
limingyu
|
616b3d8833
|
15514 在线状态 加搜索框
|
2024-05-10 10:20:01 +08:00 |
|
water_xu
|
35869bc365
|
增加了集团单位：河北港口集团数联科技（雄安）有限公司
|
2024-05-09 16:55:09 +08:00 |
|
limingyu
|
dbce7ea493
|
15512 监管端查看一公司动火作业票详情 编号右对齐 参考企业端
|
2024-05-09 16:49:38 +08:00 |
|
limingyu
|
b9a46864b5
|
监管端消防安全统计新增是否标点
|
2024-05-09 15:17:33 +08:00 |
|
liujun
|
0fdb05467c
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-05-09 14:03:20 +08:00 |
|
liujun
|
00f7d7b2a6
|
隐藏三项制度库详情
|
2024-05-09 14:03:00 +08:00 |
|
water_xu
|
4a217da185
|
分公司下的重点工程的AI报警处置人改为分公司的人员
|
2024-05-09 10:17:26 +08:00 |
|
water_xu
|
36aa2d8f35
|
Merge branch 'pet' of http://47.92.113.182:3000/guoyuepeng/qa-regulatory-gwj-vue into pet
|
2024-05-08 18:19:07 +08:00 |
|
water_xu
|
ef6331cd78
|
增加了集团单位：河北港口集团数联科技（雄安）有限公司
|
2024-05-08 18:17:59 +08:00 |
|
limingyu
|
3af965e357
|
15490 这个类型是不要了吗 现在还有
|
2024-05-08 16:09:09 +08:00 |
 songwenxuan
|
d42c834bfd
|
沧州矿石、曹实业、曹煤炭地图同步
|
2024-05-07 15:28:48 +08:00 |
|
limingyu
|
2a064cbead
|
Merge branch 'limingyu-20240425-消防和重点工程更新' into pet
|
2024-05-07 11:52:00 +08:00 |
|
limingyu
|
f0133bdf2c
|
重点工程视频定位详情新增在线状态字段
|
2024-05-07 11:51:48 +08:00 |
|
limingyu
|
9aad2a8a8c
|
Merge branch 'limingyu-20240425-消防和重点工程更新' into pet
|
2024-05-07 11:06:39 +08:00 |
|
limingyu
|
bbfc67e0e6
|
重点工程管理和地图展示视频是否在线2
|
2024-05-07 10:53:26 +08:00 |
|
limingyu
|
cd1b89a4fa
|
重点工程管理和地图展示视频是否在线
|
2024-05-07 10:53:16 +08:00 |
|
liujun
|
fab4ff997b
|
三项制度页面精简
|
2024-05-06 11:52:17 +08:00 |
|
liujun
|
686e93eb7c
|
页面样式调整
|
2024-05-06 10:59:03 +08:00 |
|
limingyu
|
0c88ca43d7
|
Merge branch 'dev' into limingyu-20240425-消防和重点工程更新
|
2024-05-06 08:45:40 +08:00 |
guoyuepeng
|
61be80eca0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-04-30 11:49:52 +08:00 |
|
guoyuepeng
|
6656305cf7
|
1.删除不用的引用，优化第一次打开的时候慢的问题
|
2024-04-30 11:48:59 +08:00 |
|
liujun
|
640402eede
|
隐藏类型字段
|
2024-04-30 11:46:01 +08:00 |
|
liujun
|
7e6046ec0c
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-04-30 11:39:07 +08:00 |
|
liujun
|
a9e4a77107
|
1、删除无效字段
|
2024-04-30 11:37:03 +08:00 |
|
limingyu
|
a4605baf7e
|
Merge branch 'limingyu-20240416-一公司动火作业地图' into pet
|
2024-04-29 18:50:41 +08:00 |
|
guoyuepeng
|
9825bd63c5
|
1.曹煤炭的四色四固定显示
2.沧州矿石的倾斜摄影显示
|
2024-04-29 18:11:01 +08:00 |