Compare commits
No commits in common. "5be45aef7ab2e4594eb91d8e80209007f93ed80c" and "1def7b5d357a04cce23e02e7358f6ba445bd1343" have entirely different histories.
5be45aef7a
...
1def7b5d35
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -54,8 +54,8 @@ export default class HeaderComponent extends Vue {
|
|||
public timer;
|
||||
public showPageList = false;
|
||||
public pageList = pageListData;
|
||||
public currentPage = JSON.parse(localStorage.getItem("currentPage-train") as any) || this.pageList[0];
|
||||
public currentNav = localStorage.getItem("currentNav-train") || this.currentPage.children[0].value;
|
||||
public currentPage = JSON.parse(localStorage.getItem("currentPage") as any) || this.pageList[0];
|
||||
public currentNav = localStorage.getItem("currentNav") || this.currentPage.children[0].value;
|
||||
public showArrow = false;
|
||||
|
||||
public showContent = true;
|
||||
|
@ -87,9 +87,9 @@ export default class HeaderComponent extends Vue {
|
|||
}
|
||||
public selectPage(data){
|
||||
this.currentPage = data;
|
||||
localStorage.setItem("currentPage-train",JSON.stringify(data))
|
||||
localStorage.setItem("currentPage",JSON.stringify(data))
|
||||
this.currentNav = data.value;
|
||||
localStorage.setItem("currentNav-train",data.value)
|
||||
localStorage.setItem("currentNav",data.value)
|
||||
this.navChange()
|
||||
this.showPageList = false;
|
||||
this.navLeft = 0;
|
||||
|
@ -101,7 +101,7 @@ export default class HeaderComponent extends Vue {
|
|||
|
||||
public selectNav(data){
|
||||
this.currentNav = data.value;
|
||||
localStorage.setItem("currentNav-train",data.value)
|
||||
localStorage.setItem("currentNav",data.value)
|
||||
this.navChange()
|
||||
}
|
||||
|
||||
|
@ -129,8 +129,8 @@ export default class HeaderComponent extends Vue {
|
|||
beforeDestory(){
|
||||
clearInterval(this.timer);
|
||||
this.timer = null;
|
||||
localStorage.removeItem("currentPage-train")
|
||||
localStorage.removeItem("currentNav-train")
|
||||
localStorage.removeItem("currentPage")
|
||||
localStorage.removeItem("currentNav")
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
import MarkerOption from '@/models/marker.option.js'
|
||||
import PolygonOption from '@/models/polygon.option.js';
|
||||
import * as acapi from '../../public/ac.min.js'
|
||||
import * as acapi from '../assets/ac.min.js'
|
||||
// import acapi from 'ac.min.js'
|
||||
export default class PlayerUtils{
|
||||
public api:any;
|
||||
|
|
|
@ -162,14 +162,14 @@ export default class BaseComponent extends Vue {
|
|||
coordinateType:layer.coordinateType?layer.coordinateType:0,
|
||||
displayMode:2,
|
||||
imagePath:layer.url || layer.urls[item.type],
|
||||
imageSize:item.model?[30*1.5,30*1.5]:[48*1.5,48*1.5],
|
||||
imageSize:item.model?[30,30]:[48,48],
|
||||
popupSize:[480,388],
|
||||
popupOffset:[50,0],
|
||||
autoHidePopupWindow:false,
|
||||
// popupURL:,
|
||||
lineSize:item.hasPop?[0,0]:[2,40],
|
||||
useTextAnimation: false,
|
||||
lineOffset:item.hasPop?[0,0]:[24*1.5,0],
|
||||
lineOffset:item.hasPop?[0,0]:[24,0],
|
||||
autoHeight:true,
|
||||
})
|
||||
})
|
||||
|
|
Loading…
Reference in New Issue