Merge branch 'new_web' of http://39.108.172.131:3000/Shannon_mu/SmartCommunity into new_web

operationSupport/src/components/common/alertModal.vue

@@ -94,7 +94,7 @@ export default {
     watch: {},
     methods: {
         close() {
-            if (this.$route.query.showDialog) {
+            if (this.$route.fullPath == '/assetManagement/shopManagement/index?showDialog=true') {
                 this.$router.replace('/workbench/index');
             }
             this.$store.dispatch('delPopup', this.modal.id);