From df7b31e9bc762634a01536841b413cc65256752a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 10 Mar 2022 08:46:31 +0800
Subject: [PATCH] 部分改动
---
public/img/navicon/add.png | 0
src/components/map/components/dimension.vue | 68 ++++++------
src/components/campusNav/index.vue | 2
src/components/orgNavBar/index.vue | 2
src/pcLayout/index.vue | 2
src/components/arcNavBar/index.vue | 2
src/components/serviceNavBar/index.vue | 2
src/pcviews/tool/layer-manage.vue | 2
src/store/modules/mobile.js | 24 ++--
src/pcviews/tool/area.vue | 76 +++++++--------
src/components/mobilemap/index.vue | 3
src/pcviews/specialmap/welcome.vue | 19 +++
src/components/map/components/mapPopup copy.vue | 2
src/components/searchDetails/index.vue | 2
src/components/map/components/mapPopup.vue | 2
src/pcviews/tool/ranging.vue | 76 +++++++--------
src/pcviews/tool/sign.vue | 14 +-
17 files changed, 150 insertions(+), 148 deletions(-)
diff --git a/public/img/navicon/add.png b/public/img/navicon/add.png
index 8e08d26..6d39c18 100644
--- a/public/img/navicon/add.png
+++ b/public/img/navicon/add.png
Binary files differ
diff --git a/src/components/arcNavBar/index.vue b/src/components/arcNavBar/index.vue
index faf856e..0641c1f 100644
--- a/src/components/arcNavBar/index.vue
+++ b/src/components/arcNavBar/index.vue
@@ -5,7 +5,7 @@
<img class="icon deblurring" src="/img/icon/xyjz.png" alt />
<span>{{ arcNavBarTitle }}</span>
</div>
- <img class="close" src="/img/navicon/close.png" alt @click="closeModel" />
+ <img class="close deblurring" src="/img/navicon/close.png" alt @click="closeModel" />
</template>
<template slot="public-box-content">
<div class="tab" v-show="false">
diff --git a/src/components/campusNav/index.vue b/src/components/campusNav/index.vue
index 6550915..db37070 100644
--- a/src/components/campusNav/index.vue
+++ b/src/components/campusNav/index.vue
@@ -5,7 +5,7 @@
<img class="icon deblurring" src="/img/icon/xndh.png" alt />
<span>校区内导航</span>
</div>
- <img class="close" src="/img/navicon/close.png" alt @click="closeModel" />
+ <img class="close deblurring" src="/img/navicon/close.png" alt @click="closeModel" />
</template>
<template slot="public-box-content">
<div class="tab">
diff --git a/src/components/map/components/dimension.vue b/src/components/map/components/dimension.vue
index d772a43..c1cc72b 100644
--- a/src/components/map/components/dimension.vue
+++ b/src/components/map/components/dimension.vue
@@ -102,52 +102,52 @@
)
)
- // that.viewer.imageryLayers.addImageryProvider(
- // new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
- // url: 'http://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=9ae78c51a0a28f06444d541148496e36',
- // subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
- // format: 'image/jpeg',
- // show: true,
- // maximumLevel: 18
- // })
- // )
-
- // that.viewer.imageryLayers.addImageryProvider(
- // new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
- // url: 'http://t{s}.tianditu.gov.cn/DataServer?T=cva_w&x={x}&y={y}&l={z}&tk=9ae78c51a0a28f06444d541148496e36',
- // subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
- // format: 'image/jpeg',
- // show: true,
- // maximumLevel: 18
- // })
- // )
-
that.viewer.imageryLayers.addImageryProvider(
- new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
- url: ' http://t1.tianditu.gov.cn/vec_w/wmts?tk=9ae78c51a0a28f06444d541148496e36',
- type: 'wmts',
- layer: 'vec',
- style: 'default',
- format: 'tiles',
- tileMatrixSetID: 'w',
+ new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
+ url: 'http://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=9ae78c51a0a28f06444d541148496e36',
+ subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
+ format: 'image/jpeg',
show: true,
maximumLevel: 18
})
)
that.viewer.imageryLayers.addImageryProvider(
- new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
- url: ' http://t1.tianditu.gov.cn/cva_w/wmts?tk=9ae78c51a0a28f06444d541148496e36',
- type: 'wmts',
- layer: 'cva',
- style: 'default',
- format: 'tiles',
- tileMatrixSetID: 'w',
+ new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
+ url: 'http://t{s}.tianditu.gov.cn/DataServer?T=cva_w&x={x}&y={y}&l={z}&tk=9ae78c51a0a28f06444d541148496e36',
+ subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
+ format: 'image/jpeg',
show: true,
maximumLevel: 18
})
)
+ // that.viewer.imageryLayers.addImageryProvider(
+ // new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
+ // url: ' http://t1.tianditu.gov.cn/vec_w/wmts?tk=9ae78c51a0a28f06444d541148496e36',
+ // type: 'wmts',
+ // layer: 'vec',
+ // style: 'default',
+ // format: 'tiles',
+ // tileMatrixSetID: 'w',
+ // show: true,
+ // maximumLevel: 18
+ // })
+ // )
+
+ // that.viewer.imageryLayers.addImageryProvider(
+ // new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
+ // url: ' http://t1.tianditu.gov.cn/cva_w/wmts?tk=9ae78c51a0a28f06444d541148496e36',
+ // type: 'wmts',
+ // layer: 'cva',
+ // style: 'default',
+ // format: 'tiles',
+ // tileMatrixSetID: 'w',
+ // show: true,
+ // maximumLevel: 18
+ // })
+ // )
+
var highlighted = {
feature: undefined,
originalColor: new global.DC.Namespace.Cesium.Color()
diff --git a/src/components/map/components/mapPopup copy.vue b/src/components/map/components/mapPopup copy.vue
index ff63074..32c3e79 100644
--- a/src/components/map/components/mapPopup copy.vue
+++ b/src/components/map/components/mapPopup copy.vue
@@ -268,7 +268,7 @@
<div class="arrow-rb"></div>
<div class="label-wrap">
<div class="title">
- {{ nowlabelLayerData.name }} 二维码分享
+ {{ nowlabelLayerData.name }}
<img
@click="closelabelLayerid"
class="close-box"
diff --git a/src/components/map/components/mapPopup.vue b/src/components/map/components/mapPopup.vue
index 1464ca3..c5ee86b 100644
--- a/src/components/map/components/mapPopup.vue
+++ b/src/components/map/components/mapPopup.vue
@@ -268,7 +268,7 @@
<div class="arrow-rb"></div>
<div class="label-wrap">
<div class="title">
- {{ nowlabelLayerData.name }} 二维码分享
+ {{ nowlabelLayerData.name }}
<img
@click="closelabelLayerid"
class="close-box"
diff --git a/src/components/mobilemap/index.vue b/src/components/mobilemap/index.vue
index 295c2b1..8f8e9c9 100644
--- a/src/components/mobilemap/index.vue
+++ b/src/components/mobilemap/index.vue
@@ -453,7 +453,6 @@
ii++
cutHeight = height - startHeight
// console.log(cutHeight);
- console.log(height, 'see')
that.heights = height
that.heights1 = cutHeight
// return;
@@ -1047,7 +1046,7 @@
position: {},
lntLat: [+that.urlParameterData.jd, +that.urlParameterData.wd],
query: {
- introduce: '自定义标签',
+ introduce: '暂无内容',
address: '',
...(that.urlParameterData || {}),
lntLat: [+that.urlParameterData.jd, +that.urlParameterData.wd]
diff --git a/src/components/orgNavBar/index.vue b/src/components/orgNavBar/index.vue
index 2b68ba0..9c53404 100644
--- a/src/components/orgNavBar/index.vue
+++ b/src/components/orgNavBar/index.vue
@@ -5,7 +5,7 @@
<img class="icon deblurring" src="/img/icon/jg.png" alt />
<span>{{ orgNavBarTitle }}</span>
</div>
- <img class="close" src="/img/navicon/close.png" alt @click="closeModel" />
+ <img class="close deblurring" src="/img/navicon/close.png" alt @click="closeModel" />
</template>
<template slot="public-box-content">
<ul>
diff --git a/src/components/searchDetails/index.vue b/src/components/searchDetails/index.vue
index a0321cd..c34590d 100644
--- a/src/components/searchDetails/index.vue
+++ b/src/components/searchDetails/index.vue
@@ -6,7 +6,7 @@
<img class="icon deblurring" src="/img/icon/search.png" alt />
<span>查询结果</span>
</div>
- <img class="close" src="/img/navicon/close.png" alt @click="closeModel" />
+ <img class="close deblurring" src="/img/navicon/close.png" alt @click="closeModel" />
</div>
<div class="content">
<ul>
diff --git a/src/components/serviceNavBar/index.vue b/src/components/serviceNavBar/index.vue
index 4a76bf5..390c141 100644
--- a/src/components/serviceNavBar/index.vue
+++ b/src/components/serviceNavBar/index.vue
@@ -5,7 +5,7 @@
<img class="icon deblurring" :src="headerLog" alt />
<span>{{ title }}</span>
</div>
- <img class="close" src="/img/navicon/close.png" alt @click="closeModel" />
+ <img class="close deblurring" src="/img/navicon/close.png" alt @click="closeModel" />
</template>
<template slot="public-box-content">
<div class="tab" v-show="false">
diff --git a/src/pcLayout/index.vue b/src/pcLayout/index.vue
index 8100a0a..5f46218 100644
--- a/src/pcLayout/index.vue
+++ b/src/pcLayout/index.vue
@@ -80,7 +80,7 @@
<el-menu-item index="/pcLayout/default/tool/sign">地图标记</el-menu-item>
<el-menu-item index="/pcLayout/default/tool/ranging">地图测距</el-menu-item>
<el-menu-item index="/pcLayout/default/tool/area">地图测面</el-menu-item>
- <el-menu-item index="/pcLayout/default/tool/layer-manage">图层管理</el-menu-item>
+ <!-- <el-menu-item index="/pcLayout/default/tool/layer-manage">图层管理</el-menu-item> -->
</el-submenu>
</el-menu>
</el-header>
diff --git a/src/pcviews/specialmap/welcome.vue b/src/pcviews/specialmap/welcome.vue
index 04a4948..78c2e4f 100644
--- a/src/pcviews/specialmap/welcome.vue
+++ b/src/pcviews/specialmap/welcome.vue
@@ -9,7 +9,7 @@
<a href="javascript:void(0);" title="全景浏览">
<img
@click="panoramaPlay"
- class="panorama-control"
+ class="panorama-control deblurring"
src="/img/icon/panorama.png"
alt
/>
@@ -17,13 +17,18 @@
<a href="javascript:void(0);" title="语音介绍">
<img
@click="audioPlay"
- class="audio-control"
+ class="audio-control deblurring"
src="/img/navicon/audio.png"
alt
/>
</a>
<a href="javascript:void(0);" title="关闭">
- <img @click="closeModel" class="close-box" src="/img/navicon/close.png" alt />
+ <img
+ @click="closeModel"
+ class="close-box deblurring"
+ src="/img/navicon/close.png"
+ alt
+ />
</a>
</div>
</div>
@@ -111,6 +116,10 @@
this.audioCourse = false
}
this.getData()
+
+ window.onbeforeunload = e => { // 刷新时弹出提示
+ this.audioSynth.cancel()
+ }
},
computed: {
...mapGetters([
@@ -250,7 +259,9 @@
}
},
destroyed () {
- // this.audioPlay();
+ this.audioSynth.cancel()
+ this.viewer.removeLayer(this.pathLayer)
+ this.viewer.removeLayer(this.pointLayer)
// console.log("关闭", "see1");
}
}
diff --git a/src/pcviews/tool/area.vue b/src/pcviews/tool/area.vue
index 79c7e28..972b6a7 100644
--- a/src/pcviews/tool/area.vue
+++ b/src/pcviews/tool/area.vue
@@ -2,56 +2,52 @@
Modified by: Morpheus * @Last Modified time: 2022-02-15 14:27:28 */
<template>
- <public-box class="tool-area">
- <template slot="public-box-header">
- <div class="title">
- <img class="icon deblurring" src="/img/icon/tool-area.png" alt />
- <span>地图测面</span>
- </div>
- <img class="close" src="/img/navicon/close.png" alt @click="closeModel" />
- </template>
- <template slot="public-box-content">
- <el-button type="primary" size="mini" @click.stop="calcDistance"
- >开始</el-button
- >
+ <public-box class="tool-area">
+ <template slot="public-box-header">
+ <div class="title">
+ <img class="icon deblurring" src="/img/icon/tool-area.png" alt />
+ <span>地图测面</span>
+ </div>
+ <img class="close deblurring" src="/img/navicon/close.png" alt @click="closeModel" />
+ </template>
+ <template slot="public-box-content">
+ <el-button type="primary" size="mini" @click.stop="calcDistance">开始</el-button>
- <el-button type="danger" size="mini" @click.stop="deactivate"
- >清除</el-button
- >
- </template>
- </public-box>
+ <el-button type="danger" size="mini" @click.stop="deactivate">清除</el-button>
+ </template>
+ </public-box>
</template>
<script>
-import { mapGetters } from "vuex";
+import { mapGetters } from 'vuex'
export default {
- data() {
- return {};
- },
- computed: {
- ...mapGetters(["viewer"]),
- },
- created() {},
- methods: {
- calcDistance() {
- this.viewer.measure.areaSurface();
+ data () {
+ return {}
},
+ computed: {
+ ...mapGetters(['viewer'])
+ },
+ created () { },
+ methods: {
+ calcDistance () {
+ this.viewer.measure.areaSurface()
+ },
- deactivate() {
- this.viewer.measure.deactivate();
- },
+ deactivate () {
+ this.viewer.measure.deactivate()
+ },
- closeModel() {
- this.$store.dispatch("delVisitedViews", this.$route);
- this.$router.push("/pcLayout/default");
- this.viewer.measure.deactivate();
+ closeModel () {
+ this.$store.dispatch('delVisitedViews', this.$route)
+ this.$router.push('/pcLayout/default')
+ this.viewer.measure.deactivate()
+ }
},
- },
- destroyed() {
- this.viewer.measure.deactivate();
- },
-};
+ destroyed () {
+ this.viewer.measure.deactivate()
+ }
+}
</script>
<style lang="scss" scoped></style>
diff --git a/src/pcviews/tool/layer-manage.vue b/src/pcviews/tool/layer-manage.vue
index 5d30941..dc56762 100644
--- a/src/pcviews/tool/layer-manage.vue
+++ b/src/pcviews/tool/layer-manage.vue
@@ -5,7 +5,7 @@
<img class="icon deblurring" src="/img/icon/tool-layer.png" alt />
<span>图层管理</span>
</div>
- <img class="close" src="/img/navicon/close.png" alt @click="closeModel" />
+ <img class="close deblurring" src="/img/navicon/close.png" alt @click="closeModel" />
</template>
<template slot="public-box-content">
<div class="list-box">
diff --git a/src/pcviews/tool/ranging.vue b/src/pcviews/tool/ranging.vue
index 1402110..a0e21e8 100644
--- a/src/pcviews/tool/ranging.vue
+++ b/src/pcviews/tool/ranging.vue
@@ -2,56 +2,52 @@
Modified by: Morpheus * @Last Modified time: 2022-02-15 14:28:44 */
<template>
- <public-box class="tool-ranging">
- <template slot="public-box-header">
- <div class="title">
- <img class="icon deblurring" src="/img/icon/tool-ranging.png" alt />
- <span>地图测距</span>
- </div>
- <img class="close" src="/img/navicon/close.png" alt @click="closeModel" />
- </template>
- <template slot="public-box-content">
- <el-button type="primary" size="mini" @click.stop="calcDistance"
- >开始</el-button
- >
+ <public-box class="tool-ranging">
+ <template slot="public-box-header">
+ <div class="title">
+ <img class="icon deblurring" src="/img/icon/tool-ranging.png" alt />
+ <span>地图测距</span>
+ </div>
+ <img class="close deblurring" src="/img/navicon/close.png" alt @click="closeModel" />
+ </template>
+ <template slot="public-box-content">
+ <el-button type="primary" size="mini" @click.stop="calcDistance">开始</el-button>
- <el-button type="danger" size="mini" @click.stop="deactivate"
- >清除</el-button
- >
- </template>
- </public-box>
+ <el-button type="danger" size="mini" @click.stop="deactivate">清除</el-button>
+ </template>
+ </public-box>
</template>
<script>
-import { mapGetters } from "vuex";
+import { mapGetters } from 'vuex'
export default {
- data() {
- return {};
- },
- computed: {
- ...mapGetters(["viewer"]),
- },
- created() {},
- methods: {
- calcDistance() {
- this.viewer.measure.distanceSurface();
+ data () {
+ return {}
},
+ computed: {
+ ...mapGetters(['viewer'])
+ },
+ created () { },
+ methods: {
+ calcDistance () {
+ this.viewer.measure.distanceSurface()
+ },
- deactivate() {
- this.viewer.measure.deactivate();
- },
+ deactivate () {
+ this.viewer.measure.deactivate()
+ },
- closeModel() {
- this.$store.dispatch("delVisitedViews", this.$route);
- this.$router.push("/pcLayout/default");
- this.viewer.measure.deactivate();
+ closeModel () {
+ this.$store.dispatch('delVisitedViews', this.$route)
+ this.$router.push('/pcLayout/default')
+ this.viewer.measure.deactivate()
+ }
},
- },
- destroyed() {
- this.viewer.measure.deactivate();
- },
-};
+ destroyed () {
+ this.viewer.measure.deactivate()
+ }
+}
</script>
<style lang="sass" scoped>
diff --git a/src/pcviews/tool/sign.vue b/src/pcviews/tool/sign.vue
index 95ef115..df09300 100644
--- a/src/pcviews/tool/sign.vue
+++ b/src/pcviews/tool/sign.vue
@@ -5,12 +5,12 @@
<img class="icon deblurring" src="/img/icon/tool-sign.png" alt />
<span>地图标记</span>
</div>
- <img class="btn-box" @click.stop="addSign" src="/img/navicon/add.png" alt />
- <img class="close" src="/img/navicon/close.png" alt @click="closeModel" />
+ <img class="btn-box deblurring" @click.stop="addSign" src="/img/navicon/add.png" alt />
+ <img class="close deblurring" src="/img/navicon/close.png" alt @click="closeModel" />
</template>
<template slot="public-box-content">
- <div class="list-box">
- <ul v-show="signList.length > 0">
+ <div class="list-box" v-loading="loading">
+ <ul v-show="signShow">
<li v-for="(item, index) in signList" :key="index" @click="dingw(item)">
<img src="/img/icon/sign-list.png" alt />
{{ item.name }}
@@ -23,7 +23,7 @@
></el-button>
</li>
</ul>
- <div v-show="signList.length == 0" class="no-data">
+ <div v-show="!signShow" class="no-data">
<img src="/img/icon/no-data.png" alt />
<div>暂无数据</div>
</div>
@@ -39,7 +39,9 @@
export default {
data () {
return {
+ loading: true,
signList: [],
+ signShow: true,
destroyedFlag: true
}
},
@@ -108,6 +110,8 @@
console.log(res)
const data = res.data.data.records
that.signList = data
+ that.signList.length > 0 ? that.signShow = true : that.signShow = false
+ that.loading = false
// that.$store.commit("clearLabelLayerIcon");
that.$store.dispatch('addLabelLayerIcon', {
list: data,
diff --git a/src/store/modules/mobile.js b/src/store/modules/mobile.js
index 1135d08..6b5e558 100644
--- a/src/store/modules/mobile.js
+++ b/src/store/modules/mobile.js
@@ -233,29 +233,25 @@
// state.cvaLayer = null;
// 加载底图
state.vecLayer = state.mviewer.imageryLayers.addImageryProvider(
- new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
- url: ' http://t1.tianditu.gov.cn/vec_w/wmts?tk=9ae78c51a0a28f06444d541148496e36',
- type: 'wmts',
- layer: 'vec',
- style: 'default',
- format: 'tiles',
- tileMatrixSetID: 'w',
+ new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
+ url: 'http://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=9ae78c51a0a28f06444d541148496e36',
+ subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
+ format: 'image/jpeg',
show: true,
maximumLevel: 18
})
)
+
state.cvaLayer = state.mviewer.imageryLayers.addImageryProvider(
- new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
- url: ' http://t1.tianditu.gov.cn/cva_w/wmts?tk=9ae78c51a0a28f06444d541148496e36',
- type: 'wmts',
- layer: 'cva',
- style: 'default',
- format: 'tiles',
- tileMatrixSetID: 'w',
+ new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
+ url: 'http://t{s}.tianditu.gov.cn/DataServer?T=cva_w&x={x}&y={y}&l={z}&tk=9ae78c51a0a28f06444d541148496e36',
+ subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
+ format: 'image/jpeg',
show: true,
maximumLevel: 18
})
)
+
state.tilesetLayer.show = false // 隐藏3d图形
state.newLayer = state.usetowpointfive() // 添加2.5d图形贴片
state.wallLayer.show = false // 打开瀑布
--
Gitblit v1.9.3