Compare commits

..

No commits in common. "25db0220d7964a165f7a6e5ac3e8881c73a48f1f" and "ed9d5af62dad43a7655a6c844eff122e21f7dd1f" have entirely different histories.

2 changed files with 717 additions and 85 deletions

View File

@ -359,7 +359,7 @@ export default [
}, },
{ {
id: '2', id: '2',
name: "path3", name: "path2",
from: '南大门东区', from: '南大门东区',
to: '北大门西区', to: '北大门西区',
keyFrames: [ keyFrames: [
@ -367,181 +367,815 @@ export default [
index: 0, index: 0,
time: 1, time: 1,
location: [ location: [
11660670.775156, 11660670.740781,
3692632.663789, 3692632.880801,
3.687361 3.127025,
], ],
rotation: [ rotation: [
-1.603564, 9.136949,
89.097595, 85.175476,
0 0
] ]
}, },
{ {
index: 1, index: 1,
time: 5, time: 3,
location: [ location: [
11660672.004531, 11660671.222656,
3692579.895508, 3692627.194102,
3.938437 3.127025,
], ],
rotation: [ rotation: [
-6.411935, 9.136949,
175.84407, 85.175476,
0 0
] ]
}, },
{ {
index: 2, index: 2,
time: 8, time: 5,
location: [ location: [
11660566.219844, 11660670.764062,
3692574.77332, 3692618.802266,
3.784138 3.127025,
], ],
rotation: [ rotation: [
-3.453746, 9.136949,
103.289703, 85.175476,
0 0
] ]
}, },
{ {
index: 3, index: 3,
time: 10, time: 7,
location: [ location: [
11660546.412812, 11660670.888906,
3692506.966353, 3692606.397305,
3.843261 3.354991,
], ],
rotation: [ rotation: [
-4.585734, 4.749877,
3.053582, 86.737427,
0 0
] ]
}, },
{ {
index: 4, index: 4,
time: 13, time: 9,
location: [ location: [
11660598.649062, 11660671.392812,
3692506.240205, 3692596.282939,
3.974243 3.752051,
], ],
rotation: [ rotation: [
-7.100555, -2.84002,
82.652985, 90.68222,
0 0.000001
] ]
}, },
{ {
index: 5, index: 5,
time: 15, time: 11,
location: [ location: [
11660603.178437, 11660671.229062,
3692467.967673, 3692582.293896,
3.991567 3.752051,
], ],
rotation: [ rotation: [
-7.434114, -2.84002,
50.865936, 90.68222,
0 0.000001
] ]
}, },
{ {
index: 6, index: 6,
time: 17, time: 13,
location: [ location: [
11660632.262813, 11660666.722188,
3692425.033324, 3692578.995391,
3.752879 4.041567,
], ],
rotation: [ rotation: [
-2.855839, -8.398236,
-0.876668, 176.129883,
0 0
] ]
}, },
{ {
index: 7, index: 7,
time: 19, time: 14,
location: [ location: [
11660705.369531, 11660656.932187,
3692424.296892, 3692578.291191,
3.243782, 4.041567,
], ],
rotation: [ rotation: [
6.88494, -8.398236,
-56.970181, 175.779892,
0 0
] ]
}, },
{ {
index: 8, index: 8,
time: 21, time: 15,
location: [ location: [
11660736.325156, 11660648.183438,
3692471.440234, 3692577.065732,
3.319741 3.940295,
], ],
rotation: [ rotation: [
5.425766, -6.447644,
-92.833725, 174.294144,
0 0
] ]
}, },
{ {
index: 9, index: 9,
time: 23, time: 16,
location: [ location: [
11660731.05375, 11660667.012969,
3692523.998013, 3692577.619297,
3.057763 4.061917,
], ],
rotation: [ rotation: [
10.479408, -8.7913,
1.40215, -179.755005,
0 0
] ]
}, },
{ {
index: 10, index: 10,
time: 26, time: 17,
location: [ location: [
11660798.06625, 11660657.198125,
3692521.90978, 3692577.535967,
3.343354 4.08279,
], ],
rotation: [ rotation: [
6.93148, -9.194902,
-85.549675, 177.439972,
0 0
] ]
}, },
{ {
index: 11, index: 11,
time: 29, time: 18,
location: [ location: [
11660798.476094, 11660644.990312,
3692553.860889, 3692576.905293,
3.814992 4.091832,
], ],
rotation: [ rotation: [
-2.093508, -9.369899,
-8.107742, 176.915039,
0 0
] ]
}, },
{ {
index: 12, index: 12,
time: 32, time: 20,
location: [ location: [
11661029.977187, 11660634.06875,
3692586.668604, 3692576.414043,
3.65193 4.054678,
], ],
rotation: [ rotation: [
1.021263, -8.651445,
91.970299, 177.614975,
0
]
},
{
index: 13,
time: 22,
location: [
11660622.824844,
3692575.945547,
4.054678,
],
rotation: [
-8.651445,
177.614975,
0
]
},
{
index: 14,
time: 24,
location: [
11660613.800156,
3692575.324268,
4.193837,
],
rotation: [
-11.350435,
175.299332,
0
]
},
{
index: 15,
time: 25,
location: [
11660602.522813,
3692574.245957,
4.256578,
],
rotation: [
-12.57534,
174.266434,
0
]
},
{
index: 16,
time: 26,
location: [
11660593.07625,
3692573.320469,
4.256578,
],
rotation: [
-12.575334,
174.616409,
0
]
},
{
index: 17,
time: 27,
location: [
11660581.844531,
3692572.665303,
4.247633,
],
rotation: [
-12.400337,
179.515945,
0
]
},
{
index: 18,
time: 28,
location: [
11660570.278906,
3692572.797822,
4.171051,
],
rotation: [
-10.906917,
173.783936,
0
]
},
{
index: 19,
time: 29,
location: [
11660554.936875,
3692571.448604,
4.090988,
],
rotation: [
-9.353561,
175.248123,
0
]
},
{
index: 20,
time: 30,
location: [
11660551.905781,
3692565.517979,
4.170021,
],
rotation: [
-10.886884,
92.756378,
0.000001
]
},
{
index: 21,
time: 31,
location: [
11660550.084219,
3692553.294951,
4.185872,
],
rotation: [
-11.195335,
99.740524,
0
]
},
{
index: 22,
time: 33,
location: [
11660546.998594,
3692542.922686,
4.179114,
],
rotation: [
-11.063786,
108.856491,
0
]
}, {
index: 23,
time: 35,
location: [
11660543.360469,
3692532.272354,
4.179114,
],
rotation: [
-11.063786,
108.856506,
0
]
}, {
index: 24,
time: 37,
location: [
11660539.395,
3692521.215908,
4.25884,
],
rotation: [
-12.619594,
106.982834,
0
]
}, {
index: 25,
time: 39,
location: [
11660543.691875,
3692516.218154,
4.145279,
],
rotation: [
-10.406066,
29.377287,
0
]
}, {
index: 26,
time: 41,
location: [
11660553.000156,
3692510.203154,
4.125058,
],
rotation: [
-10.013658,
34.480797,
0
]
}, {
index: 27,
time: 43,
location: [
11660564.894063,
3692505.506367,
4.209814,
],
rotation: [
-11.661844,
16.261494,
0
]
}, {
index: 28,
time: 45,
location: [
11660573.193437,
3692503.453965,
4.264827,
],
rotation: [
-12.736793,
12.64703,
0
]
}, {
index: 29,
time: 47,
location: [
11660584.931719,
3692500.787241,
4.166767,
],
rotation: [
-10.823616,
12.532805,
0
]
}, {
index: 30,
time: 49,
location: [
11660593.923438,
3692498.790142,
4.166767,
],
rotation: [
-10.823616,
12.532805,
0
]
}, {
index: 31,
time: 51,
location: [
11660596.248125,
3692501.065073,
4.053045,
],
rotation: [
-8.619889,
79.279755,
0
]
}, {
index: 32,
time: 53,
location: [
11660597.798906,
3692492.971514,
4.20113,
],
rotation: [
-11.49253,
80.113937,
0
]
}, {
index: 33,
time: 55,
location: [
11660600.048594,
3692481.620784,
4.192148,
],
rotation: [
-11.317534,
78.342453,
0
]
}, {
index: 34,
time: 57,
location: [
11660603.281094,
3692470.852554,
4.210106,
],
rotation: [
-11.66752,
70.64328,
0
]
}, {
index: 35,
time: 59,
location: [
11660611.347969,
3692455.716505,
4.370997,
],
rotation: [
-14.824706,
60.972725,
0
]
}, {
index: 36,
time: 61,
location: [
11660617.623437,
3692444.875519,
4.256904,
],
rotation: [
-12.581699,
59.958115,
0
]
}, {
index: 37,
time: 63,
location: [
11660627.586406,
3692433.397674,
4.276016,
],
rotation: [
-12.955967,
47.58165,
0
]
}, {
index: 38,
time: 65,
location: [
11660636.393594,
3692425.429579,
4.284942,
],
rotation: [
-13.130956,
38.642227,
0.000001
]
}, {
index: 39,
time: 67,
location: [
11660635.752031,
3692423.791576,
4.250269,
],
rotation: [
-12.451892,
3.647849,
0.000001
]
}, {
index: 40,
time: 69,
location: [
11660647.43625,
3692422.941058,
4.180039,
],
rotation: [
-11.08179,
4.842956,
0
]
}, {
index: 41,
time: 71,
location: [
11660658.342813,
3692422.167609,
4.189028,
],
rotation: [
-11.25678,
2.393199,
0
]
}, {
index: 42,
time: 73,
location: [
11660669.257344,
3692422.048618,
4.101276,
],
rotation: [
-9.552756,
1.611536,
0
]
}, {
index: 43,
time: 75,
location: [
11660691.083906,
3692421.110505,
4.173402,
],
rotation: [
-10.952638,
2.661431,
0
]
}, {
index: 44,
time: 77,
location: [
11660691.4525,
3692419.565559,
4.231043,
],
rotation: [
-12.076129,
-28.686462,
0
]
}, {
index: 45,
time: 79,
location: [
11660705.247344,
3692426.056486,
4.275706,
],
rotation: [
-12.949895,
-24.474127,
0
]
}, {
index: 46,
time: 81,
location: [
11660706.372969,
3692424.767888,
4.230984,
],
rotation: [
-12.074982,
-58.44434,
0
]
}, {
index: 47,
time: 83,
location: [
11660731.415781,
3692462.791628,
4.328205,
],
rotation: [
-13.980905,
-56.687111,
0
]
}, {
index: 48,
time: 85,
location: [
11660736.053125,
3692474.863635,
4.407937,
],
rotation: [
-15.555748,
-85.222366,
0
]
}, {
index: 49,
time: 85,
location: [
11660734.78875,
3692518.581445,
4.583296,
],
rotation: [
-19.064287,
-94.857338,
-0.000002
]
}, {
index: 50,
time: 87,
location: [
11660731.608125,
3692521.408389,
4.19794,
],
rotation: [
-11.430368,
0.032557,
0
]
}, {
index: 51,
time: 89,
location: [
11660796.207813,
3692521.746172,
4.355956,
],
rotation: [
-12.481678,
1.647933,
0
]
}, {
index: 52,
time: 91,
location: [
11660798.153438,
3692518.907139,
4.375615,
],
rotation: [
-12.866511,
-70.376015,
-0.000001
]
}, {
index: 53,
time: 93,
location: [
11660818.690781,
3692555.287178,
4.438305,
],
rotation: [
-14.097762,
-53.407917,
-0.000001
]
}, {
index: 54,
time: 95,
location: [
11660817.543281,
3692557.167861,
4.405179,
],
rotation: [
-13.446374,
-8.980751,
0
]
}, {
index: 55,
time: 97,
location: [
11660846.340156,
3692560.796963,
4.405179,
],
rotation: [
-13.446374,
-6.356042,
0
]
}, {
index: 56,
time: 99,
location: [
11660865.155625,
3692562.920693,
4.396265,
],
rotation: [
-13.271392,
-5.209634,
0
]
}, {
index: 57,
time: 101,
location: [
11660883.141094,
3692564.998096,
4.275323,
],
rotation: [
-10.90902,
-5.979043,
0
]
}, {
index: 58,
time: 103,
location: [
11660904.009531,
3692567.505508,
4.329296,
],
rotation: [
-11.960692,
-8.054959,
0
]
}, {
index: 59,
time: 105,
location: [
11660924.337969,
3692570.467119,
4.284409,
],
rotation: [
-11.085779,
-7.529962,
0
]
}, {
index: 60,
time: 107,
location: [
11660951.573125,
3692575.00292,
4.489614,
],
rotation: [
-15.110427,
-11.820071,
0 0
] ]
}] }]

View File

@ -268,9 +268,7 @@ export default class OverViewComponent extends BaseComponent {
closeRight(){ closeRight(){
this.viewRightShow = false; this.viewRightShow = false;
const dom = document.querySelector('div.is-current') as any; const dom = document.querySelector('div.is-current') as any;
if (dom){
dom.classList.remove('is-current') dom.classList.remove('is-current')
}
if(this.currentEvent ){ if(this.currentEvent ){
this.viewLayer[this.currentEvent.id].selected = false; this.viewLayer[this.currentEvent.id].selected = false;
this.addCustom(this.viewLayer[this.currentEvent.id],true); this.addCustom(this.viewLayer[this.currentEvent.id],true);