From c7a549da66df42d4ec5c78ddf2cc138772616941 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期一, 19 四月 2021 14:05:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/components/layer/src/layer.vue |   79 ++++++++++++++++++---------------------
 1 files changed, 36 insertions(+), 43 deletions(-)

diff --git a/src/components/layer/src/layer.vue b/src/components/layer/src/layer.vue
index 6d406d1..2b233d7 100644
--- a/src/components/layer/src/layer.vue
+++ b/src/components/layer/src/layer.vue
@@ -1,8 +1,7 @@
 <template>
   <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>
+      <span>{{ title }}</span>
       <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: {
@@ -31,23 +27,20 @@
       }
     }
   },
-  computed: {
-  },
-  async mounted () {
-    helper.hiddenScrollBar(this.options)
+  computed: {},
+  mounted () {
   },
   methods: {
     close () {
       this.layer.close(this.id)
     },
     init () {
-      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,
+        // parent: this.content.parent,
         propsData: propsData
       })
       instance.vm = instance.$mount()
@@ -77,11 +70,11 @@
 </script>
 
 <style lang="less" scoped>
-  .public-bounced {
-    z-index: 2000;
-    position: absolute;
-    top: 35%;
-    left: 20%;
+.public-bounced {
+  z-index: 2000;
+  position: absolute;
+  top: 35%;
+  left: 20%;
 
   .public-bounced-title {
     cursor: move;
@@ -91,38 +84,38 @@
     align-items: center;
     justify-content: space-between;
 
-  span {
-    color: #f4f7ff;
-    margin: 0 15px;
-    font-size: 14px;
-  }
+    span {
+      color: #f4f7ff;
+      margin: 0 15px;
+      font-size: 14px;
+    }
 
-  i {
-    color: #C0C4CC;
-    margin: 0 15px;
-    font-size: 22px;
-    cursor: pointer;
-  }
+    i {
+      color: #C0C4CC;
+      margin: 0 15px;
+      font-size: 22px;
+      cursor: pointer;
+    }
 
-  i:hover {
-    color: #00fff6;
-  }
+    i:hover {
+      color: #00fff6;
+    }
   }
 
   .public-bounced-content {
-    padding: 0.1rem;
+    //padding: 0.1rem;
     display: flex;
-  //align-items: center;
-  //justify-content: space-around;
+    //align-items: center;
+    //justify-content: space-around;
 
-  .public-bounced-content-left {
-  //width: 4.8rem;
-  }
+    .public-bounced-content-left {
+      //width: 4.8rem;
+    }
 
-  .public-bounced-content-right {
-  //width: 3rem;
-    margin-left: 0.1rem;
+    .public-bounced-content-right {
+      //width: 3rem;
+      margin-left: 0.1rem;
+    }
   }
-  }
-  }
+}
 </style>

--
Gitblit v1.8.0