From 6bf300a2b2660bd2ec0251f35c0de24760b33e12 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 20 Jan 2022 11:30:23 +0800
Subject: [PATCH] 部分修改
---
src/router/page/index.js | 2
src/components/map/components/dimension.vue | 70 +++++------
src/pcLayout/index.vue | 26 ++--
src/styles/entitys/text-entitys.scss | 16 ++
public/img/icon/bigScreen.png | 0
src/components/arcNavBar/index.vue | 2
src/components/mobilePopupOurAfter/index.vue | 2
src/router/axios.js | 4
src/components/map/index.vue | 2
src/components/serviceNavBar/index.vue | 2
src/pcviews/arc/rest.vue | 4
src/components/leftNav/index.vue | 6
public/img/icon/smallScreen.png | 0
src/styles/divforms/panoramaBox.scss | 36 +++++
src/styles/pcpage/element-ui.scss | 2
src/components/map/components/mapPopup.vue | 174 +++++++++++++++++++++-------
16 files changed, 236 insertions(+), 112 deletions(-)
diff --git a/public/img/icon/bigScreen.png b/public/img/icon/bigScreen.png
new file mode 100644
index 0000000..08d20db
--- /dev/null
+++ b/public/img/icon/bigScreen.png
Binary files differ
diff --git a/public/img/icon/smallScreen.png b/public/img/icon/smallScreen.png
new file mode 100644
index 0000000..23a2082
--- /dev/null
+++ b/public/img/icon/smallScreen.png
Binary files differ
diff --git a/src/components/arcNavBar/index.vue b/src/components/arcNavBar/index.vue
index 331409e..ab1570c 100644
--- a/src/components/arcNavBar/index.vue
+++ b/src/components/arcNavBar/index.vue
@@ -19,7 +19,7 @@
@click="closeModel">
</div>
<div class="content">
- <div class="tab">
+ <div class="tab" v-show="false">
<ul>
<li :class="{'on': item.flag}"
v-for="(item, index) in titleList"
diff --git a/src/components/leftNav/index.vue b/src/components/leftNav/index.vue
index c1be958..3d2d91d 100644
--- a/src/components/leftNav/index.vue
+++ b/src/components/leftNav/index.vue
@@ -221,11 +221,13 @@
getSceneList().then(res => {
res.data.data.forEach(item => {
- console.log(item, 123)
const divIcon = new this.DC.DivIcon(
new that.DC.Position(Number(item.jd), Number(item.wd), 0),
`
- <img class="scene-entitys-box" src="/img/leftnav/map-panorama.png" alt="">
+ <div class="scene-entitys-box">
+ <div>${item.mechanismname}</div>
+ <img src="/img/leftnav/map-panorama.png" alt="">
+ </div>
`
)
divIcon.attrParams = item
diff --git a/src/components/map/components/dimension.vue b/src/components/map/components/dimension.vue
index 630f1e1..5b9fb52 100644
--- a/src/components/map/components/dimension.vue
+++ b/src/components/map/components/dimension.vue
@@ -35,39 +35,34 @@
titlesetLayerFlag: false,
silhouetteBlue: null,
wallArr: [
- [116.41526036, 27.95352217, 100],
- [116.41128018, 27.95789328, 100],
- [116.40246486, 27.96397110, 100],
- [116.39728537, 27.96779573, 100],
- [116.39588026, 27.96862679, 100],
- [116.38903705, 27.97029865, 100],
- [116.38872398, 27.97051829, 100],
- [116.38892229, 27.97090120, 100],
- [116.38906721, 27.97190632, 100],
- [116.38706808, 27.97195638, 100],
- [116.38649076, 27.97114448, 100],
- [116.38214070, 27.97312735, 100],
- [116.37876213, 27.97582549, 100],
- [116.37851310, 27.97664153, 100],
- [116.37634915, 27.98039526, 100],
- [116.37439220, 27.98131916, 100],
- [116.36995935, 27.97936074, 100],
- [116.37217247, 27.97498147, 100],
- [116.35099819, 27.97539586, 100],
- [116.35103749, 27.98088050, 100],
- [116.33972460, 27.97987911, 100],
- [116.33950071, 27.97372028, 100],
- [116.32313266, 27.97004136, 100],
- [116.32606743, 27.95863979, 100],
- [116.34788837, 27.92538024, 100],
- [116.34566310, 27.92338627, 100],
- [116.34874490, 27.91718915, 100],
- [116.35311999, 27.91804451, 100],
- [116.35109257, 27.92284807, 100],
- [116.35975153, 27.92900526, 100],
- [116.35660704, 27.93816236, 100],
- [116.39585177, 27.93945304, 100],
- [116.41526036, 27.95352217, 100]
+ [114.04006133, 27.62803800, 100],
+ [114.04020623, 27.62809403, 100],
+ [114.04025389, 27.62819931, 100],
+ [114.04032823, 27.62827743, 100],
+ [114.04108710, 27.62918798, 100],
+ [114.04001425, 27.62986815, 100],
+ [114.04001615, 27.62986817, 100],
+ [114.03992451, 27.62998379, 100],
+ [114.03967878, 27.62999684, 100],
+ [114.03940001, 27.63008698, 100],
+ [114.03951075, 27.63047135, 100],
+ [114.03946107, 27.63056152, 100],
+ [114.03927571, 27.63072325, 100],
+ [114.03871751, 27.63128845, 100],
+ [114.03872079, 27.63135594, 100],
+ [114.03869211, 27.63139169, 100],
+ [114.03960653, 27.63200726, 100],
+ [114.03945732, 27.63215207, 100],
+ [114.03760837, 27.63092563, 100],
+ [114.03770336, 27.63078037, 100],
+ [114.03782957, 27.63072932, 100],
+ [114.03787347, 27.63068209, 100],
+ [114.03824591, 27.62887902, 100],
+ [114.03837943, 27.62891050, 100],
+ [114.03863853, 27.62868839, 100],
+ [114.03905656, 27.62843592, 100],
+ [114.03954722, 27.62819644, 100],
+ [114.04006133, 27.62803800, 100]
]
}
},
@@ -206,7 +201,10 @@
var provider = new that.DC.Namespace.Cesium.UrlTemplateImageryProvider({
url: '/wp/{z}/{x}/{y}.png',
- fileExtension: 'png'
+ fileExtension: 'png',
+ tileHeight: 52,
+ tileWidth: 52
+ // minimumLevel: 19
})
var baseProvider = new that.DC.Namespace.Cesium.UrlTemplateImageryProvider({
@@ -218,7 +216,7 @@
that.newLayer = that.viewer.imageryLayers.addImageryProvider(provider)
that.wallLayer = new that.DC.VectorLayer('wallLayer')
- // that.viewer.addLayer(that.wallLayer)
+ that.viewer.addLayer(that.wallLayer)
that.wallArr.forEach(item => {
item = item.join(',')
@@ -234,7 +232,7 @@
speed: 10
})
})
- // that.wallLayer.addOverlay(wall)
+ that.wallLayer.addOverlay(wall)
// that.viewer.camera.setView({
// // Cesium的坐标是以地心为原点，一向指向南美洲，一向指向亚洲，一向指向北极州
diff --git a/src/components/map/components/mapPopup.vue b/src/components/map/components/mapPopup.vue
index 675dd4e..78e94f7 100644
--- a/src/components/map/components/mapPopup.vue
+++ b/src/components/map/components/mapPopup.vue
@@ -4,7 +4,7 @@
<div v-if="detailsPopup"
class="divForms-dom"
id="divFormsDomBox">
- <div style='width: 100%; height: 100%;'>
+ <div style="width: 100%; height: 100%;">
<div class="divForms divForms-theme">
<div class="divForms-wrap">
<div class="area">
@@ -16,31 +16,31 @@
<div class="arrow-rb"></div>
<div class="label-wrap">
<div class="title">
- {{stateName}}
+ {{ stateName }}
<img v-show="introduceText != null && introduceText != ''"
@click="audioPlay"
class="audio-control"
src="/img/navicon/audio.png"
- alt="">
+ alt="" />
<img @click="closeMapPopupBox"
class="close-box"
src="/img/navicon/close.png"
- alt="">
+ alt="" />
</div>
<div class="label-content">
<div class="arc-bcg">
<img :src="popupBgUrl"
- alt="">
+ alt="" />
</div>
<div v-show="siteName != null && siteName != ''"
class="site">
<strong>地址：</strong>
- {{siteName}}
+ {{ siteName }}
</div>
<div v-show="telephone != null && telephone != ''"
class="phone">
<strong>电话：</strong>
- {{telephone}}
+ {{ telephone }}
</div>
<div v-show="introduceText != null && introduceText != ''"
class="introduce">
@@ -83,30 +83,34 @@
class="arc-box">
<ul class="tab-btn">
<li v-show="teachList.length > 0"
- :class="{'on': tabBtnFlag == '教学科研行政'}"
- @click="tabBtnClick('教学科研行政')">教学科研行政</li>
+ :class="{ on: tabBtnFlag == '教学科研行政' }"
+ @click="tabBtnClick('教学科研行政')">
+ 教学科研行政
+ </li>
<li v-show="liveList.length > 0"
- :class="{'on': tabBtnFlag == '生活服务'}"
- @click="tabBtnClick('生活服务')">生活服务</li>
+ :class="{ on: tabBtnFlag == '生活服务' }"
+ @click="tabBtnClick('生活服务')">
+ 生活服务
+ </li>
</ul>
<div class="btm-content">
- <div :class="{'on': tabBtnFlag == '教学科研行政'}">
+ <div :class="{ on: tabBtnFlag == '教学科研行政' }">
<ul>
<li v-for="(item, index) in teachList"
:key="index"
@click="mechanismDetailPopup(0, item)">
<i class="popup-icon location-icon deblurring"></i>
- {{item}}
+ {{ item }}
</li>
</ul>
</div>
- <div :class="{'on': tabBtnFlag == '生活服务'}">
+ <div :class="{ on: tabBtnFlag == '生活服务' }">
<ul>
<li v-for="(item, index) in liveList"
:key="index"
@click="mechanismDetailPopup(1, item)">
<i class="popup-icon location-icon deblurring"></i>
- {{item}}
+ {{ item }}
</li>
</ul>
</div>
@@ -132,14 +136,21 @@
<div class="panorama-wrap">
<div class="content-wrap">
<div class="title">
- {{stateName}}
+ {{ stateName }}
<img @click="closePanoramaPopupBox"
class="close-box"
src="/img/navicon/close.png"
- alt="">
+ alt="" />
</div>
- <div class="content">
- <iframe :src="panoramaUrl"
+ <div class="content"
+ id="FullScreenBox">
+ <button type="button"
+ @click="screen">
+ <img :src="fullScreenUrl"
+ alt="" />
+ </button>
+ <iframe allowfullscreen="true"
+ :src="panoramaUrl"
frameborder="0"></iframe>
</div>
</div>
@@ -157,11 +168,11 @@
<div class="monitor-wrap">
<div class="content-wrap">
<div class="title">
- {{stateName}}
+ {{ stateName }}
<img @click="closeMonitorPopupBox"
class="close-box"
src="/img/navicon/close.png"
- alt="">
+ alt="" />
</div>
<div class="content">
<video :src="monitorUrl"
@@ -181,7 +192,7 @@
:visible.sync="QRCodeFlag"
:modal="false"
:modal-append-to-body="false"
- width='44%'>
+ width="44%">
<div style="margin: 0; position: relative; width: 100%; height: 352px;">
<img width="260"
:src="pupupQRUrl"
@@ -191,7 +202,7 @@
left: 0;
right: 0;
bottom: 0;
- margin: auto">
+ margin: auto" />
<div style="position: absolute; bottom: 0; width: 100%; line-height: 36px; text-align: center;">
(右键另存为图片)
</div>
@@ -222,7 +233,9 @@
audioFlag: false,
audioCourse: false,
audioSynth: null,
- audioMsg: null
+ audioMsg: null,
+ fullscreen: false,
+ fullScreenUrl: '/img/icon/bigScreen.png'
}
},
computed: {
@@ -276,6 +289,33 @@
this.audioCourse = false
}
},
+ mounted () {
+ var that = this
+ this.$nextTick(() => {
+ window.onresize = function () {
+ if (!checkFull()) {
+ // 要执行的动作
+ that.fullScreenUrl = '/img/icon/bigScreen.png'
+
+ if (document.documentElement.requestFullScreen) {
+ document.exitFullScreen()
+ } else if (document.documentElement.webkitRequestFullScreen) {
+ document.webkitCancelFullScreen()
+ } else if (document.documentElement.mozRequestFullScreen) {
+ document.mozCancelFullScreen()
+ }
+ that.fullscreen = false
+ }
+ }
+
+ function checkFull () {
+ return document.fullscreenElement ||
+ document.msFullscreenElement ||
+ document.mozFullScreenElement ||
+ document.webkitFullscreenElement || false
+ }
+ })
+ },
watch: {
introduceText: {
immediate: true,
@@ -322,6 +362,33 @@
}
},
methods: {
+ screen () {
+ const element = document.getElementById('FullScreenBox')
+ if (this.fullscreen) {
+ this.fullScreenUrl = '/img/icon/bigScreen.png'
+ this.fullscreen = !this.fullscreen
+
+ if (document.documentElement.requestFullScreen) {
+ document.exitFullScreen()
+ } else if (document.documentElement.webkitRequestFullScreen) {
+ document.webkitCancelFullScreen()
+ } else if (document.documentElement.mozRequestFullScreen) {
+ document.mozCancelFullScreen()
+ }
+ } else {
+ this.fullScreenUrl = '/img/icon/smallScreen.png'
+ this.fullscreen = !this.fullscreen
+
+ if (element.requestFullScreen) {
+ element.requestFullScreen()
+ } else if (element.webkitRequestFullScreen) {
+ element.webkitRequestFullScreen()
+ } else if (element.mozRequestFullScreen) {
+ element.mozRequestFullScreen()
+ }
+ }
+ },
+
tabBtnClick (param) {
this.tabBtnFlag = param
},
@@ -329,13 +396,17 @@
comeHereClick () {
this.$store.commit('SET_COMENAME', this.stateName)
this.$store.commit('SET_TERMINUS', this.pointPosition)
- if (this.campusNavFlag == false) this.$store.commit('SET_CAMPUSNAVFLAG', true)
+ if (this.campusNavFlag == false) {
+ this.$store.commit('SET_CAMPUSNAVFLAG', true)
+ }
},
getToHereClick () {
this.$store.commit('SET_GETTONAME', this.stateName)
this.$store.commit('SET_STARTINGPOINT', this.pointPosition)
- if (this.campusNavFlag == false) this.$store.commit('SET_CAMPUSNAVFLAG', true)
+ if (this.campusNavFlag == false) {
+ this.$store.commit('SET_CAMPUSNAVFLAG', true)
+ }
},
qrCodeClick () {
@@ -354,14 +425,14 @@
}
// eslint-disable-next-line new-cap
- var positions = this.DC.Transform.transformWGS84ToCartesian(new this.DC.Position.fromArray(this.pointPosition))
+ var positions = this.DC.Transform.transformWGS84ToCartesian(
+ new this.DC.Position.fromArray(this.pointPosition)
+ )
this.viewer.scene.globe.depthTestAgainstTerrain = false
// eslint-disable-next-line no-unused-vars
var panorama = new this.DC.PanoramaBox(this.viewer, {
domId: 'PanoramaBox',
- position: [
- positions
- ]
+ position: [positions]
})
this.$store.commit('SET_DETAILSPOPUP', false)
@@ -376,14 +447,14 @@
this.audioCourse = false
}
// eslint-disable-next-line new-cap
- var positions = this.DC.Transform.transformWGS84ToCartesian(new this.DC.Position.fromArray(this.pointPosition))
+ var positions = this.DC.Transform.transformWGS84ToCartesian(
+ new this.DC.Position.fromArray(this.pointPosition)
+ )
this.viewer.scene.globe.depthTestAgainstTerrain = false
// eslint-disable-next-line no-unused-vars
var monitor = new this.DC.PanoramaBox(this.viewer, {
domId: 'MonitorBox',
- position: [
- positions
- ]
+ position: [positions]
})
this.$store.commit('SET_PANORAMAPOPUP', false)
this.$store.commit('SET_DETAILSPOPUP', false)
@@ -427,7 +498,7 @@
},
mechanismDetailPopup (num, param) {
- getMechanismDetail({ num: num, mechanismName: param }).then(res => {
+ getMechanismDetail({ num: num, mechanismName: param }).then((res) => {
var result = res.data.data
this.$store.commit('CLEAR_ALL', null)
@@ -435,7 +506,14 @@
this.$store.commit('SET_POPUPBGURL', imgArr[0])
this.$store.commit('SET_POPUPQRURL', result.codeurl)
- this.$store.commit('SET_POINTPOSITION', [Number(result.jd), Number(result.wd), Number(result.gd), Number(result.heading), Number(result.pitch), Number(result.roll)])
+ this.$store.commit('SET_POINTPOSITION', [
+ Number(result.jd),
+ Number(result.wd),
+ Number(result.gd),
+ Number(result.heading),
+ Number(result.pitch),
+ Number(result.roll)
+ ])
this.$store.commit('SET_STATENAME', result.mechanismname)
this.$store.commit('SET_SITENAME', result.address)
this.$store.commit('SET_TELEPHONE', result.telephone)
@@ -448,22 +526,28 @@
this.newPopup(result)
this.viewer.flyToPosition(
- new this.DC.Position(Number(result.jd), Number(result.wd), 300, Number(result.heading), Number(result.pitch), Number(result.roll)),
- function () {
- },
+ new this.DC.Position(
+ Number(result.jd),
+ Number(result.wd),
+ 300,
+ Number(result.heading),
+ Number(result.pitch),
+ Number(result.roll)
+ ),
+ function () { },
3
)
})
},
newPopup (item) {
- const position = this.DC.Transform.transformWGS84ToCartesian(new this.DC.Position(Number(item.jd), Number(item.wd), Number(item.gd)))
+ const position = this.DC.Transform.transformWGS84ToCartesian(
+ new this.DC.Position(Number(item.jd), Number(item.wd), Number(item.gd))
+ )
// eslint-disable-next-line no-unused-vars
var popup = new this.DC.DivForms(this.viewer, {
domId: 'divFormsDomBox',
- position: [
- position
- ]
+ position: [position]
})
this.$store.commit('SET_PANORAMAPOPUP', false)
@@ -471,9 +555,7 @@
this.$store.commit('SET_DETAILSPOPUP', true)
}
}
-
}
</script>
-<style>
-</style>
+<style></style>
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 845f5a2..8c895c0 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -290,7 +290,7 @@
viewer.compass.enable = true
viewer.zoomController.enable = true
- // viewer.locationBar.enable = true
+ viewer.locationBar.enable = true
viewer.hawkeyeMap.enable = true
viewer.hawkeyeMap.addBaseLayer(
that.DC.ImageryLayerFactory.createAmapImageryLayer(
diff --git a/src/components/mobilePopupOurAfter/index.vue b/src/components/mobilePopupOurAfter/index.vue
index 2209fc8..c0fbf14 100644
--- a/src/components/mobilePopupOurAfter/index.vue
+++ b/src/components/mobilePopupOurAfter/index.vue
@@ -110,7 +110,7 @@
{ name: "宿舍公寓", type: 4, method: getChildNavList },
{ name: "文化风景", type: 5, method: getChildNavList },
{ name: "家属住宅", type: 6, method: getChildNavList },
- { name: "其他楼宇", type: 7, method: getChildNavList },
+ { name: "主要楼宇", type: 7, method: getChildNavList },
],
// openData3: [
// { name: "食堂餐厅", type: 1, method: getListlivingFacilitiesr },
diff --git a/src/components/serviceNavBar/index.vue b/src/components/serviceNavBar/index.vue
index 153a478..c2ae03a 100644
--- a/src/components/serviceNavBar/index.vue
+++ b/src/components/serviceNavBar/index.vue
@@ -19,7 +19,7 @@
@click="closeModel">
</div>
<div class="content">
- <div class="tab">
+ <div class="tab" v-show="false">
<ul>
<li :class="{'on': item.flag}"
v-for="(item, index) in titleList"
diff --git a/src/pcLayout/index.vue b/src/pcLayout/index.vue
index 5e57722..e1016e0 100644
--- a/src/pcLayout/index.vue
+++ b/src/pcLayout/index.vue
@@ -18,32 +18,32 @@
<el-submenu index="orgnav">
<template slot="title"> <i class='custom-icon menu-jg'></i> 社区内机构导览</template>
- <el-menu-item index="/pcLayout/default/orgnav/masses">党群机构</el-menu-item>
- <el-menu-item index="/pcLayout/default/orgnav/ofc">职能部处</el-menu-item>
- <el-menu-item index="/pcLayout/default/orgnav/directly">直属及附属单位</el-menu-item>
- <el-menu-item index="/pcLayout/default/orgnav/teaching">教学与科研机构</el-menu-item>
+ <!-- <el-menu-item index="/pcLayout/default/orgnav/masses">党群机构</el-menu-item> -->
+ <!-- <el-menu-item index="/pcLayout/default/orgnav/ofc">职能部处</el-menu-item> -->
+ <!-- <el-menu-item index="/pcLayout/default/orgnav/directly">直属及附属单位</el-menu-item> -->
+ <!-- <el-menu-item index="/pcLayout/default/orgnav/teaching">教学与科研机构</el-menu-item> -->
<el-menu-item index="/pcLayout/default/orgnav/rest">其他机构</el-menu-item>
</el-submenu>
<el-submenu index="arc">
- <template slot="title"> <i class='custom-icon menu-xyjz'></i> 社区内建筑</template>
+ <template slot="title"> <i class='custom-icon menu-xyjz'></i> 社区建筑</template>
<el-menu-item index="/pcLayout/default/arc/edifact">行政办公</el-menu-item>
- <el-menu-item index="/pcLayout/default/arc/teaching">教学科研</el-menu-item>
+ <!-- <el-menu-item index="/pcLayout/default/arc/teaching">教学科研</el-menu-item> -->
<el-menu-item index="/pcLayout/default/arc/venue">社区场馆</el-menu-item>
- <el-menu-item index="/pcLayout/default/arc/dorm">社区宿舍</el-menu-item>
- <el-menu-item index="/pcLayout/default/arc/culture">文化风景</el-menu-item>
- <el-menu-item index="/pcLayout/default/arc/family">家属住宅</el-menu-item>
- <el-menu-item index="/pcLayout/default/arc/rest">其他楼宇</el-menu-item>
+ <!-- <el-menu-item index="/pcLayout/default/arc/dorm">社区宿舍</el-menu-item> -->
+ <!-- <el-menu-item index="/pcLayout/default/arc/culture">文化风景</el-menu-item> -->
+ <!-- <el-menu-item index="/pcLayout/default/arc/family">家属住宅</el-menu-item> -->
+ <el-menu-item index="/pcLayout/default/arc/rest">主要楼宇</el-menu-item>
</el-submenu>
<el-submenu index="service">
<template slot="title"> <i class='custom-icon menu-shfw'></i> 生活服务设施</template>
- <el-menu-item index="/pcLayout/default/service/canteen">食堂餐厅</el-menu-item>
+ <!-- <el-menu-item index="/pcLayout/default/service/canteen">食堂餐厅</el-menu-item> -->
<el-menu-item index="/pcLayout/default/service/supermarket">购物超市</el-menu-item>
- <el-menu-item index="/pcLayout/default/service/medical">社区内医疗</el-menu-item>
+ <el-menu-item index="/pcLayout/default/service/medical">社区医疗</el-menu-item>
<el-menu-item index="/pcLayout/default/service/express">邮寄快递</el-menu-item>
<el-menu-item index="/pcLayout/default/service/showers">社区浴室</el-menu-item>
- <el-menu-item index="/pcLayout/default/service/transfer">圈存机</el-menu-item>
+ <!-- <el-menu-item index="/pcLayout/default/service/transfer">圈存机</el-menu-item> -->
<el-menu-item index="/pcLayout/default/service/copy">打字复印</el-menu-item>
<el-menu-item index="/pcLayout/default/service/bank">银行网点</el-menu-item>
<el-menu-item index="/pcLayout/default/service/aed">AED</el-menu-item>
diff --git a/src/pcviews/arc/rest.vue b/src/pcviews/arc/rest.vue
index 52c47de..010718a 100644
--- a/src/pcviews/arc/rest.vue
+++ b/src/pcviews/arc/rest.vue
@@ -1,6 +1,6 @@
/*
* @Author: Morpheus
- * @Name: 其他楼宇
+ * @Name: 主要楼宇
* @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
* @Last Modified time: 2021-12-30 14:25:28
@@ -34,7 +34,7 @@
this.$store.commit('SET_ORGNAVBARLIST', [])
this.$store.commit('SET_ORGNAVBARFLAG', false)
}
- this.$store.commit('SET_ARCNAVBARTITLE', '其他楼宇')
+ this.$store.commit('SET_ARCNAVBARTITLE', '主要楼宇')
this.$store.commit('SET_ARCNAVBARCODE', 7)
this.$store.commit('SET_ARCNAVBARFLAG', true)
},
diff --git a/src/router/axios.js b/src/router/axios.js
index 27b341f..0280389 100644
--- a/src/router/axios.js
+++ b/src/router/axios.js
@@ -9,8 +9,8 @@
const service = axios.create({
// baseURL: 'http://192.168.0.107:83',
- // baseURL: 'http://192.168.0.107:80',
- baseURL: 'http://171.34.197.243:790',
+ baseURL: 'http://192.168.0.107:80',
+ // baseURL: 'http://171.34.197.243:790',
// baseURL: 'http://s16s652780.51mypc.cn/api',
timeout: 600000 // request timeout
})
diff --git a/src/router/page/index.js b/src/router/page/index.js
index abba127..95de071 100644
--- a/src/router/page/index.js
+++ b/src/router/page/index.js
@@ -122,7 +122,7 @@
path: 'rest',
component: resolve => require(['../../pcviews/arc/rest.vue'], resolve),
meta: {
- title: '其他楼宇'
+ title: '主要楼宇'
}
}
]
diff --git a/src/styles/divforms/panoramaBox.scss b/src/styles/divforms/panoramaBox.scss
index 09fda12..ca23a0e 100644
--- a/src/styles/divforms/panoramaBox.scss
+++ b/src/styles/divforms/panoramaBox.scss
@@ -34,12 +34,40 @@
cursor: pointer;
}
}
+
+ .content {
+ position: relative;
+ min-width: 460px;
+ min-height: 320px;
+
+ button {
+ padding: 2px;
+ position: absolute;
+ top: 4px;
+ right: 4px;
+ width: 32px;
+ height: 32px;
+ background: rgba(0, 0, 0, .2) !important;
+ z-index: 1;
+ border: 0;
+ border-radius: 5px;
+
+ img {
+ width: 100%;
+ }
+ }
+
+ iframe {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ }
+ }
}
- iframe {
- width: 460px;
- height: 320px;
- }
+
}
.arrow {
diff --git a/src/styles/entitys/text-entitys.scss b/src/styles/entitys/text-entitys.scss
index f5a3dc7..830f430 100644
--- a/src/styles/entitys/text-entitys.scss
+++ b/src/styles/entitys/text-entitys.scss
@@ -130,7 +130,21 @@
}
}
-.scene-entitys-box,
.monitor-entitys-box {
height: 40px;
+}
+
+
+.scene-entitys-box {
+
+ div {
+ line-height: 24px;
+ text-align: center;
+ font-weight: 700;
+ color: #009bff;
+ }
+
+ img {
+ height: 40px;
+ }
}
\ No newline at end of file
diff --git a/src/styles/pcpage/element-ui.scss b/src/styles/pcpage/element-ui.scss
index f354e8e..75add93 100644
--- a/src/styles/pcpage/element-ui.scss
+++ b/src/styles/pcpage/element-ui.scss
@@ -34,7 +34,7 @@
left: 0;
height: 60px;
width: 100%;
- z-index: 99999;
+ z-index: 9999;
.el-menu {
--
Gitblit v1.9.3