From 19621635052322005f31579f7f3d481750898d7c Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 31 Dec 2021 08:56:36 +0800
Subject: [PATCH] 部分更改
---
src/components/map/components/dimension.vue | 115 ++++--
src/pcviews/orgnav/ofc.vue | 15
src/pcviews/service/service.vue | 20 +
src/components/arcNavBar/index.vue | 3
src/pcviews/service/aed.vue | 22 +
src/pcviews/arc/dorm.vue | 14
src/pcviews/arc/venue.vue | 14
src/pcviews/service/bank.vue | 22 +
src/pcviews/arc/edifact.vue | 14
src/pcviews/orgnav/directly.vue | 15
src/pcviews/service/supermarket.vue | 22 +
src/pcviews/service/medical.vue | 22 +
src/pcviews/arc/rest.vue | 14
src/store/getters.js | 6
src/components/map/components/mapPopup.vue | 30 +
src/pcviews/arc/teaching.vue | 14
src/pcviews/service/park.vue | 22 +
src/components/map/components/campusBuildingSearch.vue | 20
src/components/orgNavBar/index.vue | 3
src/pcLayout/index.vue | 3
src/pcviews/service/alleyway.vue | 22 +
src/pcviews/service/showers.vue | 22 +
src/pcviews/service/transfer.vue | 22 +
src/pcviews/service/canteen.vue | 22 +
src/components/map/index.vue | 17
src/components/serviceNavBar/index.vue | 4
src/store/modules/mobile.js | 301 ++++++++--------
src/pcviews/orgnav/teaching.vue | 15
src/pcviews/service/copy.vue | 22 +
src/styles/pcpage/dc-ui.scss | 10
src/pcviews/arc/family.vue | 14
src/pcviews/orgnav/rest.vue | 15
src/pcviews/orgnav/masses.vue | 15
src/pcviews/service/express.vue | 22 +
src/store/modules/viewer.js | 30 +
src/pcviews/arc/culture.vue | 14
36 files changed, 720 insertions(+), 257 deletions(-)
diff --git a/src/components/arcNavBar/index.vue b/src/components/arcNavBar/index.vue
index 1e66117..636466e 100644
--- a/src/components/arcNavBar/index.vue
+++ b/src/components/arcNavBar/index.vue
@@ -192,6 +192,9 @@
this.$store.commit('SET_INTRODUCETEXT', result.introduce)
this.$store.commit('SET_PANORAMAURL', result.panoramaurl)
this.$store.commit('SET_POPUPIMGATLAS', imgArr)
+ if (result.videourl && result.videourl != '') {
+ this.$store.commit('SET_MONITORURL', result.videourl)
+ }
if (res.data.data[0].jx != '') {
this.$store.commit('SET_TEACHLIST', tabOne)
} else {
diff --git a/src/components/map/components/campusBuildingSearch.vue b/src/components/map/components/campusBuildingSearch.vue
index 3ddaea0..7c9e6c3 100644
--- a/src/components/map/components/campusBuildingSearch.vue
+++ b/src/components/map/components/campusBuildingSearch.vue
@@ -62,36 +62,42 @@
bgimg: '/img/search/org.png',
title: '党群机构',
type: 'orgnav',
+ path: '/pcLayout/default/orgnav/masses',
code: 1
},
{
bgimg: '/img/search/ofc.png',
title: '职能部处',
type: 'orgnav',
+ path: '/pcLayout/default/orgnav/ofc',
code: 2
},
{
bgimg: '/img/search/teach.png',
title: '教学科研',
- type: 'orgnav',
- code: 4
+ type: 'arc',
+ path: '/pcLayout/default/arc/teaching',
+ code: 2
},
{
bgimg: '/img/search/venue.png',
title: '校内场馆',
type: 'arc',
+ path: '/pcLayout/default/arc/venue',
code: 3
},
{
bgimg: '/img/search/dorm.png',
title: '学生宿舍',
type: 'arc',
+ path: '/pcLayout/default/arc/dorm',
code: 4
},
{
bgimg: '/img/search/scenery.png',
title: '文化风景',
type: 'arc',
+ path: '/pcLayout/default/arc/culture',
code: 5
}
],
@@ -136,6 +142,11 @@
openModelPopup (param) {
var list = []
+ if (this.$route.path.indexOf('/service') != -1) {
+ this.$store.dispatch('delVisitedViews', this.$route)
+ this.$router.push('/pcLayout/default')
+ }
+
if (param.type == 'orgnav') {
var path = this.$route.path
if (path.indexOf('/arc') != -1) {
@@ -172,7 +183,8 @@
QRImg: item.codeurl,
address: item.address,
telephone: item.telephone,
- introduce: item.introduce
+ introduce: item.introduce,
+ videourl: item.videourl
})
})
@@ -234,7 +246,7 @@
if (result.panoramaurl != '') {
this.$store.commit('SET_PANORAMAURL', result.panoramaurl)
}
- if (result.videourl != '') {
+ if (result.videourl && result.videourl != '') {
this.$store.commit('SET_MONITORURL', result.videourl)
}
this.$store.commit('SET_POPUPIMGATLAS', imgArr)
diff --git a/src/components/map/components/dimension.vue b/src/components/map/components/dimension.vue
index 2a65fc1..0b7d024 100644
--- a/src/components/map/components/dimension.vue
+++ b/src/components/map/components/dimension.vue
@@ -3,7 +3,7 @@
<el-radio-group v-model="dimensionValue"
size="medium"
@change="dimensionChange">
- <el-radio-button label="三 维"></el-radio-button>
+ <el-radio-button label="3 维"></el-radio-button>
<el-radio-button label="2.5维"></el-radio-button>
</el-radio-group>
</div>
@@ -18,14 +18,14 @@
data () {
return {
DC: null,
- dimensionValue: '三 维',
+ dimensionValue: '3 维',
newLayer: null,
provider: null,
wallLayer: null,
tileset: null,
tilesetLayer: null,
titlesetLayerFlag: false,
- oneFlag: false,
+ silhouetteBlue: null,
wallArr: [
[116.41526036, 27.95352217, 100],
[116.41128018, 27.95789328, 100],
@@ -90,18 +90,15 @@
}
)
that.tilesetLayer.addOverlay(that.tileset)
- setTimeout(() => {
- that.viewer.flyTo(that.tileset, 10)
- }, 2000)
- var silhouetteBlue = that.DC.Namespace.Cesium.PostProcessStageLibrary.createEdgeDetectionStage()
- silhouetteBlue.uniforms.color = that.DC.Namespace.Cesium.Color.fromBytes(9, 162, 40)
- silhouetteBlue.uniforms.length = 0.01
- silhouetteBlue.selected = []
+ that.silhouetteBlue = that.DC.Namespace.Cesium.PostProcessStageLibrary.createEdgeDetectionStage()
+ that.silhouetteBlue.uniforms.color = that.DC.Namespace.Cesium.Color.fromBytes(9, 162, 40)
+ that.silhouetteBlue.uniforms.length = 0.01
+ that.silhouetteBlue.selected = []
that.viewer.scene.postProcessStages.add(
that.DC.Namespace.Cesium.PostProcessStageLibrary.createSilhouetteStage([
- silhouetteBlue
+ that.silhouetteBlue
])
)
@@ -143,7 +140,7 @@
})
that.tileset.on(that.DC.MouseEventType.MOUSE_MOVE, e => {
- silhouetteBlue.selected = []
+ that.silhouetteBlue.selected = []
if (that.DC.Namespace.Cesium.defined(highlighted.feature)) {
highlighted.feature.color = highlighted.originalColor
@@ -151,7 +148,7 @@
}
if (e.feature !== selected.feature) {
- silhouetteBlue.selected = [e.feature]
+ that.silhouetteBlue.selected = [e.feature]
highlighted.feature = e.feature
@@ -163,6 +160,72 @@
}
})
+ var provider = new that.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
+ url: 'http://www.tdtfz.com/OneMapServer/rest/services/fzsw2019/MapServer/WMTS/tile/1.0.0/fzsw2019/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}',
+ layer: 'fzsw2019',
+ style: 'default',
+ tileMatrixSetID: 'default028mm',
+ format: 'image/jpgpng',
+ tilingScheme: new that.DC.Namespace.Cesium.GeographicTilingScheme(),
+ maximumLevel: 19,
+ tileMatrixLabels: [
+ '0',
+ '1',
+ '2',
+ '3',
+ '4',
+ '5',
+ '6',
+ '7',
+ '8',
+ '9',
+ '10',
+ '11',
+ '12',
+ '13',
+ '14',
+ '15',
+ '16',
+ '17',
+ '18',
+ '19'
+ ]
+ })
+ that.newLayer = that.viewer.imageryLayers.addImageryProvider(provider)
+
+ that.wallLayer = new that.DC.VectorLayer('wallLayer')
+ that.viewer.addLayer(that.wallLayer)
+
+ that.wallArr.forEach(item => {
+ item = item.join(',')
+ })
+ that.wallArr = that.wallArr.join(';')
+ const wall = new that.DC.Wall(
+ that.wallArr
+ )
+ wall.setStyle({
+ material: new that.DC.WallTrailMaterialProperty({
+ color: that.DC.Namespace.Cesium.Color.fromBytes(0, 142, 255, 150),
+ // color: that.DC.Color.CYAN,
+ speed: 10
+ })
+ })
+ that.wallLayer.addOverlay(wall)
+
+ that.viewer.camera.setView({
+ // Cesium的坐标是以地心为原点，一向指向南美洲，一向指向亚洲，一向指向北极州
+ // fromDegrees()方法，将经纬度和高程转换为世界坐标
+ destination: that.DC.Namespace.Cesium.Cartesian3.fromDegrees(116.36618337, 27.95911915, 1000.0),
+ orientation: {
+ // 指向
+ heading: that.DC.Namespace.Cesium.Math.toRadians(0, 0),
+ // 视角
+ pitch: that.DC.Namespace.Cesium.Math.toRadians(-90),
+ roll: 0.0
+ }
+ })
+
+ this.tilesetLayer.show = false
this.titlesetLayerFlag = true
}
}
@@ -171,10 +234,11 @@
methods: {
dimensionChange () {
var that = this
- if (that.dimensionValue == '三 维') {
+ if (that.dimensionValue == '3 维') {
that.wallLayer.show = false
that.viewer.imageryLayers.remove(that.newLayer)
that.newLayer = null
+ that.silhouetteBlue.selected = []
that.tilesetLayer.show = true
that.viewer.flyTo(that.tileset)
} else {
@@ -211,29 +275,6 @@
]
})
that.newLayer = that.viewer.imageryLayers.addImageryProvider(provider)
-
- if (that.oneFlag == false) {
- that.wallLayer = new that.DC.VectorLayer('wallLayer')
- that.viewer.addLayer(that.wallLayer)
-
- that.wallArr.forEach(item => {
- item = item.join(',')
- })
- that.wallArr = that.wallArr.join(';')
- const wall = new that.DC.Wall(
- that.wallArr
- )
- wall.setStyle({
- material: new that.DC.WallTrailMaterialProperty({
- color: that.DC.Namespace.Cesium.Color.fromBytes(0, 142, 255, 150),
- // color: that.DC.Color.CYAN,
- speed: 10
- })
- })
- that.wallLayer.addOverlay(wall)
-
- that.oneFlag = true
- }
that.wallLayer.show = true
diff --git a/src/components/map/components/mapPopup.vue b/src/components/map/components/mapPopup.vue
index d3a9c40..10d7f4c 100644
--- a/src/components/map/components/mapPopup.vue
+++ b/src/components/map/components/mapPopup.vue
@@ -271,9 +271,28 @@
this.DC = global.DC
},
watch: {
- introduceText: function (newQuestion, oldQuestion) {
- var zhText = encodeURI(newQuestion)
- this.audioSource = `<source src="http://tts.baidu.com/text2audio?lan=zh&ie=UTF-8&spd=4&text=${zhText}" type="audio/mpeg"><embed height="0" width="0" src="http://tts.baidu.com/text2audio?text=${zhText}">`
+ introduceText: {
+ immediate: true,
+ handler (newQuestion, oldQuestion) {
+ var zhText = encodeURI(newQuestion)
+ this.audioSource = `<source src="http://tts.baidu.com/text2audio?lan=zh&ie=UTF-8&spd=4&text=${zhText}" type="audio/mpeg"><embed height="0" width="0" src="http://tts.baidu.com/text2audio?text=${zhText}">`
+ }
+ },
+ teachList: {
+ immediate: true,
+ handler (newCode, oldCode) {
+ if (newCode.length > 0) {
+ this.tabBtnFlag = '教学科研行政'
+ }
+ }
+ },
+ liveList: {
+ immediate: true,
+ handler (newCode, oldCode) {
+ if (newCode.length > 0 && this.teachList.length == 0) {
+ this.tabBtnFlag = '生活服务'
+ }
+ }
}
},
methods: {
@@ -384,7 +403,6 @@
mechanismDetailPopup (num, param) {
getMechanismDetail({ num: num, mechanismName: param }).then(res => {
- console.log(res)
var result = res.data.data
this.$store.commit('CLEAR_ALL', null)
@@ -399,6 +417,10 @@
this.$store.commit('SET_INTRODUCETEXT', result.introduce)
this.$store.commit('SET_POPUPIMGATLAS', imgArr)
+ if (result.videourl && result.videourl != '') {
+ this.$store.commit('SET_MONITORURL', result.videourl)
+ }
+
this.newPopup(result)
this.viewer.flyToPosition(
new this.DC.Position(Number(result.jd), Number(result.wd), 3000, Number(result.heading), Number(result.pitch), Number(result.roll)),
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index cf18f5b..35d8883 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -155,9 +155,9 @@
}
})
};
- if (height > 6000) {
+ if (height > 600000) {
viewer.camera.setView({
- destination: that.DC.Namespace.Cesium.Cartesian3.fromRadians(viewer.camera.positionCartographic.longitude, viewer.camera.positionCartographic.latitude, 6000),
+ destination: that.DC.Namespace.Cesium.Cartesian3.fromRadians(viewer.camera.positionCartographic.longitude, viewer.camera.positionCartographic.latitude, 600000),
orientation: {
// 指向
heading: that.DC.Namespace.Cesium.Math.toRadians(0, 0),
@@ -172,7 +172,7 @@
// 最小
viewer.scene.screenSpaceCameraController.minimumZoomDistance = 500
// 最大
- viewer.scene.screenSpaceCameraController.maximumZoomDistance = 6000
+ viewer.scene.screenSpaceCameraController.maximumZoomDistance = 600000
// 设置相机缩小时的速率
viewer.scene.screenSpaceCameraController._minimumZoomRate = 30000
// 设置相机放大时的速率
@@ -197,7 +197,16 @@
crs: 'WGS84'
}
)
- viewer.addBaseLayer(baselayer)
+
+ const arcgisLayer = that.DC.ImageryLayerFactory.createArcGisImageryLayer({
+ url: 'http://59.55.128.156:6080/arcgis/rest/services/fzhl/MapServer'
+ })
+
+ viewer.addBaseLayer(baselayer, {
+ name: '影像'
+ })
+
+ viewer.imageryLayers.addImageryProvider(arcgisLayer)
// viewer.addBaseLayer(baselayer, {
// iconUrl: 'examples/images/icon/img.png',
diff --git a/src/components/orgNavBar/index.vue b/src/components/orgNavBar/index.vue
index 106d5da..f7caf99 100644
--- a/src/components/orgNavBar/index.vue
+++ b/src/components/orgNavBar/index.vue
@@ -129,6 +129,9 @@
this.$store.commit('SET_TELEPHONE', item.telephone)
this.$store.commit('SET_INTRODUCETEXT', item.introduce)
this.$store.commit('SET_POPUPIMGATLAS', imgArr)
+ if (item.videourl && item.videourl != '') {
+ this.$store.commit('SET_MONITORURL', item.videourl)
+ }
this.newPopup(item)
this.viewer.flyToPosition(
diff --git a/src/components/serviceNavBar/index.vue b/src/components/serviceNavBar/index.vue
index f6898f4..68cd47b 100644
--- a/src/components/serviceNavBar/index.vue
+++ b/src/components/serviceNavBar/index.vue
@@ -190,6 +190,10 @@
this.$store.commit('SET_PANORAMAURL', result.panoramaurl)
this.$store.commit('SET_POPUPIMGATLAS', imgArr)
+ if (result.videourl && result.videourl != '') {
+ this.$store.commit('SET_MONITORURL', result.videourl)
+ }
+
this.newPopup(result)
this.viewer.flyToPosition(
new this.DC.Position(Number(result.jd), Number(result.wd), 3000, Number(result.heading), Number(result.pitch), Number(result.roll)),
diff --git a/src/pcLayout/index.vue b/src/pcLayout/index.vue
index f43560b..9280a02 100644
--- a/src/pcLayout/index.vue
+++ b/src/pcLayout/index.vue
@@ -52,8 +52,6 @@
<el-menu-item index="/pcLayout/default/service/alleyway">出入口</el-menu-item>
</el-submenu>
- <el-menu-item index="/pcLayout/default/allquery"> <i class='custom-icon menu-zhcx'></i> 综合查询</el-menu-item>
-
<!-- <el-menu-item index="/pcLayout/default/campusnav"> <i class='custom-icon menu-xydl'></i> 校园导览</el-menu-item> -->
<el-menu-item index="/pcLayout/default/campusnavi"> <i class='custom-icon menu-xydh'></i> 校园导航</el-menu-item>
@@ -83,7 +81,6 @@
},
methods: {
handleSelect (key, keyPath) {
- console.log(key, keyPath)
}
}
}
diff --git a/src/pcviews/arc/culture.vue b/src/pcviews/arc/culture.vue
index 24e7e5f..7f8fcfa 100644
--- a/src/pcviews/arc/culture.vue
+++ b/src/pcviews/arc/culture.vue
@@ -3,7 +3,7 @@
* @Name: 文化风景
* @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-25 14:39:28
+ * @Last Modified time: 2021-12-30 14:56:08
*/
<template>
<div>
@@ -24,10 +24,11 @@
computed: {
...mapGetters([
// 校内导航的显示关闭
- 'orgNavBarFlag'
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
])
},
- created () {
+ mounted () {
if (this.orgNavBarFlag == true) {
this.$store.commit('SET_ORGNAVBARTITLE', '')
this.$store.commit('SET_ORGNAVBARLIST', [])
@@ -39,6 +40,13 @@
},
methods: {
+ },
+ beforeDestroy () {
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
}
}
</script>
diff --git a/src/pcviews/arc/dorm.vue b/src/pcviews/arc/dorm.vue
index 243d969..34516fa 100644
--- a/src/pcviews/arc/dorm.vue
+++ b/src/pcviews/arc/dorm.vue
@@ -3,7 +3,7 @@
* @Name: 学生宿舍
* @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-25 14:41:30
+ * @Last Modified time: 2021-12-30 14:25:14
*/
<template>
<div>
@@ -24,10 +24,11 @@
computed: {
...mapGetters([
// 校内导航的显示关闭
- 'orgNavBarFlag'
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
])
},
- created () {
+ mounted () {
if (this.orgNavBarFlag == true) {
this.$store.commit('SET_ORGNAVBARTITLE', '')
this.$store.commit('SET_ORGNAVBARLIST', [])
@@ -39,6 +40,13 @@
},
methods: {
+ },
+ beforeDestroy () {
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
}
}
</script>
diff --git a/src/pcviews/arc/edifact.vue b/src/pcviews/arc/edifact.vue
index 9a449f5..ce997e6 100644
--- a/src/pcviews/arc/edifact.vue
+++ b/src/pcviews/arc/edifact.vue
@@ -3,7 +3,7 @@
* @Name: 行政办公
* @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-25 14:42:35
+ * @Last Modified time: 2021-12-30 14:23:28
*/
<template>
<div>
@@ -24,10 +24,11 @@
computed: {
...mapGetters([
// 校内导航的显示关闭
- 'orgNavBarFlag'
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
])
},
- created () {
+ mounted () {
if (this.orgNavBarFlag == true) {
this.$store.commit('SET_ORGNAVBARTITLE', '')
this.$store.commit('SET_ORGNAVBARLIST', [])
@@ -39,6 +40,13 @@
},
methods: {
+ },
+ beforeDestroy () {
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
}
}
</script>
diff --git a/src/pcviews/arc/family.vue b/src/pcviews/arc/family.vue
index 57d5303..7bf0e72 100644
--- a/src/pcviews/arc/family.vue
+++ b/src/pcviews/arc/family.vue
@@ -3,7 +3,7 @@
* @Name: 家属住宅
* @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-25 14:42:54
+ * @Last Modified time: 2021-12-30 14:25:24
*/
<template>
<div>
@@ -24,10 +24,11 @@
computed: {
...mapGetters([
// 校内导航的显示关闭
- 'orgNavBarFlag'
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
])
},
- created () {
+ mounted () {
if (this.orgNavBarFlag == true) {
this.$store.commit('SET_ORGNAVBARTITLE', '')
this.$store.commit('SET_ORGNAVBARLIST', [])
@@ -39,6 +40,13 @@
},
methods: {
+ },
+ beforeDestroy () {
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
}
}
</script>
diff --git a/src/pcviews/arc/rest.vue b/src/pcviews/arc/rest.vue
index 8aa61a4..55f78da 100644
--- a/src/pcviews/arc/rest.vue
+++ b/src/pcviews/arc/rest.vue
@@ -3,7 +3,7 @@
* @Name: 其他楼宇
* @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-25 14:44:21
+ * @Last Modified time: 2021-12-30 14:25:28
*/
<template>
<div>
@@ -24,10 +24,11 @@
computed: {
...mapGetters([
// 校内导航的显示关闭
- 'orgNavBarFlag'
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
])
},
- created () {
+ mounted () {
if (this.orgNavBarFlag == true) {
this.$store.commit('SET_ORGNAVBARTITLE', '')
this.$store.commit('SET_ORGNAVBARLIST', [])
@@ -39,6 +40,13 @@
},
methods: {
+ },
+ beforeDestroy () {
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
}
}
</script>
diff --git a/src/pcviews/arc/teaching.vue b/src/pcviews/arc/teaching.vue
index fab932d..d7562b0 100644
--- a/src/pcviews/arc/teaching.vue
+++ b/src/pcviews/arc/teaching.vue
@@ -3,7 +3,7 @@
* @Name: 教学科研
* @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-25 14:45:10
+ * @Last Modified time: 2021-12-30 14:54:33
*/
<template>
<div>
@@ -24,10 +24,11 @@
computed: {
...mapGetters([
// 校内导航的显示关闭
- 'orgNavBarFlag'
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
])
},
- created () {
+ mounted () {
if (this.orgNavBarFlag == true) {
this.$store.commit('SET_ORGNAVBARTITLE', '')
this.$store.commit('SET_ORGNAVBARLIST', [])
@@ -39,6 +40,13 @@
},
methods: {
+ },
+ beforeDestroy () {
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
}
}
</script>
diff --git a/src/pcviews/arc/venue.vue b/src/pcviews/arc/venue.vue
index 1cbbb45..6bbaa2b 100644
--- a/src/pcviews/arc/venue.vue
+++ b/src/pcviews/arc/venue.vue
@@ -3,7 +3,7 @@
* @Name: 校内场馆
* @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-25 14:47:37
+ * @Last Modified time: 2021-12-30 14:25:37
*/
<template>
<div>
@@ -24,10 +24,11 @@
computed: {
...mapGetters([
// 校内导航的显示关闭
- 'orgNavBarFlag'
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
])
},
- created () {
+ mounted () {
if (this.orgNavBarFlag == true) {
this.$store.commit('SET_ORGNAVBARTITLE', '')
this.$store.commit('SET_ORGNAVBARLIST', [])
@@ -39,6 +40,13 @@
},
methods: {
+ },
+ beforeDestroy () {
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
}
}
</script>
diff --git a/src/pcviews/orgnav/directly.vue b/src/pcviews/orgnav/directly.vue
index ea320c3..5f9720a 100644
--- a/src/pcviews/orgnav/directly.vue
+++ b/src/pcviews/orgnav/directly.vue
@@ -3,7 +3,7 @@
* @Name: 直属及附属单位
* @Date: 2021-11-15 10:02:12
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-25 14:50:00
+ * @Last Modified time: 2021-12-30 14:25:45
*/
<template>
<div>
@@ -25,10 +25,11 @@
computed: {
...mapGetters([
// 校内导航的显示关闭
+ 'orgNavBarFlag',
'arcNavBarFlag'
])
},
- created () {
+ mounted () {
if (this.arcNavBarFlag == true) {
this.$store.commit('SET_ARCNAVBARTITLE', '')
this.$store.commit('SET_ARCNAVBARCODE', '')
@@ -54,7 +55,8 @@
QRImg: item.codeurl,
address: item.address,
telephone: item.telephone,
- introduce: item.introduce
+ introduce: item.introduce,
+ videourl: item.videourl
})
})
@@ -63,6 +65,13 @@
},
methods: {
+ },
+ beforeDestroy () {
+ if (this.orgNavBarFlag == true) {
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
+ }
}
}
</script>
diff --git a/src/pcviews/orgnav/masses.vue b/src/pcviews/orgnav/masses.vue
index 5735b88..c64c595 100644
--- a/src/pcviews/orgnav/masses.vue
+++ b/src/pcviews/orgnav/masses.vue
@@ -3,7 +3,7 @@
* @Name: 党群机构
* @Date: 2021-11-15 10:02:12
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-25 15:10:09
+ * @Last Modified time: 2021-12-30 14:25:52
*/
<template>
<div>
@@ -25,10 +25,11 @@
computed: {
...mapGetters([
// 校内导航的显示关闭
+ 'orgNavBarFlag',
'arcNavBarFlag'
])
},
- created () {
+ mounted () {
if (this.arcNavBarFlag == true) {
this.$store.commit('SET_ARCNAVBARTITLE', '')
this.$store.commit('SET_ARCNAVBARCODE', '')
@@ -54,7 +55,8 @@
QRImg: item.codeurl,
address: item.address,
telephone: item.telephone,
- introduce: item.introduce
+ introduce: item.introduce,
+ videourl: item.videourl
})
})
@@ -63,6 +65,13 @@
},
methods: {
+ },
+ beforeDestroy () {
+ if (this.orgNavBarFlag == true) {
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
+ }
}
}
</script>
diff --git a/src/pcviews/orgnav/ofc.vue b/src/pcviews/orgnav/ofc.vue
index bf25ede..0143966 100644
--- a/src/pcviews/orgnav/ofc.vue
+++ b/src/pcviews/orgnav/ofc.vue
@@ -3,7 +3,7 @@
* @Name: 职能部处
* @Date: 2021-11-15 10:02:12
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-25 15:10:30
+ * @Last Modified time: 2021-12-30 14:25:58
*/
<template>
<div>
@@ -25,10 +25,11 @@
computed: {
...mapGetters([
// 校内导航的显示关闭
+ 'orgNavBarFlag',
'arcNavBarFlag'
])
},
- created () {
+ mounted () {
if (this.arcNavBarFlag == true) {
this.$store.commit('SET_ARCNAVBARTITLE', '')
this.$store.commit('SET_ARCNAVBARCODE', '')
@@ -54,7 +55,8 @@
QRImg: item.codeurl,
address: item.address,
telephone: item.telephone,
- introduce: item.introduce
+ introduce: item.introduce,
+ videourl: item.videourl
})
})
@@ -63,6 +65,13 @@
},
methods: {
+ },
+ beforeDestroy () {
+ if (this.orgNavBarFlag == true) {
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
+ }
}
}
</script>
diff --git a/src/pcviews/orgnav/rest.vue b/src/pcviews/orgnav/rest.vue
index 63cc2ac..0db486d 100644
--- a/src/pcviews/orgnav/rest.vue
+++ b/src/pcviews/orgnav/rest.vue
@@ -3,7 +3,7 @@
* @Name: 其他机构
* @Date: 2021-11-15 10:02:12
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-25 15:10:47
+ * @Last Modified time: 2021-12-30 14:26:06
*/
<template>
<div>
@@ -25,10 +25,11 @@
computed: {
...mapGetters([
// 校内导航的显示关闭
+ 'orgNavBarFlag',
'arcNavBarFlag'
])
},
- created () {
+ mounted () {
if (this.arcNavBarFlag == true) {
this.$store.commit('SET_ARCNAVBARTITLE', '')
this.$store.commit('SET_ARCNAVBARCODE', '')
@@ -54,7 +55,8 @@
QRImg: item.codeurl,
address: item.address,
telephone: item.telephone,
- introduce: item.introduce
+ introduce: item.introduce,
+ videourl: item.videourl
})
})
@@ -63,6 +65,13 @@
},
methods: {
+ },
+ beforeDestroy () {
+ if (this.orgNavBarFlag == true) {
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
+ }
}
}
</script>
diff --git a/src/pcviews/orgnav/teaching.vue b/src/pcviews/orgnav/teaching.vue
index 4c41603..595e871 100644
--- a/src/pcviews/orgnav/teaching.vue
+++ b/src/pcviews/orgnav/teaching.vue
@@ -3,7 +3,7 @@
* @Name: 教学与科研机构
* @Date: 2021-11-15 10:02:12
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-25 15:11:00
+ * @Last Modified time: 2021-12-30 14:26:13
*/
<template>
<div>
@@ -25,10 +25,11 @@
computed: {
...mapGetters([
// 校内导航的显示关闭
+ 'orgNavBarFlag',
'arcNavBarFlag'
])
},
- created () {
+ mounted () {
if (this.arcNavBarFlag == true) {
this.$store.commit('SET_ARCNAVBARTITLE', '')
this.$store.commit('SET_ARCNAVBARCODE', '')
@@ -54,7 +55,8 @@
QRImg: item.codeurl,
address: item.address,
telephone: item.telephone,
- introduce: item.introduce
+ introduce: item.introduce,
+ videourl: item.videourl
})
})
@@ -63,6 +65,13 @@
},
methods: {
+ },
+ beforeDestroy () {
+ if (this.orgNavBarFlag == true) {
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
+ }
}
}
</script>
diff --git a/src/pcviews/service/aed.vue b/src/pcviews/service/aed.vue
index 8c6de83..3e66589 100644
--- a/src/pcviews/service/aed.vue
+++ b/src/pcviews/service/aed.vue
@@ -3,7 +3,7 @@
* @Name: AED
* @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-21 11:41:47
+ * @Last Modified time: 2021-12-30 14:29:35
*/
<template>
<div>
@@ -14,6 +14,9 @@
</template>
<script>
+
+import { mapGetters } from 'vuex'
+
export default {
data () {
return {
@@ -23,6 +26,23 @@
}
},
created () {
+ if (this.orgNavBarFlag == true) {
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
+ }
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
+ },
+ computed: {
+ ...mapGetters([
+ // 校内导航的显示关闭
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
+ ])
},
methods: {
closeModel () {
diff --git a/src/pcviews/service/alleyway.vue b/src/pcviews/service/alleyway.vue
index 58673fb..af42644 100644
--- a/src/pcviews/service/alleyway.vue
+++ b/src/pcviews/service/alleyway.vue
@@ -3,7 +3,7 @@
* @Name: 出入口
* @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-21 11:41:46
+ * @Last Modified time: 2021-12-30 14:30:43
*/
<template>
<div>
@@ -14,6 +14,9 @@
</template>
<script>
+
+import { mapGetters } from 'vuex'
+
export default {
data () {
return {
@@ -23,6 +26,23 @@
}
},
created () {
+ if (this.orgNavBarFlag == true) {
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
+ }
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
+ },
+ computed: {
+ ...mapGetters([
+ // 校内导航的显示关闭
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
+ ])
},
methods: {
closeModel () {
diff --git a/src/pcviews/service/bank.vue b/src/pcviews/service/bank.vue
index 6038c09..ec3b599 100644
--- a/src/pcviews/service/bank.vue
+++ b/src/pcviews/service/bank.vue
@@ -3,7 +3,7 @@
* @Name: 银行网点
* @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-21 11:41:52
+ * @Last Modified time: 2021-12-30 14:30:51
*/
<template>
<div>
@@ -14,6 +14,9 @@
</template>
<script>
+
+import { mapGetters } from 'vuex'
+
export default {
data () {
return {
@@ -23,6 +26,23 @@
}
},
created () {
+ if (this.orgNavBarFlag == true) {
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
+ }
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
+ },
+ computed: {
+ ...mapGetters([
+ // 校内导航的显示关闭
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
+ ])
},
methods: {
closeModel () {
diff --git a/src/pcviews/service/canteen.vue b/src/pcviews/service/canteen.vue
index d600905..d9bb098 100644
--- a/src/pcviews/service/canteen.vue
+++ b/src/pcviews/service/canteen.vue
@@ -3,7 +3,7 @@
* @Name: 食堂餐厅
* @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-21 11:41:55
+ * @Last Modified time: 2021-12-30 14:30:54
*/
<template>
<div>
@@ -14,6 +14,9 @@
</template>
<script>
+
+import { mapGetters } from 'vuex'
+
export default {
data () {
return {
@@ -23,6 +26,23 @@
}
},
created () {
+ if (this.orgNavBarFlag == true) {
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
+ }
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
+ },
+ computed: {
+ ...mapGetters([
+ // 校内导航的显示关闭
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
+ ])
},
methods: {
closeModel () {
diff --git a/src/pcviews/service/copy.vue b/src/pcviews/service/copy.vue
index 9389889..1a24907 100644
--- a/src/pcviews/service/copy.vue
+++ b/src/pcviews/service/copy.vue
@@ -3,7 +3,7 @@
* @Name: 打字复印
* @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-21 11:41:56
+ * @Last Modified time: 2021-12-30 14:31:00
*/
<template>
<div>
@@ -14,6 +14,9 @@
</template>
<script>
+
+import { mapGetters } from 'vuex'
+
export default {
data () {
return {
@@ -23,6 +26,23 @@
}
},
created () {
+ if (this.orgNavBarFlag == true) {
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
+ }
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
+ },
+ computed: {
+ ...mapGetters([
+ // 校内导航的显示关闭
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
+ ])
},
methods: {
closeModel () {
diff --git a/src/pcviews/service/express.vue b/src/pcviews/service/express.vue
index e19790a..a0059f4 100644
--- a/src/pcviews/service/express.vue
+++ b/src/pcviews/service/express.vue
@@ -3,7 +3,7 @@
* @Name: 邮寄快递
* @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-21 11:43:27
+ * @Last Modified time: 2021-12-30 14:31:05
*/
<template>
<div>
@@ -14,6 +14,9 @@
</template>
<script>
+
+import { mapGetters } from 'vuex'
+
export default {
data () {
return {
@@ -23,6 +26,23 @@
}
},
created () {
+ if (this.orgNavBarFlag == true) {
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
+ }
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
+ },
+ computed: {
+ ...mapGetters([
+ // 校内导航的显示关闭
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
+ ])
},
methods: {
closeModel () {
diff --git a/src/pcviews/service/medical.vue b/src/pcviews/service/medical.vue
index 96a18cb..4131e1c 100644
--- a/src/pcviews/service/medical.vue
+++ b/src/pcviews/service/medical.vue
@@ -3,7 +3,7 @@
* @Name: 校内医疗
* @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-21 11:42:06
+ * @Last Modified time: 2021-12-30 14:31:10
*/
<template>
<div>
@@ -14,6 +14,9 @@
</template>
<script>
+
+import { mapGetters } from 'vuex'
+
export default {
data () {
return {
@@ -23,6 +26,23 @@
}
},
created () {
+ if (this.orgNavBarFlag == true) {
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
+ }
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
+ },
+ computed: {
+ ...mapGetters([
+ // 校内导航的显示关闭
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
+ ])
},
methods: {
closeModel () {
diff --git a/src/pcviews/service/park.vue b/src/pcviews/service/park.vue
index 217933b..081b8b7 100644
--- a/src/pcviews/service/park.vue
+++ b/src/pcviews/service/park.vue
@@ -3,7 +3,7 @@
* @Name: 停车场
* @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-21 11:42:09
+ * @Last Modified time: 2021-12-30 14:31:15
*/
<template>
<div>
@@ -14,6 +14,9 @@
</template>
<script>
+
+import { mapGetters } from 'vuex'
+
export default {
data () {
return {
@@ -23,6 +26,23 @@
}
},
created () {
+ if (this.orgNavBarFlag == true) {
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
+ }
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
+ },
+ computed: {
+ ...mapGetters([
+ // 校内导航的显示关闭
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
+ ])
},
methods: {
closeModel () {
diff --git a/src/pcviews/service/service.vue b/src/pcviews/service/service.vue
index 071ccbc..26fd986 100644
--- a/src/pcviews/service/service.vue
+++ b/src/pcviews/service/service.vue
@@ -14,6 +14,9 @@
</template>
<script>
+
+import { mapGetters } from 'vuex'
+
export default {
data () {
return {
@@ -23,6 +26,23 @@
}
},
created () {
+ if (this.orgNavBarFlag == true) {
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
+ }
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
+ },
+ computed: {
+ ...mapGetters([
+ // 校内导航的显示关闭
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
+ ])
},
methods: {
closeModel () {
diff --git a/src/pcviews/service/showers.vue b/src/pcviews/service/showers.vue
index 474719d..d77eab5 100644
--- a/src/pcviews/service/showers.vue
+++ b/src/pcviews/service/showers.vue
@@ -3,7 +3,7 @@
* @Name: 学生浴室
* @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-21 11:42:15
+ * @Last Modified time: 2021-12-30 14:31:23
*/
<template>
<div>
@@ -14,6 +14,9 @@
</template>
<script>
+
+import { mapGetters } from 'vuex'
+
export default {
data () {
return {
@@ -23,6 +26,23 @@
}
},
created () {
+ if (this.orgNavBarFlag == true) {
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
+ }
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
+ },
+ computed: {
+ ...mapGetters([
+ // 校内导航的显示关闭
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
+ ])
},
methods: {
closeModel () {
diff --git a/src/pcviews/service/supermarket.vue b/src/pcviews/service/supermarket.vue
index 94c7345..701d327 100644
--- a/src/pcviews/service/supermarket.vue
+++ b/src/pcviews/service/supermarket.vue
@@ -3,7 +3,7 @@
* @Name: 购物超市
* @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-21 11:42:18
+ * @Last Modified time: 2021-12-30 14:31:31
*/
<template>
<div>
@@ -14,6 +14,9 @@
</template>
<script>
+
+import { mapGetters } from 'vuex'
+
export default {
data () {
return {
@@ -23,6 +26,23 @@
}
},
created () {
+ if (this.orgNavBarFlag == true) {
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
+ }
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
+ },
+ computed: {
+ ...mapGetters([
+ // 校内导航的显示关闭
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
+ ])
},
methods: {
closeModel () {
diff --git a/src/pcviews/service/transfer.vue b/src/pcviews/service/transfer.vue
index f460510..49b5d24 100644
--- a/src/pcviews/service/transfer.vue
+++ b/src/pcviews/service/transfer.vue
@@ -3,7 +3,7 @@
* @Name: 圈存机
* @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-22 11:21:20
+ * @Last Modified time: 2021-12-30 14:31:32
*/
<template>
<div>
@@ -14,6 +14,9 @@
</template>
<script>
+
+import { mapGetters } from 'vuex'
+
export default {
data () {
return {
@@ -23,6 +26,23 @@
}
},
created () {
+ if (this.orgNavBarFlag == true) {
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
+ }
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
+ },
+ computed: {
+ ...mapGetters([
+ // 校内导航的显示关闭
+ 'orgNavBarFlag',
+ 'arcNavBarFlag'
+ ])
},
methods: {
closeModel () {
diff --git a/src/store/getters.js b/src/store/getters.js
index e43c4e4..09bd2e4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -15,9 +15,9 @@
openmobilePanorama: state => state.mobile.openmobilePanorama,
MobileWindowsHideFixed: state => state.mobile.MobileWindowsHideFixed, // 固定窗口
MobileWindowChangeDataFixed: state => state.mobile.MobileWindowChangeDataFixed, // 固定窗口
- startPointFn: state => state.mobile.startPointFn,// 默认起始点位置
- dimension: state => state.mobile.dimension,// 维度
- perspectiveControl: state => state.mobile.perspectiveControl,///视角控制：高度、角度 ()=>{}
+ startPointFn: state => state.mobile.startPointFn, // 默认起始点位置
+ dimension: state => state.mobile.dimension, // 维度
+ perspectiveControl: state => state.mobile.perspectiveControl /// 视角控制：高度、角度 ()=>{}
}
const navigation = {
diff --git a/src/store/modules/mobile.js b/src/store/modules/mobile.js
index 2350f45..a32d25d 100644
--- a/src/store/modules/mobile.js
+++ b/src/store/modules/mobile.js
@@ -1,164 +1,162 @@
import $store from '../index'
const mobile = {
state: {
- mviewer: null,//地图实体类
- mBigPopup: false,//全屏弹窗
- popupOurOpenData: [],//全屏弹窗中下拉菜单数据
- popupTableName: [],//全屏弹窗标签页数据
- mBigPopupAfter: false,////全屏弹窗之前的弹窗
- ips: '',//获取的ip
- iconHide: false,//右侧伸缩状态
+ mviewer: null, // 地图实体类
+ mBigPopup: false, // 全屏弹窗
+ popupOurOpenData: [], // 全屏弹窗中下拉菜单数据
+ popupTableName: [], // 全屏弹窗标签页数据
+ mBigPopupAfter: false, /// /全屏弹窗之前的弹窗
+ ips: '', // 获取的ip
+ iconHide: false, // 右侧伸缩状态
// DC: '',//DC全局保存
- MobileWindowsHide: true,//改变点击窗口的显示状态
- MobileWindowChangeData: false,//改变点击窗口的数据
- popupsDom: '',//mobileDivForms的实体类
- query: {},//传输数据
- openmobileGoTo: false,//测试
- ccDataState: false,//测试
- openmobilePanorama: false,//实景显影
- MobileWindowsHideFixed: true,//改变点击窗口的显示状态--固定窗口
- MobileWindowChangeDataFixed: false,//改变点击窗口的数据--固定窗口
- //在每次飞行弹窗中 加入自己的点
+ MobileWindowsHide: true, // 改变点击窗口的显示状态
+ MobileWindowChangeData: false, // 改变点击窗口的数据
+ popupsDom: '', // mobileDivForms的实体类
+ query: {}, // 传输数据
+ openmobileGoTo: false, // 测试
+ ccDataState: false, // 测试
+ openmobilePanorama: false, // 实景显影
+ MobileWindowsHideFixed: true, // 改变点击窗口的显示状态--固定窗口
+ MobileWindowChangeDataFixed: false, // 改变点击窗口的数据--固定窗口
+ // 在每次飞行弹窗中 加入自己的点
pointLayer: null,
pointLayerData: {
flag: false,
- label: "选择点",
- img: "/img/leftnav/way.png",
- normal: "/img/leftnav/way.png",
- checked: "/img/leftnav/way-checked.png",
- layer: "pointLayer",
+ label: '选择点',
+ img: '/img/leftnav/way.png',
+ normal: '/img/leftnav/way.png',
+ checked: '/img/leftnav/way-checked.png',
+ layer: 'pointLayer'
},
- //默认起始点函数
+ // 默认起始点函数
startPointFn: '',
- dimension: "2D",// 维度
- perspectiveControl: '',//视角控制：高度、角度 ()=>{}
+ dimension: '2D', // 维度
+ perspectiveControl: '' // 视角控制：高度、角度 ()=>{}
},
mutations: {
- MSET_VIEWER(state, viewer) {
+ MSET_VIEWER (state, viewer) {
state.mviewer = viewer
},
- MSET_BIGPOPUP(state, viewer) {
- state.mBigPopup = viewer;
- $store.dispatch("closeMobileWindowsDom"); //关闭弹窗
+ MSET_BIGPOPUP (state, viewer) {
+ state.mBigPopup = viewer
+ $store.dispatch('closeMobileWindowsDom') // 关闭弹窗
},
- MSET_BIGPOPUPAFTER(state, viewer) {
- state.mBigPopupAfter = viewer;
- $store.dispatch("closeMobileWindowsDom"); //关闭弹窗
+ MSET_BIGPOPUPAFTER (state, viewer) {
+ state.mBigPopupAfter = viewer
+ $store.dispatch('closeMobileWindowsDom') // 关闭弹窗
},
- MSET_POPUPOUROPENDATA(state, viewer) {
- state.popupOurOpenData = viewer;
+ MSET_POPUPOUROPENDATA (state, viewer) {
+ state.popupOurOpenData = viewer
},
- MSET_ICONHIDE(state, viewer) {
+ MSET_ICONHIDE (state, viewer) {
state.iconHide = viewer
},
- MSET_POPUPTABLENAME(state, viewer) {
+ MSET_POPUPTABLENAME (state, viewer) {
state.popupTableName = viewer
},
- MSET_MOBILEWINDOWSHIDE(state, viewer) {//随地图移动窗口
- state.MobileWindowChangeData = !state.MobileWindowChangeData;
+ MSET_MOBILEWINDOWSHIDE (state, viewer) { // 随地图移动窗口
+ state.MobileWindowChangeData = !state.MobileWindowChangeData
state.MobileWindowsHide = viewer
},
- MSETCC_SETCC(state, viewer) {
- state.ccDataState = !state.ccDataState;//专门测试
- state.query = viewer;
- },
- MSET_POPUPDOM(state, viewer) {
- state.popupsDom = viewer
- },
- MSET_QUERY(state, viewer) {
+ MSETCC_SETCC (state, viewer) {
+ state.ccDataState = !state.ccDataState// 专门测试
state.query = viewer
},
- MSET_OPENMOBILEGOTO(state, viewer) {
+ MSET_POPUPDOM (state, viewer) {
+ state.popupsDom = viewer
+ },
+ MSET_QUERY (state, viewer) {
+ state.query = viewer
+ },
+ MSET_OPENMOBILEGOTO (state, viewer) {
state.openmobileGoTo = viewer
},
- MSET_OPENMOBILEPANORAMA(state, viewer) {
+ MSET_OPENMOBILEPANORAMA (state, viewer) {
state.openmobilePanorama = viewer
},
- MSET_MOBILEWINDOWSHIDEFIXED(state, viewer) {//固定窗口
- state.MobileWindowChangeDataFixed = !state.MobileWindowChangeDataFixed;
+ MSET_MOBILEWINDOWSHIDEFIXED (state, viewer) { // 固定窗口
+ state.MobileWindowChangeDataFixed = !state.MobileWindowChangeDataFixed
state.MobileWindowsHideFixed = viewer
- console.log(state.MobileWindowChangeDataFixed);
+ console.log(state.MobileWindowChangeDataFixed)
},
- //默认位置
- MSET_MORENWEIZHI(state, data) {
- state.startPointFn = data;
+ // 默认位置
+ MSET_MORENWEIZHI (state, data) {
+ state.startPointFn = data
},
- //开关飞入点图标
- MSET_OPENPOINTEL(state, val) {
+ // 开关飞入点图标
+ MSET_OPENPOINTEL (state, val) {
if (val) {
- state.pointLayerData.img = state.pointLayerData.checked;
- state[state.pointLayerData.layer].show = true;
+ state.pointLayerData.img = state.pointLayerData.checked
+ state[state.pointLayerData.layer].show = true
} else {
- state.pointLayerData.img = state.pointLayerData.normal;
- state[state.pointLayerData.layer].show = false;
+ state.pointLayerData.img = state.pointLayerData.normal
+ state[state.pointLayerData.layer].show = false
}
},
- //切换2D和2.5D
- MSET_DIMENSION(state, data) {
- state.dimension = data;
+ // 切换2D和2.5D
+ MSET_DIMENSION (state, data) {
+ state.dimension = data
},
- //切换控制
- MSET_PERSPECTIVECONTROL(state, data) {
- state.perspectiveControl = data;
+ // 切换控制
+ MSET_PERSPECTIVECONTROL (state, data) {
+ state.perspectiveControl = data
}
},
actions: {
- MSET_CREADE({ state, commit, dispatch }) {
- state.pointLayer = new global.DC.VectorLayer("pointLayer");//创建图标实体类
- state.mviewer.addLayer(state.pointLayer);//添加到地图
+ MSET_CREADE ({ state, commit, dispatch }) {
+ state.pointLayer = new global.DC.VectorLayer('pointLayer')// 创建图标实体类
+ state.mviewer.addLayer(state.pointLayer)// 添加到地图
},
- setMobileWindows({ state, commit, dispatch }, data) {//打开随地图移动窗口
+ setMobileWindows ({ state, commit, dispatch }, data) { // 打开随地图移动窗口
// 关闭前一个弹窗？
- dispatch("closeMobileWindowsDom");
- let clas, Flys;
+ dispatch('closeMobileWindowsDom')
+ let clas, Flys
- if (state.dimension == "2D") {
+ if (state.dimension == '2D') {
Flys = [
+data.lntLat[0] + 0.01197,
+data.lntLat[1] - 0.0001,
- 330,
+ 330
]
clas = [
- data.from == "PopupOurOnce" ? +data.lntLat[0] : +data.lntLat[0],
- data.from == "PopupOurOnce" ? +data.lntLat[1] - 0.00108 : +data.lntLat[1],
- data.from == "PopupOurOnce" ? 0 : 0,
+ data.from == 'PopupOurOnce' ? +data.lntLat[0] : +data.lntLat[0],
+ data.from == 'PopupOurOnce' ? +data.lntLat[1] - 0.00108 : +data.lntLat[1],
+ data.from == 'PopupOurOnce' ? 0 : 0
]
-
- } else if (state.dimension == "2.5D") {
+ } else if (state.dimension == '2.5D') {
Flys = [
+data.lntLat[0] + 0.01197,
+data.lntLat[1] - 0.0022,
- 330,
+ 330
]
clas = [
- data.from == "PopupOurOnce" ? +data.lntLat[0] : +data.lntLat[0],
- data.from == "PopupOurOnce" ? +data.lntLat[1] - 0.00108 : +data.lntLat[1] - 0.00048,
- data.from == "PopupOurOnce" ? 0 : 90.648862227,
+ data.from == 'PopupOurOnce' ? +data.lntLat[0] : +data.lntLat[0],
+ data.from == 'PopupOurOnce' ? +data.lntLat[1] - 0.00108 : +data.lntLat[1] - 0.00048,
+ data.from == 'PopupOurOnce' ? 0 : 90.648862227
]
}
-
if (data.useJWD) {
- var ellipsoid = state.mviewer.scene.globe.ellipsoid;
+ var ellipsoid = state.mviewer.scene.globe.ellipsoid
var cartographic = global.DC.Namespace.Cesium.Cartographic.fromDegrees(
// data.lntLat[0],
// data.lntLat[1] - 0.00048,//数值增大是下
// "90.648862227"
// clnt, clat, calt
...clas
- );
- data.position = ellipsoid.cartographicToCartesian(cartographic);
+ )
+ data.position = ellipsoid.cartographicToCartesian(cartographic)
}
// 传递响应数据
- commit("MSET_QUERY", data);
+ commit('MSET_QUERY', data)
// 定制化窗体
- let popupsDom = new global.DC.mobileDivForms(state.mviewer, {
- domId: "mobilePopup",
- title: data.query.name || "成教楼 ",
- className: "mobilePopup",
- content: document.getElementById("mobile-map_content_content"),
- position: [data.position],
- });
+ const popupsDom = new global.DC.mobileDivForms(state.mviewer, {
+ domId: 'mobilePopup',
+ title: data.query.name || '成教楼 ',
+ className: 'mobilePopup',
+ content: document.getElementById('mobile-map_content_content'),
+ position: [data.position]
+ })
// commit("MSET_MOBILEWINDOWSHIDE", false)//显示弹窗
// dispatch("CHANGETOC3", { // 转换坐标
// lnt: data.lntLat[0],
@@ -166,7 +164,7 @@
// }).then(res => {
// console.log(res)
- //基于高度基础设置
+ // 基于高度基础设置
// h：1530
// lnt： + 0.01187 x轴 大是向左
// Lat: - 0.0108 y轴 减是上
@@ -183,63 +181,62 @@
// data.query.from == "地图点击" ? 330 : 330,
// ]
-
- let Position = new global.DC.Position(//转坐标
+ const Position = new global.DC.Position(// 转坐标
// +data.lntLat[0] + 0.01197,
// +data.lntLat[1] - 0.0021,
// 330,
...Flys,
0,
- state.dimension == "2D" ? -90 : state.dimension == "2.5D" ? -45 : -45
- );
- dispatch("mapFlyTo", {//飞入
+ state.dimension == '2D' ? -90 : state.dimension == '2.5D' ? -45 : -45
+ )
+ dispatch('mapFlyTo', { // 飞入
lntLat: [Position.lng, Position.lat, Position.alt],
heading: Position.heading,
pitch: Position.pitch,
- roll: Position.roll,
+ roll: Position.roll
})
// })
- commit("MSET_POPUPDOM", popupsDom)
+ commit('MSET_POPUPDOM', popupsDom)
},
- closeMobileWindowsDom({ state, commit }) {
+ closeMobileWindowsDom ({ state, commit }) {
if (!state.MobileWindowsHide && state.popupsDom) {
- state.popupsDom.closeOur();
- commit("MSET_MOBILEWINDOWSHIDE", true);
+ state.popupsDom.closeOur()
+ commit('MSET_MOBILEWINDOWSHIDE', true)
}
},
- CHANGETOC3({ state, commit }, data) {// //转换经纬度坐标 成世界坐标cartesian3
- var ellipsoid = state.mviewer.scene.globe.ellipsoid;
+ CHANGETOC3 ({ state, commit }, data) { // //转换经纬度坐标 成世界坐标cartesian3
+ var ellipsoid = state.mviewer.scene.globe.ellipsoid
var cartographic = global.DC.Namespace.Cesium.Cartographic.fromDegrees(
data.lnt,
data.lat - 0.00006,
- data.alt || "90.648862227"
- );
- var position = ellipsoid.cartographicToCartesian(cartographic);
- return position;
+ data.alt || '90.648862227'
+ )
+ var position = ellipsoid.cartographicToCartesian(cartographic)
+ return position
},
- SET_OPENWIDOWFIXED({ state, commit }, data) {
+ SET_OPENWIDOWFIXED ({ state, commit }, data) {
// 传递响应数据
- commit("MSET_QUERY", data);
- //显示窗口
- commit("MSET_MOBILEWINDOWSHIDEFIXED", false)
- //移动地图位置
+ commit('MSET_QUERY', data)
+ // 显示窗口
+ commit('MSET_MOBILEWINDOWSHIDEFIXED', false)
+ // 移动地图位置
state.mviewer.zoomToPosition(
new global.DC.Position(data.lntLat[0], data.lntLat[1] - 0.012, 1530, 0, -45)
- );
+ )
},
- CLOSE_WIDOWFIXED({ state, commit }) {
- //隐藏窗口
+ CLOSE_WIDOWFIXED ({ state, commit }) {
+ // 隐藏窗口
if (!state.MobileWindowsHideFixed) {
console.log(state.MobileWindowsHideFixed)
- commit("MSET_MOBILEWINDOWSHIDEFIXED", true)
+ commit('MSET_MOBILEWINDOWSHIDEFIXED', true)
}
},
- //加入当时的选点
- JOIN_POINT({ state, commit }, data) {
+ // 加入当时的选点
+ JOIN_POINT ({ state, commit }, data) {
},
- //flyTo
- mapFlyTo({ state, commit, dispatch }, data) {
+ // flyTo
+ mapFlyTo ({ state, commit, dispatch }, data) {
state.mviewer.camera.flyTo({
destination: global.DC.Namespace.Cesium.Cartesian3.fromDegrees(
data.lntLat[0] - 0.012, data.lntLat[1],
@@ -253,23 +250,23 @@
// pitch: data.pitch,
roll: data.roll
},
- duration: 1.6, //定位的时间间隔
- complete: () => {//完成后的回调
- if (data.fn) {//自定义回调
+ duration: 1.6, // 定位的时间间隔
+ complete: () => { // 完成后的回调
+ if (data.fn) { // 自定义回调
setTimeout(() => {
data.fn()
- }, 500);
+ }, 500)
}
if (!data.noOpen) {
setTimeout(() => {
// dispatch("MSET_POINTDATA", data.lntLat);//传入标记点
!state.MobileWindowsHide ||
- commit("MSET_MOBILEWINDOWSHIDE", false)//显示弹窗
- }, 0);
+ commit('MSET_MOBILEWINDOWSHIDE', false)// 显示弹窗
+ }, 0)
}
}
- });
- //官网flyto使用方法
+ })
+ // 官网flyto使用方法
// 1. Fly to a position with a top-down view
// viewer.camera.flyTo({
// destination : Cesium.Cartesian3.fromDegrees(-117.16, 32.71, 15000.0)
@@ -300,38 +297,38 @@
// });
},
// 飞入点加入位置
- MSET_POINTDATA({ state, commit, dispatch }, data) {
- //加入坐标
- const positions = new global.DC.Position(data[0] - 0.0119, data[1] + 0.0111, 0);
+ MSET_POINTDATA ({ state, commit, dispatch }, data) {
+ // 加入坐标
+ const positions = new global.DC.Position(data[0] - 0.0119, data[1] + 0.0111, 0)
const billboard = new global.DC.Billboard(
positions,
- "/img/leftnav/map-panorama.png"
- );
- billboard.size = [16, 16];
- //订阅事件3
+ '/img/leftnav/map-panorama.png'
+ )
+ billboard.size = [16, 16]
+ // 订阅事件3
billboard.on(DC.MouseEventType.CLICK, (e) => {
// 定制化窗体
console.log(e)
- let query = { name: "选择点" },
- intLat = [e.wgs84Position.lng, e.wgs84Position.lat];
- let d = {
+ const query = { name: '选择点' }
+ const intLat = [e.wgs84Position.lng, e.wgs84Position.lat]
+ const d = {
position: null,
lntLat: intLat,
query: { ...(query || {}), introduce: null, address: intLat },
- useJWD: true, //仅使用经纬度
- };
- dispatch("setMobileWindows", d);
- });
- state.pointLayer.addOverlay(billboard); //实景
+ useJWD: true // 仅使用经纬度
+ }
+ dispatch('setMobileWindows', d)
+ })
+ state.pointLayer.addOverlay(billboard) // 实景
// commit("MSET_OPENPOINTEL", true);
},
- MSET_LOCKPERSPECTIVEL({ state, commit, dispatch }, val) {
- //锁定
+ MSET_LOCKPERSPECTIVEL ({ state, commit, dispatch }, val) {
+ // 锁定
state.mviewer.camera.lookAtTransform(global.DC.Namespace.Cesium.Matrix4.IDENTITY)
// console.log(global.DC.Namespace.Cesium.Matrix4.IDENTITY)
},
- MSET_DIMENSIONS({ state, commit, dispatch }, val) {
- commit("MSET_DIMENSION", val);
+ MSET_DIMENSIONS ({ state, commit, dispatch }, val) {
+ commit('MSET_DIMENSION', val)
}
}
}
diff --git a/src/store/modules/viewer.js b/src/store/modules/viewer.js
index dd07d31..089c0ad 100644
--- a/src/store/modules/viewer.js
+++ b/src/store/modules/viewer.js
@@ -1,15 +1,39 @@
const viewer = {
state: {
- viewer: null
+ viewer: null,
+ visitedViews: [],
+ cachedViews: []
},
mutations: {
SET_VIEWER (state, viewer) {
- // console.log(viewer, 456)
state.viewer = viewer
+ },
+ DEL_VISITED_VIEWS: (state, view) => {
+ for (const [i, v] of state.visitedViews.entries()) {
+ if (v.path === view.path) {
+ state.visitedViews.splice(i, 1)
+ break
+ }
+ }
+ for (const i of state.cachedViews) {
+ if (i === view.name) {
+ const index = state.cachedViews.indexOf(i)
+ state.cachedViews.splice(index, 1)
+ break
+ }
+ }
}
},
actions: {
-
+ delVisitedViews ({
+ commit,
+ state
+ }, view) {
+ return new Promise((resolve) => {
+ commit('DEL_VISITED_VIEWS', view)
+ resolve([...state.visitedViews])
+ })
+ }
}
}
diff --git a/src/styles/pcpage/dc-ui.scss b/src/styles/pcpage/dc-ui.scss
index 5020a38..6bc3d01 100644
--- a/src/styles/pcpage/dc-ui.scss
+++ b/src/styles/pcpage/dc-ui.scss
@@ -20,4 +20,14 @@
fill: #2196f3;
}
+ .dc-hawkeye-map {
+ left: auto;
+ right: 16px;
+ bottom: 16px;
+ }
+
+ .dc-compass .gyro {
+ fill: #2196f3;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3