diff --git a/src/components/warningDetail.component.vue b/src/components/warningDetail.component.vue
index d58d5ff..59b8d8a 100644
--- a/src/components/warningDetail.component.vue
+++ b/src/components/warningDetail.component.vue
@@ -54,7 +54,7 @@
- 处理
+
diff --git a/src/mock/index.ts b/src/mock/index.ts
index 9201219..9b9f1cb 100644
--- a/src/mock/index.ts
+++ b/src/mock/index.ts
@@ -649,12 +649,12 @@ export class MockData{
public static getWaringList(){
/* {
- type:"fire",
+ type:"normal",
id:new Date().getTime()+"",
- typeName:"火灾",
+ typeName:"泄露",
position:[13312990.72, 4098613.12, 0.51],
reporter:"张三",
- content:"北京汉邦唐化工厂区发生火灾"
+ content:"北京汉邦唐化工厂区发生泄露"
}*/
const data = [
@@ -850,12 +850,12 @@ export class MockData{
public static getEventList(){
/* {
- type:"fire",
+ type:"normal",
id:new Date().getTime()+"",
- typeName:"火灾",
+ typeName:"泄露",
position:[13312990.72, 4098613.12, 0.51],
reporter:"张三",
- content:"北京汉邦唐化工厂区发生火灾"
+ content:"北京汉邦唐化工厂区发生泄露"
}*/
const data = [
@@ -871,15 +871,15 @@ export class MockData{
content:"物体高空坠落"
}
, {
- title: '火灾告警',
- info: '北京汉邦唐化工厂区发生火灾',
+ title: '罐体破裂',
+ info: '北京汉邦唐化工厂区发生泄露',
time: '2023年1月20日 14:33:33',
level: '1',
- type:"fire",
- typeName:"火灾",
+ type:"normal",
+ typeName:"泄露",
reporter:"李四",
tel:"13985412541",
- content:"北京汉邦唐化工厂区发生火灾"
+ content:"北京汉邦唐化工厂区发生泄露"
}, {
title: '坍塌事故',
info: '建筑坍塌及时处理',
@@ -901,34 +901,32 @@ export class MockData{
tel:"13337542569",
content:"NO气体泄露"
}, {
- title: '火灾爆炸',
- info: '富土康厂区火灾爆炸',
+ title: '罐体破裂',
+ info: '富土康厂区罐体破裂',
time: '2023年1月20日 14:33:33',
level: '2',
type:"normal",
- typeName:"火灾爆炸",
+ typeName:"罐体破裂",
reporter:"张三",
tel:"13337542569",
- content:"富土康厂区火灾爆炸"
+ content:"富土康厂区罐体破裂"
}, {
- title: '火灾爆炸',
- info: '北京汉邦唐化工厂区发生火灾',
+ title: '罐体破裂',
+ info: '北京汉邦唐化工厂区发生泄露',
time: '2023年1月20日 14:33:33',
level: '1',
- type:"fire",
- typeName:"火灾",
+ type:"normal",
+ typeName:"泄露",
reporter:"李四",
tel:"13985412541",
- content:"北京汉邦唐化工厂区发生火灾"
+ content:"北京汉邦唐化工厂区发生泄露"
},
].map((item:any)=>{
item.id = Mock.mock("@id");
if (item.type === 'normal'){
item.position=turf.randomPosition([
- 13312995.84,
- 4098177.2800000003,
- 13313096.96,
- 4098754.88,
+ 11660757, 3692398.75,
+ 11661124, 3692643.5
]);
}else if(item.type === 'fire'){
item.position= [13312990.72, 4098613.12, 0.51]
diff --git a/src/views/overview.component.html b/src/views/overview.component.html
index d4afe20..45b0fa6 100644
--- a/src/views/overview.component.html
+++ b/src/views/overview.component.html
@@ -1,29 +1,38 @@
+ v-for="(item,index) in currentLayers" :key="index">
@@ -44,11 +53,10 @@
-
-
+
退出自由导览
@@ -57,7 +65,7 @@
+ @onClose="closeCarPersonPop">
diff --git a/src/views/overview.component.ts b/src/views/overview.component.ts
index e2f77d7..1a5b3bf 100644
--- a/src/views/overview.component.ts
+++ b/src/views/overview.component.ts
@@ -213,7 +213,7 @@ export default class OverViewComponent extends BaseComponent {
//获取点击的信息
getItem(item) {
- // this.addWarnning(item)
+ this.addWarnning(item)
this.info = item
this.waringRightShow = true
}
@@ -224,6 +224,7 @@ export default class OverViewComponent extends BaseComponent {
//关闭告警详情
changeClose(){
this.waringRightShow = false
+ this.player.api.customObject.delete(this.currentWanning.id)
}
//进入自由导览
async showView (){