diff --git a/src/assets/style/pageCommon.component.scss b/src/assets/style/pageCommon.component.scss index a475689..4c553d2 100644 --- a/src/assets/style/pageCommon.component.scss +++ b/src/assets/style/pageCommon.component.scss @@ -3115,3 +3115,7 @@ svg.loading-icon { } } } +.close-style{ + font-size: 14px; + cursor: pointer; +} diff --git a/src/components/view/right/viewRight.component.html b/src/components/view/right/viewRight.component.html index a8edfa4..d64f2cf 100644 --- a/src/components/view/right/viewRight.component.html +++ b/src/components/view/right/viewRight.component.html @@ -1,7 +1,8 @@
-
- {{viewRightData.label}} +
+ {{viewRightData.label}} + 关闭

训练内容

@@ -10,8 +11,9 @@

模拟火情

- - + +

{{item.title}}

diff --git a/src/components/view/right/viewRight.component.ts b/src/components/view/right/viewRight.component.ts index 678455e..570f424 100644 --- a/src/components/view/right/viewRight.component.ts +++ b/src/components/view/right/viewRight.component.ts @@ -25,6 +25,11 @@ export default class ViewRightComponent extends Vue { showDetail(item){ // } + //关闭右侧 + @Emit('closeRight') + closeRight(item){ + // + } mounted() { diff --git a/src/mock/treeData.ts b/src/mock/treeData.ts index bb0f3b1..5572f45 100644 --- a/src/mock/treeData.ts +++ b/src/mock/treeData.ts @@ -1,5 +1,8 @@ +const img1 = require('@/assets/img/view/fire.png') +const img2 = require('@/assets/img/view/fire2.png') import Mock from "mockjs" + export const treeData = [ { id: Mock.mock("@id"), @@ -18,7 +21,9 @@ export const treeData = [ 3692443.52, 67.69076171875 ], + img:img1, content: '模拟在密闭建筑物内发生火灾,消防员在高温、浓烟、高噪音的情况下进行火情侦察,寻找被困人员,救出被困人员,灭火抢险等战斗', + mainPoint:"模拟在密闭建筑物内发生火灾,消防员在高温、浓烟、高噪音的情况下进行火情侦察,寻找被困人员,救出被困人员,灭火抢险等战斗" }, { id: Mock.mock("@id"), rate: 2, @@ -29,6 +34,7 @@ export const treeData = [ 3692452.8000000003, 21.751074218750002 ], + img:img2, content: '模拟在密闭建筑物内发生火灾,消防员在高温、浓烟、高噪音的情况下进行火情侦察,寻找被困人员,救出被困人员,灭火抢险等战斗', mainPoint:"模拟在密闭建筑物内发生火灾,消防员在高温、浓烟、高噪音的情况下进行火情侦察,寻找被困人员,救出被困人员,灭火抢险等战斗" }, { @@ -49,6 +55,7 @@ export const treeData = [ 3692580.8000000003, 21.94720703125 ]], + img:img1, content: '模拟在密闭建筑物内发生火灾,消防员在高温、浓烟、高噪音的情况下进行火情侦察,寻找被困人员,救出被困人员,灭火抢险等战斗', mainPoint:"模拟在密闭建筑物内发生火灾,消防员在高温、浓烟、高噪音的情况下进行火情侦察,寻找被困人员,救出被困人员,灭火抢险等战斗" }, { @@ -61,6 +68,7 @@ export const treeData = [ 3692514.24, 13.2171923828125 ], + img:img2, content: '模拟在密闭建筑物内发生火灾,消防员在高温、浓烟、高噪音的情况下进行火情侦察,寻找被困人员,救出被困人员,灭火抢险等战斗', mainPoint:"模拟在密闭建筑物内发生火灾,消防员在高温、浓烟、高噪音的情况下进行火情侦察,寻找被困人员,救出被困人员,灭火抢险等战斗" }, { @@ -73,6 +81,7 @@ export const treeData = [ 3692601.6, 2.3062506103515625 ], + img:img1, content: '模拟在密闭建筑物内发生火灾,消防员在高温、浓烟、高噪音的情况下进行火情侦察,寻找被困人员,救出被困人员,灭火抢险等战斗', mainPoint:"模拟在密闭建筑物内发生火灾,消防员在高温、浓烟、高噪音的情况下进行火情侦察,寻找被困人员,救出被困人员,灭火抢险等战斗" } @@ -100,7 +109,8 @@ export const treeData = [ 11660769.28, 3692443.52, 67.69076171875 - ] + ], + img:img1, }, { id: Mock.mock("@id"), rate: 2, @@ -110,7 +120,8 @@ export const treeData = [ 11660674.56, 3692452.8000000003, 21.751074218750002 - ] + ], + img:img2, }, { id: Mock.mock("@id"), rate: 4, @@ -128,7 +139,8 @@ export const treeData = [ 11660860.16, 3692580.8000000003, 21.94720703125 - ]] + ]], + img:img1, }, { id: Mock.mock("@id"), rate: 3, @@ -138,7 +150,8 @@ export const treeData = [ 11661059.84, 3692514.24, 13.2171923828125 - ] + ], + img:img2 }, { id: Mock.mock("@id"), rate: 4, @@ -148,13 +161,9 @@ export const treeData = [ 11661043.200000001, 3692599.68, 9.2683056640625 - ] - }, { - id: Mock.mock("@id"), - rate: 2, - title: '顶层沸溢火', - point: '5', - }, + ], + img:img1, + } ] }, children: [] @@ -172,7 +181,8 @@ export const treeData = [ 11660769.28, 3692443.52, 67.69076171875 - ] + ], + img:img1, }, { id: Mock.mock("@id"), rate: 2, @@ -182,7 +192,8 @@ export const treeData = [ 11660674.56, 3692452.8000000003, 21.751074218750002 - ] + ], + img:img2, }, { id: Mock.mock("@id"), rate: 4, @@ -200,7 +211,8 @@ export const treeData = [ 11660860.16, 3692580.8000000003, 21.94720703125 - ]] + ]], + img:img1, }, { id: Mock.mock("@id"), rate: 3, @@ -210,7 +222,8 @@ export const treeData = [ 11661059.84, 3692514.24, 13.2171923828125 - ] + ], + img:img2, }, { id: Mock.mock("@id"), rate: 4, @@ -220,13 +233,9 @@ export const treeData = [ 11661043.200000001, 3692599.68, 9.2683056640625 - ] - }, { - id: Mock.mock("@id"), - rate: 2, - title: '顶层沸溢火', - point: '5', - }, + ], + img:img1, + } ] }, children: [] @@ -248,7 +257,8 @@ export const treeData = [ 11660769.28, 3692443.52, 67.69076171875 - ] + ], + img:img1 }, { id: Mock.mock("@id"), rate: 2, @@ -258,7 +268,8 @@ export const treeData = [ 11660674.56, 3692452.8000000003, 21.751074218750002 - ] + ], + img:img2 }, { id: Mock.mock("@id"), rate: 4, @@ -276,7 +287,8 @@ export const treeData = [ 11660860.16, 3692580.8000000003, 21.94720703125 - ]] + ]], + img:img1 }, { id: Mock.mock("@id"), rate: 3, @@ -286,7 +298,8 @@ export const treeData = [ 11661059.84, 3692514.24, 13.2171923828125 - ] + ], + img:img2 }, { id: Mock.mock("@id"), rate: 4, @@ -296,7 +309,8 @@ export const treeData = [ 11661043.200000001, 3692599.68, 9.2683056640625 - ] + ], + img:img1 }, ] }, diff --git a/src/views/overview.component.html b/src/views/overview.component.html index db900e6..760a895 100644 --- a/src/views/overview.component.html +++ b/src/views/overview.component.html @@ -1,6 +1,6 @@
- +
@@ -19,7 +19,7 @@ - +
diff --git a/src/views/overview.component.ts b/src/views/overview.component.ts index efe3643..3e22703 100644 --- a/src/views/overview.component.ts +++ b/src/views/overview.component.ts @@ -207,7 +207,7 @@ export default class OverViewComponent extends BaseComponent { urls:[], ids:[], data, - + } } this.addCustom(this.viewLayer[item.id],true); @@ -248,6 +248,10 @@ export default class OverViewComponent extends BaseComponent { console.log(item) this.player.api.cameraTour.play(item.id) } + closeRight(){ + this.viewRightShow = false + console.log('关闭右侧') + } deactivated(){ console.log(123)