Merge branch 'master' into guangyin

# Conflicts:
#	src/views/overview.component.ts

src/mock/path.ts

@@ -1022,6 +1022,162 @@ export default [
                     -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
+                ]
             }]
     }
 ]

src/popup/pop.component.vue

@@ -7,7 +7,7 @@
         <div class="content mg-b-20">
             <div class="flow-light-box">
                 <div class="img-box">
-                    <img :src="$route.query.img" alt="">
+                    <img style="width:100%" :src="$route.query.img" alt="">
                 </div>
             </div>
             <div class="content col" style="justify-content: center;s">

src/views/base.component.ts

@@ -109,7 +109,7 @@ export default class BaseComponent extends Vue {
                     // popupURL:,
                     lineSize:item.hasPop?[0,0]:[2,40],
                     useTextAnimation: false,
-                    lineOffset:[24,0],
+                    lineOffset:item.hasPop?[0,0]:[24,0],
                     autoHeight:true,
                 }) 
             })

src/views/overview.component.html

@@ -1,6 +1,6 @@
 <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="panel-container">

src/views/overview.component.ts

@@ -181,10 +181,14 @@ export default class OverViewComponent extends BaseComponent {
     }
     //右侧详情点击事件
     showDetail(item){
-        if(this.currentEvent && this.currentEvent.id !==item.id){
+        if(this.currentEvent){
-            this.viewLayer[this.currentEvent.id].selected = false;
+            if(this.currentEvent.id === item.id){
-            this.addCustom(this.viewLayer[this.currentEvent.id],true);
+                return
-            this.currentEvent = null;
+            }else{
+                this.viewLayer[this.currentEvent.id].selected = false;
+                this.addCustom(this.viewLayer[this.currentEvent.id],true);
+                this.currentEvent = null;
+            }
         }
         if(!this.viewLayer[item.id]){
             const data = [] as any;
@@ -265,7 +269,11 @@ export default class OverViewComponent extends BaseComponent {
         this.viewRightShow = false;
         const dom = document.querySelector('div.is-current') as any;
         dom.classList.remove('is-current')
-        console.log('关闭右侧')
+        if(this.currentEvent ){
+            this.viewLayer[this.currentEvent.id].selected = false;
+            this.addCustom(this.viewLayer[this.currentEvent.id],true);
+            this.currentEvent = null;
+        }
     }
 
     deactivated(){