Compare commits

..

No commits in common. "2a21bcb586034afb22ad3421df1b9113802014ee" and "0b99f0ece9c3d82a1cfe902d05888fa97bcf5ca9" have entirely different histories.

8 changed files with 436 additions and 794 deletions

Binary file not shown.

View File

@ -18,18 +18,14 @@
<img :src="item.img" alt=""> <img :src="item.img" alt="">
<div> <div>
<p>{{ item.title }}</p> <p>{{ item.title }}</p>
<div v-show="item.rate" class="d-flex align-items-center right-sub-text"> <div class="d-flex align-items-center right-sub-text">
<span>难度:</span> <span>难度:</span>
<el-rate disabled v-model="item.rate" :max="5"></el-rate> <el-rate disabled v-model="item.rate" :max="5"></el-rate>
</div> </div>
<div v-show="item.rate" class="d-flex align-items-center right-sub-text"> <div class="d-flex align-items-center right-sub-text">
<span>火点:</span> <span>火点:</span>
<span>{{ item.point }}个</span> <span>{{ item.point }}个</span>
</div> </div>
<div v-show="item.idx" class="d-flex align-items-center right-sub-text">
<span>点位:</span>
<span>{{ item.idx }}</span>
</div>
</div> </div>
</div> </div>

File diff suppressed because it is too large Load Diff

View File

@ -65,27 +65,4 @@ export default [ {
scale:[0,0,0], scale:[0,0,0],
selected:false, selected:false,
pages:["home","view"] pages:["home","view"]
},{
name:"视频监控",
ids:[] as string[],
type:"moveMarker",
urls:[
"@path:1.png",
"@path:2.png",
"@path:3.png",
"@path:4.png",
"@path:5.png",
"@path:6.png",
"@path:7.png",
"@path:8.png",
"@path:9.png",
],
init:async ()=>{
return await service.getCameraList()
},
scale:[0,0,0],
value:"video" ,
selected:false,
hasPop:true,
pages:["view"]
}] }]

View File

@ -1855,222 +1855,6 @@ export const treeData = [
img: require('@/assets/img/view/氮气泄露.png'), img: require('@/assets/img/view/氮气泄露.png'),
content: '氮气泄露。', content: '氮气泄露。',
mainPoint: "氮气泄露。" mainPoint: "氮气泄露。"
},{
id: Mock.mock("@id"),
idx:1,
title: '罐车无泄露罐体无霜冻',
look:[
11661038.66375,
3692474.989844,
10.775087,
0,
-34.737137,
63.712109,
2
],
position: [
11661043.200000001,
3692464.3200000003,
1
],
needFocus:true,
distance:3,
type:'video',
img: require('@/assets/img/view/槽罐车侧壁泄露.png'),
content: '罐车无泄露罐体无霜冻。',
mainPoint: "罐车无泄露罐体无霜冻。"
},{
id: Mock.mock("@id"),
idx:2,
title: '罐车无泄露罐体有霜冻',
look:[
11661036.226719,
3692473.52625,
10.775087,
0,
-34.737137,
63.712109,
2
],
position: [
11661043.200000001,
3692464.3200000003,
3.2007153320312502
],
needFocus:true,
distance:3,
type:'video',
img: require('@/assets/img/view/槽罐车侧壁泄露.png'),
content: '罐车无泄露罐体有霜冻。',
mainPoint: "罐车无泄露罐体有霜冻。"
},{
id: Mock.mock("@id"),
idx:3,
title: '罐车垂直倾翻未泄漏',
look:[
11661037.976563,
3692466.9175,
8.837294,
0,
-47.400764,
63.71207,
2
],
position: [
11661043.200000001,
3692464.3200000003,
3.2007153320312502
],
needFocus:true,
distance:3,
type:'video',
img: require('@/assets/img/view/槽罐车侧壁泄露.png'),
content: '罐车垂直倾翻未泄漏。',
mainPoint: "罐车垂直倾翻未泄漏。"
},{
id: Mock.mock("@id"),
idx:4,
title: '罐车安全阀泄露',
look:[
11661030.209375,
3692459.952187,
5.805962,
0,
-27.080067,
-20.37447,
2
],
position: [
11661043.200000001,
3692464.3200000003,
3.2007153320312502
],
needFocus:true,
distance:3,
type:'video',
img: require('@/assets/img/view/槽罐车侧壁泄露.png'),
content: '罐车垂直倾翻未泄漏。',
mainPoint: "罐车垂直倾翻未泄漏。"
},{
id: Mock.mock("@id"),
title: '罐车管线阀门泄露',
look:[
11661030.209375,
3692459.952187,
5.805962,
0,
-27.080067,
-20.37447,
2
],
position: [
11661043.200000001,
3692464.3200000003,
3.2007153320312502
],
needFocus:true,
distance:3,
idx:5,
type:'video',
img: require('@/assets/img/view/槽罐车侧壁泄露.png'),
content: '罐车垂直倾翻未泄漏。',
mainPoint: "罐车垂直倾翻未泄漏。"
},{
id: Mock.mock("@id"),
title: '罐车泄露灾情异常',
look:[
11661029.610625,
3692467.293906,
12.065425,
0,
-39.69001,
33.82233,
2
],
position: [
11661043.200000001,
3692464.3200000003,
3.2007153320312502
],
needFocus:true,
distance:3,
idx:6,
type:'video',
img: require('@/assets/img/view/槽罐车侧壁泄露.png'),
content: '罐车垂直倾翻未泄漏。',
mainPoint: "罐车垂直倾翻未泄漏。"
},{
id: Mock.mock("@id"),
title: '槽车火灾处置',
look:[
11661029,
3692466.315,
11.264197,
0,
-37.605675,
23.234461,
2
],
position: [
11661043.200000001,
3692464.3200000003,
3.2007153320312502
],
needFocus:true,
distance:3,
idx:7,
type:'video',
img: require('@/assets/img/view/槽罐车侧壁泄露.png'),
content: '罐车垂直倾翻未泄漏。',
mainPoint: "罐车垂直倾翻未泄漏。"
},{
id: Mock.mock("@id"),
title: '操作箱阀门功能介绍',
look:[
11661026.115625,
3692465.86625,
9.601785,
0,
-21.406857,
20.658468,
2
],
position: [
11661043.200000001,
3692464.3200000003,
3.2007153320312502
],
needFocus:true,
distance:3,
idx:8,
type:'video',
img: require('@/assets/img/view/槽罐车侧壁泄露.png'),
content: '罐车垂直倾翻未泄漏。',
mainPoint: "罐车垂直倾翻未泄漏。"
},{
id: Mock.mock("@id"),
title: '罐体结构',
look:[
11661036.347656,
3692468.925391,
7.925199,
0,
-28.857199,
69.452904,
2
],
position: [
11661043.200000001,
3692464.3200000003,
3.2007153320312502
],
needFocus:true,
distance:3,
type:'video',
idx:9,
img: require('@/assets/img/view/槽罐车侧壁泄露.png'),
content: '罐车垂直倾翻未泄漏。',
mainPoint: "罐车垂直倾翻未泄漏。"
}, },
] ]

