Merge branch 'dev/v4.9.93_tsz' of qmx/jy into feature/v4.9.93

src/web/staticres/common-module/collection/js/ent_portrait.js

@@ -469,6 +469,7 @@ var vNode = {
             }
           }
         })
+        _this.showGroupingDialog = false
         _this.setGroupState = ''
       } else {
         this.changeFollowStateRequest(params)
@@ -947,6 +948,8 @@ var vNode = {
             console.log('取消操作')
           })
         } else {
+          _this.setGroupState = ''
+          _this.showGroupingDialog = false
           _this.changeFollowStateRequest()
         }
         

src/web/staticres/common-module/mobile-portrayal-footer/js/mobile-portrayal-footer.js

@@ -29,7 +29,7 @@ var mobileportrayalfootertemp = `
       <div class="monitor-box" :class="{'action': monitorGroupShow }" v-show="monitorboxShow">
         <div class="monitor-box-item monitor-group" v-if="monitorGroupShow">
           <p class="look-text">{{ entInfo.followedGroup }}</p>
-          <span @click="editorGroupEvent" class="editor-group">更改></span>
+          <span @click.stop="editorGroupEvent" class="editor-group">更改></span>
         </div>
         <div class="monitor-box-item">
           <p class="look-text" @click="lookDynamic">查看监控动态</p>