From f5d0f8b7fa3a0c9283f9c2ac45050409a518f024 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期五, 16 四月 2021 23:06:09 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/layer/src/layer.vue | 13 +++----------
src/components/layer/src/layer.js | 5 -----
2 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/src/components/layer/src/layer.js b/src/components/layer/src/layer.js
index e177272..5e2600b 100644
--- a/src/components/layer/src/layer.js
+++ b/src/components/layer/src/layer.js
@@ -20,11 +20,6 @@
* @return {[type]} [description]
*/
self.open = function (opt) {
- /* let option = {
- type: 1,
- content: opt.content,
- area: opt.area
- } */
self.closeAll()
var options = mergeJson(opt, defOptions)
const id = `notification_${new Date().getTime()}_${seed++}`
diff --git a/src/components/layer/src/layer.vue b/src/components/layer/src/layer.vue
index ef3f970..e726598 100644
--- a/src/components/layer/src/layer.vue
+++ b/src/components/layer/src/layer.vue
@@ -2,7 +2,6 @@
<div class="public-bounced map-background" v-drag :style="style">
<div class="public-bounced-title panel-title" ref="publicBounced">
<span>{{title}}</span>
- <i class="el-icon-circle-close" @click="max"></i>
<i class="el-icon-circle-close" @click="close"></i>
</div>
<div class="public-bounced-content" :id="id">
@@ -16,11 +15,8 @@
export default {
data () {
return {
- cls: {
- 'vl-notify-iframe': true
- },
style: {},
- id: 'vlip' + new Date().getTime()
+ id: 'sewer_layeropen_' + new Date().getTime()
}
},
props: {
@@ -33,21 +29,18 @@
},
computed: {
},
- async mounted () {
- helper.hiddenScrollBar(this.options)
+ mounted () {
},
methods: {
close () {
this.layer.close(this.id)
},
init () {
- console.log('3333333333')
- const propsData = helper.deepClone(this.content.content.data) || {}
+ 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({
- // 鍏蜂綋鍙傛暟淇℃伅锛岃鍙傝�僾ue婧愮爜
// parent: this.content.parent,
propsData: propsData
})
--
Gitblit v1.8.0