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/ranging.vue | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/src/pcviews/tool/ranging.vue b/src/pcviews/tool/ranging.vue
index 521990a..a0e21e8 100644
--- a/src/pcviews/tool/ranging.vue
+++ b/src/pcviews/tool/ranging.vue
@@ -1,26 +1,21 @@
-/*
- * @Author: Morpheus
- * @Name: 地图测距
- * @Date: 2021-11-13 16:04:27
- * @Last Modified by: Morpheus
- * @Last Modified time: 2022-02-15 10:47:42
- */
+/* * @Author: Morpheus * @Name: 地图测距 * @Date: 2021-11-13 16:04:27 * @Last
+Modified by: Morpheus * @Last Modified time: 2022-02-15 14:28:44 */
<template>
- <tool-small-box class="tool-ranging">
- <template slot="tool-small-box-header">
+ <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" />
+ <img class="close deblurring" src="/img/navicon/close.png" alt @click="closeModel" />
</template>
- <template slot="tool-small-box-content">
+ <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>
- </tool-small-box>
+ </public-box>
</template>
<script>
@@ -28,8 +23,7 @@
export default {
data () {
- return {
- }
+ return {}
},
computed: {
...mapGetters(['viewer'])
@@ -47,9 +41,12 @@
closeModel () {
this.$store.dispatch('delVisitedViews', this.$route)
this.$router.push('/pcLayout/default')
+ this.viewer.measure.deactivate()
}
},
- destroyed () { }
+ destroyed () {
+ this.viewer.measure.deactivate()
+ }
}
</script>
--
Gitblit v1.9.3