From e8e7b70168d5cc8a465c92da28bdcce52e8bf3cc Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Thu, 10 Mar 2022 14:48:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/pcviews/tool/area.vue | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/src/pcviews/tool/area.vue b/src/pcviews/tool/area.vue
index f8d1c31..972b6a7 100644
--- a/src/pcviews/tool/area.vue
+++ b/src/pcviews/tool/area.vue
@@ -1,10 +1,5 @@
-/*
- * @Author: Morpheus
- * @Name: 地图测面
- * @Date: 2021-11-13 16:04:27
- * @Last Modified by: Morpheus
- * @Last Modified time: 2022-02-15 14:27:28
- */
+/* * @Author: Morpheus * @Name: 地图测面 * @Date: 2021-11-13 16:04:27 * @Last
+Modified by: Morpheus * @Last Modified time: 2022-02-15 14:27:28 */
<template>
<public-box class="tool-area">
@@ -13,7 +8,7 @@
<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" />
+ <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>
@@ -24,21 +19,16 @@
</template>
<script>
-
import { mapGetters } from 'vuex'
export default {
data () {
- return {
- }
+ return {}
},
computed: {
- ...mapGetters([
- 'viewer'
- ])
+ ...mapGetters(['viewer'])
},
- created () {
- },
+ created () { },
methods: {
calcDistance () {
this.viewer.measure.areaSurface()
@@ -51,12 +41,13 @@
closeModel () {
this.$store.dispatch('delVisitedViews', this.$route)
this.$router.push('/pcLayout/default')
+ this.viewer.measure.deactivate()
}
},
destroyed () {
+ this.viewer.measure.deactivate()
}
}
</script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
--
Gitblit v1.9.3