From fa612bd7766f338cb09c5933fdb0ac879c59c023 Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Wed, 12 Oct 2022 15:22:37 +0800
Subject: [PATCH] 校园导航打开方式
---
src/pcviews/homee/Header/index.vue | 2 +-
src/router/page/index.js | 2 +-
src/components/map3/index.vue | 2 +-
src/App.vue | 25 ++++++-------------------
4 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index a849cf8..d0eff1d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -86,8 +86,12 @@
} else {
// pc端
// this.$router.replace('/large')
- // this.$router.replace('/pcLayout')
- this.$router.replace('/login')
+
+ if (this.$route.path == '/pcLayout/default') {
+ this.$router.replace('/pcLayout')
+ } else {
+ this.$router.replace('/login')
+ }
}
},
methods: {
@@ -107,23 +111,6 @@
if (r != null) return decodeURIComponent(r)
return null
},
- getQueryVariable (variable) {
- var query = window.location.search.substring(1)
- var vars = query.split('&')
- for (var i = 0; i < vars.length; i++) {
- var pair = vars[i].split('=')
- if (pair[0] == variable) {
- return pair[1]
- }
- }
- return false
- },
- _isMobile () {
- const flag = navigator.userAgent.match(
- /(phone|pad|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows phone)/i
- )
- return flag
- }
}
}
</script>
diff --git a/src/components/map3/index.vue b/src/components/map3/index.vue
index c8b290a..da30414 100644
--- a/src/components/map3/index.vue
+++ b/src/components/map3/index.vue
@@ -69,7 +69,7 @@
const that = this
tilesetLayer = new global.DC.TilesetLayer('tilesetLayer')
global.viewer.addLayer(tilesetLayer)
- tileset = new global.DC.Tileset('/qx/tileset.json', {
+ tileset = new global.DC.Tileset('/zhxy/mx/tileset.json', {
luminanceAtZenith: 0.4,
// cullWithChildrenBounds: false,
// cullRequestsWhileMoving: false,
diff --git a/src/pcviews/homee/Header/index.vue b/src/pcviews/homee/Header/index.vue
index cdc7d38..bf9248b 100644
--- a/src/pcviews/homee/Header/index.vue
+++ b/src/pcviews/homee/Header/index.vue
@@ -22,7 +22,7 @@
methods: {
onBtn5 () {
this.isClick = 5
- this.$router.push('/pcLayout')
+ window.open('https://dev.jxpskj.com:8023/zhxy/#/pcLayout/default', '_blank')
}
}
}
diff --git a/src/router/page/index.js b/src/router/page/index.js
index 5bfc76e..571a2f0 100644
--- a/src/router/page/index.js
+++ b/src/router/page/index.js
@@ -76,7 +76,7 @@
},
{
path: '/',
- redirect: '/pcLayout'
+ redirect: '/login'
},
{
path: '/login',
--
Gitblit v1.9.3