Merge branch 'yx' of ssh://61.161.152.110:29418/electronic-map into tjj2

src/views/layout/Menu.vue

@@ -936,12 +936,14 @@ export default {
       handler: function (val, oldVal) {
         this.menuData.some((element, index) => {
           if (val.path.includes(element.id)) {
-            this.currRoot = element.id;
             this.$nextTick(() => {
-              this.currentMenu.some((element, index) => {
-                if (val.path == element.path) {
-                  this.activeIndex = index;
-                }
+              this.currRoot = element.id;
+              this.$nextTick(() => {
+                this.currentMenu.some((element, index) => {
+                  if (val.path == element.path) {
+                    this.activeIndex = index;
+                  }
+                });
               });
             });
             return true;