From 941b1f8db7888a2578455f3763174932a81d90e1 Mon Sep 17 00:00:00 2001
From: bianyaqi <bianyaqi>
Date: Tue, 4 Apr 2023 18:12:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=B1=89bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/360View/drawer.vue |  3 ++-
 src/components/360View/index1.vue | 14 +++++++++++---
 src/components/360View/shrink.vue |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/components/360View/drawer.vue b/src/components/360View/drawer.vue
index 215e1bb..88ac686 100644
--- a/src/components/360View/drawer.vue
+++ b/src/components/360View/drawer.vue
@@ -94,7 +94,8 @@ export default {
     closeByMask() {
       this.maskClosable && this.$emit('update:display', false)
     },
-    closeByButton() {
+    closeByButton(val) {
+      this.$emit('display', val)
       this.$emit('update:display', false)
       document.getElementsByClassName('drawer')[0].style.display = 'none'
     },
diff --git a/src/components/360View/index1.vue b/src/components/360View/index1.vue
index 7fc7586..e361007 100644
--- a/src/components/360View/index1.vue
+++ b/src/components/360View/index1.vue
@@ -196,7 +196,7 @@
       </div>
     </div>
     <shrink ref="shrinks" :arrow-type="1" @display="handleDisplay" @changeType="changeType" />
-    <drawer ref="drawers" :cur-type="dataType" :display.sync="display" :width="drawerWidth" :mask="true">
+    <drawer ref="drawers" :cur-type="dataType" :display.sync="display" :width="drawerWidth" :mask="true" @display="closeDrawer">
       <!--    关键指标-->
       <key-indicators
         v-if="dataType === 1"
@@ -289,6 +289,13 @@ export default {
       dataForm: {}
     }
   },
+  watch: {
+    display(val) {
+      if (val) {
+        this.$refs.drawers.$el.style.display = 'inline-block'
+      }
+    }
+  },
   created() {
     this.getPatientData()
     this.getTimeAxisData()
@@ -320,11 +327,9 @@ export default {
       // 监听点击添加数据集，获取数据
       eventBus.$off('sendForData')
       eventBus.$on('sendForData', data => {
-        console.log(data)
         const arr = this.foreList.concat(data)
         const id = 'id'
         this.foreList = arr.reduce((all, next) => all.some((item) => item[id] == next[id]) ? all : [...all, next], [])
-        console.log(this.foreList)
         this.openDataDrink()
       })
     },
@@ -341,6 +346,9 @@ export default {
         }
       })
     },
+    closeDrawer(val) {
+      this.display = val
+    },
     changeType(val) {
       this.dataType = val
       this.display = true
diff --git a/src/components/360View/shrink.vue b/src/components/360View/shrink.vue
index 7031c2e..8d00378 100644
--- a/src/components/360View/shrink.vue
+++ b/src/components/360View/shrink.vue
@@ -76,7 +76,7 @@ export default {
         document.getElementsByClassName('key-indicators-shrink')[0].style.zIndex = 999
       } else {
         this.$emit('display', false)
-        document.getElementsByClassName('key-indicators-shrink')[0].style.zIndex = 9999
+        document.getElementsByClassName('key-indicators-shrink')[0].style.zIndex = 999
       }
     },
     handleType(type) {