View File

@ -149,6 +149,7 @@ export default class BaseComponent extends Vue {
public async addMarker(layer,trackCustom?){ public async addMarker(layer,trackCustom?){
if(!layer.ids.length){ if(!layer.ids.length){
const options = layer.data.map((item,index)=>{ const options = layer.data.map((item,index)=>{
const option = {} as any const option = {} as any
if(item.hasPop){ if(item.hasPop){
@ -161,7 +162,7 @@ export default class BaseComponent extends Vue {
coordinateType:layer.coordinateType?layer.coordinateType:0, coordinateType:layer.coordinateType?layer.coordinateType:0,
displayMode:2, displayMode:2,
imagePath:layer.url || layer.urls[item.type], imagePath:layer.url || layer.urls[item.type],
imageSize:item.model?[30,30]:[48,48], imageSize:[48,48],
popupSize:[480,388], popupSize:[480,388],
popupOffset:[50,0], popupOffset:[50,0],
autoHidePopupWindow:false, autoHidePopupWindow:false,

View File

@ -53,6 +53,7 @@ export default class OverViewComponent extends BaseComponent {
waringRightShow = false waringRightShow = false
//显示展示隐藏按钮 //显示展示隐藏按钮
showPlay = false showPlay = false
// 是否隐藏除地图外所有板块 // 是否隐藏除地图外所有板块
public hideAllPanel = false; public hideAllPanel = false;
public viewRightData = {}; public viewRightData = {};
@ -107,9 +108,6 @@ export default class OverViewComponent extends BaseComponent {
if(data.GroupID==="car"){ if(data.GroupID==="car"){
this.emitCarPop(currentData) this.emitCarPop(currentData)
} }
if(data.GroupID==="video"){
this.openVideo(currentData)
}
} }
} }
@ -287,7 +285,6 @@ export default class OverViewComponent extends BaseComponent {
} }
//右侧详情点击事件 //右侧详情点击事件
showDetail(item){ showDetail(item){
debugger
if(this.currentEvent){ if(this.currentEvent){
if(this.currentEvent.id === item.id){ if(this.currentEvent.id === item.id){
return return
@ -297,10 +294,6 @@ export default class OverViewComponent extends BaseComponent {
this.currentEvent = null; this.currentEvent = null;
} }
} }
if(item.type === 'video'){
const currentData = (this.layerData.find(item=>item.value === "video")as any).data.find(items=>items.remark === item.title)
this.openVideo(currentData)
}else{
if(!this.viewLayer[item.id]){ if(!this.viewLayer[item.id]){
const data = [] as any; const data = [] as any;
if(item.point>1){ if(item.point>1){
@ -340,8 +333,6 @@ export default class OverViewComponent extends BaseComponent {
} }
} }
this.addCustom(this.viewLayer[item.id],item.hasPop); this.addCustom(this.viewLayer[item.id],item.hasPop);
}
if(item.needFocus){ if(item.needFocus){
if(item.look){ if(item.look){
this.player.api.camera.lookAt( this.player.api.camera.lookAt(
@ -414,45 +405,6 @@ export default class OverViewComponent extends BaseComponent {
playAction(type){ playAction(type){
this.player.api.cameraTour[type]() this.player.api.cameraTour[type]()
} }
// 打开摄像头
openVideo(item){
this.resetMap();
setTimeout(()=>{
// this.player.api.marker.focus(item.id,20,2)
if(item.model === 'video'){
setTimeout(()=>{
layer.open({
type:1,
shade:0,
title:item.remark,
content:`<div class="customClass">
<video src="${item.info}" controls style="width:100%" autoplay></video>
</div>`
})
},2000)
}else{
setTimeout(()=>{
layer.open({
type:1,
shade:0,
title:item.remark,
content:`<div class="customClass"><div
style="
background: #0000008c;
color: #ffffff;
font-size: 12px;
padding: 10px;
line-height: 2;
white-space: pre-wrap;
"
>${item.info}</div></div>`
})
},2000)
}
},1000)
}
deactivated(){ deactivated(){
// //
} }