Merge remote-tracking branch 'origin/dev' into 新动火作业1128

src/views/map/index.vue

@@ -1031,9 +1031,10 @@ export default {
       retryTimes: 0,
       // mqtt  结束
       onePerLocArr: [],
-      iniOne: 0
+      iniOne: 0,
 
       /* 一公司人员定位 结束*/
+      bottomClickDisable: false
     }
   },
   mounted() {
@@ -1578,6 +1579,7 @@ export default {
       this.clearAllBottomOptionsItemsEntityCollection()
     },
     bottomOptionsClick(index) {
+      if (this.bottomClickDisable) return
       if (this.bottomOptionsIndex === index) {
         this.bottomOptionsIndex = ''
         // (this.gangkouActive === '00004' && index !== 1) && drag.addPolygon(this.gangkouActive)
@@ -2537,6 +2539,7 @@ export default {
       }
     },
     async bottomOptionsEnter(el, done) {
+      this.bottomClickDisable = true
       if (!this.bottomOptionsAnimationComplex) {
         // 默认应用简单动画，只有点击时使用复杂动画，否则元素结构不同，无法处理
         await animate(el, {
@@ -2547,6 +2550,7 @@ export default {
           translateY: 0,
           opacity: 1
         }, { duration: 1 }).finished
+        this.bottomClickDisable = false
         done()
         return
       }
@@ -2581,15 +2585,18 @@ export default {
           }, { duration }).finished
         }
       }
+      this.bottomClickDisable = false
       done()
     },
     async bottomOptionsLeave(el, done) {
+      this.bottomClickDisable = true
       if (!this.bottomOptionsAnimationComplex) {
         // 默认应用简单动画，只有点击时使用复杂动画，否则元素结构不同，无法处理
         await animate(el, {
           translateY: -100,
           opacity: 0
         }, { duration: 1 }).finished
+        this.bottomClickDisable = false
         done()
         return
       }
@@ -2626,6 +2633,7 @@ export default {
           opacity: 0
         }, { duration }).finished
       }
+      this.bottomClickDisable = false
       done()
     }
   }