Compare commits

..

No commits in common. "master" and "wuyanfu" have entirely different histories.

14 changed files with 862 additions and 897 deletions

View File

@ -2,7 +2,7 @@
#开发环境 #开发环境
NODE_ENV:"production" NODE_ENV:"production"
# 页面标题 # 页面标题
VUE_APP_TITLE = 消防训练基地 VUE_APP_TITLE = 汉邦唐消防训练基地
# 网关地址 # 网关地址
VUE_APP_GATEWAY_URL="/dev-api" VUE_APP_GATEWAY_URL="/dev-api"
# UE4服务地址 # UE4服务地址

View File

@ -2,7 +2,7 @@
#开发环境 #开发环境
NODE_ENV:"production" NODE_ENV:"production"
# 页面标题 # 页面标题
VUE_APP_TITLE = 消防训练基地 VUE_APP_TITLE = 汉邦唐消防训练基地
# 网关地址 # 网关地址
VUE_APP_GATEWAY_URL="/dev-api" VUE_APP_GATEWAY_URL="/dev-api"
# UE4服务地址 # UE4服务地址

946
public/ac.min.js vendored

File diff suppressed because one or more lines are too long

763
src/assets/ac.min.js vendored

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

@ -1,7 +1,7 @@
<template> <template>
<div class="header-box"> <div class="header-box">
<div class="logo"> <div class="logo">
<img src="~@/assets/img/logo.png" height="24" alt=""> <img src="~@/assets/img/logo.png" alt="">
<div>{{currentPage.label}}</div> <div>{{currentPage.label}}</div>
</div> </div>
<div class="nav-box" :style="{width:currentPage.children.length<=5?currentPage.children.length*180+'px':5*180+'px'}" v-if="currentPage.children.length>1" @mouseenter="showArrow=true" @mouseleave="showArrow=false"> <div class="nav-box" :style="{width:currentPage.children.length<=5?currentPage.children.length*180+'px':5*180+'px'}" v-if="currentPage.children.length>1" @mouseenter="showArrow=true" @mouseleave="showArrow=false">
@ -54,8 +54,8 @@ export default class HeaderComponent extends Vue {
public timer; public timer;
public showPageList = false; public showPageList = false;
public pageList = pageListData; public pageList = pageListData;
public currentPage = JSON.parse(localStorage.getItem("currentPage-train") as any) || this.pageList[0]; public currentPage = JSON.parse(localStorage.getItem("currentPage") as any) || this.pageList[0];
public currentNav = localStorage.getItem("currentNav-train") || this.currentPage.children[0].value; public currentNav = localStorage.getItem("currentNav") || this.currentPage.children[0].value;
public showArrow = false; public showArrow = false;
public showContent = true; public showContent = true;
@ -87,9 +87,9 @@ export default class HeaderComponent extends Vue {
} }
public selectPage(data){ public selectPage(data){
this.currentPage = data; this.currentPage = data;
localStorage.setItem("currentPage-train",JSON.stringify(data)) localStorage.setItem("currentPage",JSON.stringify(data))
this.currentNav = data.value; this.currentNav = data.value;
localStorage.setItem("currentNav-train",data.value) localStorage.setItem("currentNav",data.value)
this.navChange() this.navChange()
this.showPageList = false; this.showPageList = false;
this.navLeft = 0; this.navLeft = 0;
@ -101,7 +101,7 @@ export default class HeaderComponent extends Vue {
public selectNav(data){ public selectNav(data){
this.currentNav = data.value; this.currentNav = data.value;
localStorage.setItem("currentNav-train",data.value) localStorage.setItem("currentNav",data.value)
this.navChange() this.navChange()
} }
@ -129,8 +129,8 @@ export default class HeaderComponent extends Vue {
beforeDestory(){ beforeDestory(){
clearInterval(this.timer); clearInterval(this.timer);
this.timer = null; this.timer = null;
localStorage.removeItem("currentPage-train") localStorage.removeItem("currentPage")
localStorage.removeItem("currentNav-train") localStorage.removeItem("currentNav")
} }
} }

View File

@ -1,5 +1,5 @@
export default [{ export default [{
label: "消防训练基地", label: "汉邦唐消防训练基地",
value: "xf", value: "xf",
children: [{ children: [{
label: "首页", label: "首页",

View File

@ -1,7 +1,7 @@
import MarkerOption from '@/models/marker.option.js' import MarkerOption from '@/models/marker.option.js'
import PolygonOption from '@/models/polygon.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' // import acapi from 'ac.min.js'
export default class PlayerUtils{ export default class PlayerUtils{
public api:any; public api:any;
@ -9,7 +9,7 @@ export default class PlayerUtils{
const player = new acapi.DigitalTwinPlayer(process.env.VUE_APP_PALYER_URL,{ const player = new acapi.DigitalTwinPlayer(process.env.VUE_APP_PALYER_URL,{
domId, domId,
iid, iid,
// reset:true, reset:true,
apiOptions:{ apiOptions:{
onReady: this.onReady, onReady: this.onReady,
onLog: this.onLog, //可选参数,日志输出回调函数 onLog: this.onLog, //可选参数,日志输出回调函数

View File

@ -162,14 +162,14 @@ export default class BaseComponent extends Vue {
coordinateType:layer.coordinateType?layer.coordinateType:0, coordinateType:layer.coordinateType?layer.coordinateType:0,
displayMode:2, displayMode:2,
imagePath:layer.url || layer.urls[item.type], 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], popupSize:[480,388],
popupOffset:[50,0], popupOffset:[50,0],
autoHidePopupWindow:false, autoHidePopupWindow:false,
// popupURL:, // popupURL:,
lineSize:item.hasPop?[0,0]:[2,40], lineSize:item.hasPop?[0,0]:[2,40],
useTextAnimation: false, useTextAnimation: false,
lineOffset:item.hasPop?[0,0]:[24*1.5,0], lineOffset:item.hasPop?[0,0]:[24,0],
autoHeight:true, autoHeight:true,
}) })
}) })

View File

@ -1,13 +1,13 @@
<div class="overview-container"> <div class="overview-container">
<!-- <MapComponent v-show="!showLoading" id="map" @onLoaded="getMap" @onHandleChange="handleChange"></MapComponent>--> <MapComponent v-show="!showLoading" id="map" @onLoaded="getMap" @onHandleChange="handleChange"></MapComponent>
<!-- <div v-show="showLoading" class="loading">--> <div v-show="showLoading" class="loading">
<!-- <div>--> <div>
<!-- <img src="~@/assets/img/loading.png" alt="">--> <img src="~@/assets/img/loading.png" alt="">
<!-- 正在加载园区…--> 正在加载园区…
<!-- </div>--> </div>
<!-- </div>--> </div>
<div class="bg-box left animate__animated"> <div class="bg-box left animate__animated">
<div class="panel-container"> <div class="panel-container">
<!-- 首页--> <!-- 首页-->

View File

@ -20,10 +20,6 @@
height: 100%; height: 100%;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
background: url("../assets/img/3.png");
background-size: 100%;
background-repeat: no-repeat;
#map { #map {
width: 100%; width: 100%;