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 @@
-
+
{
- 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) {