Compare commits

..

No commits in common. "43cf540d8f1fc5390d86159da463c4d80094e03c" and "9d89e411306bc8c41a9173cb2611530d7d773365" have entirely different histories.

6 changed files with 21 additions and 1784 deletions

View File

@ -25,12 +25,12 @@ export default class ViewLeftComponent extends Vue {
treeData = treeData; treeData = treeData;
viewList = [ viewList = [
{ {
id: '1', id: Mock.mock("@id"),
title: '北大门东区→南大门西区', title: '北大门东区→南大门西区',
from: '北大门东区', from: '北大门东区',
to: '南大门西区' to: '南大门西区'
}, { }, {
id: '2', id: Mock.mock("@id"),
title: '南大门东区→北大门西区', title: '南大门东区→北大门西区',
from: '南大门东区', from: '南大门东区',
to: '北大门西区' to: '北大门西区'

File diff suppressed because it is too large Load Diff

View File

@ -1,27 +1,23 @@
export default [[ export default [[
11661118.72, 13312554.24,
3692382.4, 4098441.2800000003,
0 0.4
],[ ],[
11661186.56, 13313066.24,
3692696.64, 4098892.48,
0 0.476328125
],[ ],[
11660930.56, 13313446.4,
3692642.88, 4098451.52,
3.583046875 0.4000390625
],[ ],[
11660729.6, 13312994.56,
3692633.2800000003, 4098064.96,
3.5830078125 0.3999609375
],[ ],[
11660718.08, 13312628.48,
3692349.12, 4098448.3200000003,
0 0.39998046875
],[
11660874.24,
3692352.3200000003,
-0.0000390625
] ]
] ]

View File

@ -10,7 +10,6 @@ import boundsData from "@/mock/bounds"
import ParkFileService from '@/service/park.service'; import ParkFileService from '@/service/park.service';
import CloseService from '@/service/close.service'; import CloseService from '@/service/close.service';
import * as turf from "@turf/turf" import * as turf from "@turf/turf"
import path from '@/mock/path';
@Component({ @Component({
template, template,
@ -26,7 +25,6 @@ export default class BaseComponent extends Vue {
public layerData = layerData; public layerData = layerData;
public lock = true; public lock = true;
public tourPathData = path;
public timerList = {} as any; public timerList = {} as any;
public pakFilePath = "@path:DTS_Library_V5.4.pak"; public pakFilePath = "@path:DTS_Library_V5.4.pak";
@ -61,7 +59,7 @@ export default class BaseComponent extends Vue {
// 添加电子围栏 // 安全线 // 实控线 // 规划线 // 添加电子围栏 // 安全线 // 实控线 // 规划线
public async toggleArea(layer){ public async toggleArea(layer){
if(!layer.ids.length){ if(!layer.ids.length){
const result = layer.data.map(item=>{ const result = this.dataList[layer.value].map(item=>{
return { return {
id:item.id, id:item.id,
groupId:layer.value, groupId:layer.value,

View File

@ -1,6 +1,6 @@
<div class="overview-container"> <div class="overview-container">
<MapComponent id="map" @onLoaded="getMap" @onHandleChange="handleChange"></MapComponent> <!-- <MapComponent id="map" @onLoaded="getMap" @onHandleChange="handleChange"></MapComponent>-->
<div class="bg-box left animate__animated"> <div class="bg-box left animate__animated">
<div class="panel-container"> <div class="panel-container">

View File

@ -57,8 +57,6 @@ export default class OverViewComponent extends BaseComponent {
this.player = store; this.player = store;
this.lock = false this.lock = false
this.resetMap(); this.resetMap();
this.player.api.cameraTour.delete("1");
this.player.api.cameraTour.delete("2");
this.player.api.customObject.clear(); this.player.api.customObject.clear();
this.player.api.polygon3d.clear(); this.player.api.polygon3d.clear();
this.player.api.marker.clear(); this.player.api.marker.clear();
@ -67,7 +65,6 @@ export default class OverViewComponent extends BaseComponent {
this.player.api.polyline.clear(); this.player.api.polyline.clear();
this.player.api.heatmap.clear(); this.player.api.heatmap.clear();
this.currentLayers = this.getCurrentLayers(); this.currentLayers = this.getCurrentLayers();
this.player.api.cameraTour.add(this.tourPathData)
} }
@ -121,7 +118,7 @@ export default class OverViewComponent extends BaseComponent {
this.hideAllPanel = !this.hideAllPanel; this.hideAllPanel = !this.hideAllPanel;
this.drawerChange(!this.hideAllPanel) this.drawerChange(!this.hideAllPanel)
if(!this.hideAllPanel){ if(!this.hideAllPanel){
this.player.api.cameraTour.stop();
this.player.api.settings.setInteractiveMode(0) this.player.api.settings.setInteractiveMode(0)
} }
} }
@ -138,8 +135,6 @@ export default class OverViewComponent extends BaseComponent {
layer.selected = !layer.selected; layer.selected = !layer.selected;
if(layer.type === "moveMarker"){ if(layer.type === "moveMarker"){
this.addMarker(layer,true) this.addMarker(layer,true)
}else{
this.toggleArea(layer)
} }
} }
//进入自由导览 //进入自由导览
@ -210,7 +205,7 @@ export default class OverViewComponent extends BaseComponent {
//进入路线导览 //进入路线导览
playView(item){ playView(item){
this.toggleAllPanel() this.toggleAllPanel()
this.player.api.cameraTour.play(item.id) console.log('进入路线导览',item)
} }
deactivated(){ deactivated(){