From 4d265afb3419bd5cedc6f31ab78d570f6917b520 Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期五, 21 五月 2021 14:30:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/layer/src/layer.vue | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/components/layer/src/layer.vue b/src/components/layer/src/layer.vue
index 2b233d7..64f7411 100644
--- a/src/components/layer/src/layer.vue
+++ b/src/components/layer/src/layer.vue
@@ -4,13 +4,13 @@
<span>{{ title }}</span>
<i class="el-icon-circle-close" @click="close"></i>
</div>
- <div class="public-bounced-content" :id="id">
- </div>
+ <div class="public-bounced-content" :id="id"></div>
</div>
</template>
<script>
import helper from './helper/helper.js'
+import '../../../utils/dragBoxes'
export default {
data () {
@@ -29,6 +29,18 @@
},
computed: {},
mounted () {
+ let left = this.left
+ let top = this.top
+ if (left > 0) {
+ left = left + 'px'
+ }
+ if (top > 0) {
+ top = top + 'px'
+ }
+ this.style = {
+ left: left || '25%',
+ top: top || '35%'
+ }
},
methods: {
close () {
@@ -36,10 +48,8 @@
},
init () {
const propsData = helper.deepClone(this.content.data) || {}
- propsData.layerid = this.id
- propsData.lydata = this.content.data
- propsData.lyoption = this.options
- const instance = new this.content.content({
+ console.log(propsData)
+ const instance = new this.content.comp({
// parent: this.content.parent,
propsData: propsData
})
@@ -73,8 +83,6 @@
.public-bounced {
z-index: 2000;
position: absolute;
- top: 35%;
- left: 20%;
.public-bounced-title {
cursor: move;
--
Gitblit v1.8.0