zhaoyu
|
32376c8a07
|
Merge remote-tracking branch 'origin/新动火作业1128' into 重点工程定位需求
# Conflicts:
# src/views/map/dialog/index.vue
|
2023-12-11 18:12:58 +08:00 |
|
zhaoyu
|
4e6e73c926
|
Merge branch '重点工程视频bug修复' into 重点工程定位需求
|
2023-12-11 17:51:42 +08:00 |
|
zhaoyu
|
8e8baa2f6d
|
Merge branch 'liujun-2023-12-05-相关方需求变更' into 重点工程定位需求
|
2023-12-11 17:51:13 +08:00 |
|
zhaoyu
|
af4aeb0738
|
地图
|
2023-12-11 17:49:55 +08:00 |
|
zhaoyu
|
baac77a56b
|
Merge branch 'dev' into 重点工程定位需求
|
2023-12-11 10:42:45 +08:00 |
|
zhaoyu
|
33040e1000
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-11 10:42:15 +08:00 |
|
zhaoyu
|
bf6d999f85
|
Merge branch 'dev' into 重点工程定位需求
|
2023-12-11 10:41:31 +08:00 |
|
zhaoyu
|
ebc73a0f18
|
Merge branch 'main' into dev
|
2023-12-11 10:41:05 +08:00 |
 鲁洪霞
|
434c5bb39d
|
添加重点工程
|
2023-12-11 10:32:51 +08:00 |
|
zhaoyu
|
328e99740e
|
重点工程定位以及其他需求
|
2023-12-08 17:24:58 +08:00 |
 liujun
|
745788de65
|
历史bug修复
|
2023-12-07 15:02:00 +08:00 |
|
zhaoyu
|
b97ed67483
|
重点工程视频管理bug修复
|
2023-12-07 10:29:12 +08:00 |
|
liujun
|
97e824fcf4
|
相关方培训新增需求
|
2023-12-06 16:52:48 +08:00 |
|
liujun
|
9e9337d75d
|
相关方培训新增需求
|
2023-12-06 15:02:40 +08:00 |
limingyu
|
f1d7e0d096
|
Merge remote-tracking branch 'origin/dev' into 新动火作业1128
|
2023-11-30 14:15:46 +08:00 |
 liujianan
|
229b261a3f
|
修复下面图标连续点击不显示bug
|
2023-11-30 11:51:15 +08:00 |
|
limingyu
|
59d2e7c7cd
|
Merge branch 'dev' into 新动火作业1128
# Conflicts:
# src/views/map/dialog/index.vue
|
2023-11-30 08:59:19 +08:00 |
guoyuepeng
|
a00777acfd
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-29 17:58:52 +08:00 |
|
liujianan
|
c660bdb8e7
|
曹妃甸人员定位标记点更新之后移动
|
2023-11-29 17:50:20 +08:00 |
|
guoyuepeng
|
a0af117bdc
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-29 17:13:42 +08:00 |
 dearlin
|
b235e8f6e9
|
fix：人员信息定位弹窗展示字段
|
2023-11-29 17:09:04 +08:00 |
|
guoyuepeng
|
314a5e3123
|
1.无效字符
|
2023-11-29 16:25:43 +08:00 |
|
guoyuepeng
|
9fd7b1a261
|
1.新的地图标识
2.边界入侵不能播放修复
|
2023-11-29 16:07:04 +08:00 |
|
guoyuepeng
|
981ba47e84
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/views/keyprojects/platformelectronic/index.vue
|
2023-11-29 15:48:55 +08:00 |
|
dearlin
|
82de06b2d3
|
fix：平台栅栏视频无法定位得问题
|
2023-11-29 15:43:31 +08:00 |
|
guoyuepeng
|
d08d823145
|
1.九公司的四色图
2.电子围栏功能
|
2023-11-29 14:27:50 +08:00 |
|
liujianan
|
96967d7f61
|
曹妃甸人员定位标记点更新之后移动
|
2023-11-29 14:22:12 +08:00 |
|
liujianan
|
1f0dcf6f48
|
曹妃甸人员定位标记点更新之后移动
|
2023-11-29 14:20:38 +08:00 |
 zhangyue
|
26cc549201
|
人员定位展示页面
|
2023-11-29 10:52:09 +08:00 |
|
limingyu
|
f92c90a940
|
新动火作业和港务局一公司地图点位页面更新
|
2023-11-28 20:55:44 +08:00 |
|
zhangyue
|
5ca3e60ec3
|
一公司人员定位
|
2023-11-27 18:02:25 +08:00 |
|
zhangyue
|
abdc5a6b76
|
一公司人员定位
|
2023-11-27 14:39:14 +08:00 |
|
zhangyue
|
d8cceb3ed8
|
一公司人员定位
|
2023-11-25 15:24:22 +08:00 |
|
guoyuepeng
|
3589277fe3
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-23 16:59:29 +08:00 |
|
guoyuepeng
|
acb91f2bdf
|
1.修改BI的示意图
2.修改重点工程视频监控的播放时间,原5分钟后自动停止,现在注释,为消防演示做修改
3.修改视频平台列表的删除功能
|
2023-11-23 16:59:06 +08:00 |
|
zhaoyu
|
37283d3a7a
|
重点工程结束展示提示信息错误问题
|
2023-11-23 14:06:17 +08:00 |
|
dearlin
|
0560077fe9
|
fix：视频播放五分钟自动关闭。add：视频监控搜索条件
|
2023-11-23 11:33:35 +08:00 |
 guoyuepeng
|
ac317e5ac4
|
Merge pull request 'dev' (#3) from dev into main
Reviewed-on: #3
|
2023-11-23 09:10:22 +08:00 |
|
dearlin
|
7509986666
|
fix：ai报警数不正确
|
2023-11-22 20:03:53 +08:00 |
|
dearlin
|
f4dc266913
|
fix：返回按钮
|
2023-11-22 20:00:39 +08:00 |
|
dearlin
|
86bce751b7
|
fix：Ai报警包一层
|
2023-11-22 19:50:02 +08:00 |
|
dearlin
|
d443552760
|
fix： 去掉冗余的重点工程名称搜索框
|
2023-11-22 17:32:47 +08:00 |
|
dearlin
|
f0422a4ac4
|
fix： 补充处罚金额单位
|
2023-11-22 17:19:57 +08:00 |
|
dearlin
|
105f57205b
|
fix： 所有企业信息的行业类型显示不正确的bug修复
|
2023-11-22 16:45:52 +08:00 |
|
dearlin
|
4270d8e78f
|
fix： 重点工程视频监控外层新加字段
|
2023-11-22 16:14:15 +08:00 |
|
dearlin
|
52aaef9002
|
fix： 12797 隐患类型 选择"安全隐患"后 应该显示下面所有的隐患 选择“人的不安全因素” 显示下面的所有的隐患 注意其他搜索框
|
2023-11-17 10:53:51 +08:00 |
|
dearlin
|
5f703e5614
|
Merge branch 'dev' into yhkp
|
2023-11-16 16:57:57 +08:00 |
|
dearlin
|
77afd2507a
|
监管端,重点工程进入后。只有"秦港股份有限公司"这个企业可以新增。
|
2023-11-16 16:57:34 +08:00 |
|
dearlin
|
14a3556e27
|
Merge remote-tracking branch 'origin/dev' into yhkp
|
2023-11-16 09:08:00 +08:00 |
|
guoyuepeng
|
afc00331cd
|
Merge pull request 'BI根据客户提出的优化数据,中间的要对上' (#2) from gypdev into main
Reviewed-on: #2
|
2023-11-16 09:04:37 +08:00 |