Merge remote-tracking branch 'origin/message_bus' into message_bus

# Conflicts:
#	src/routes.js

@@ -91,6 +91,7 @@ import ElasticSearchInfo from "./views/bus/ElasticSearchInfo.vue"
 import RouterBatch from "./views/bus/RouterBatch.vue"
 import RouterBatch from "./views/bus/RouterBatch.vue"
 import MessageManagement from "./views/bus/MessageManagement.vue"
 import MessageManagement from "./views/bus/MessageManagement.vue"
 import RouterManage from "./views/bus/RouterManage"
 import RouterManage from "./views/bus/RouterManage"
+
 //组件练习
 //组件练习
 //import Page7 from "./views/nav3/Page7.vue"
 //import Page7 from "./views/nav3/Page7.vue"
 
 
@@ -112,14 +113,13 @@ let routes = [
     },
     },
     {
     {
         path: '/',
         path: '/',
-        name: "主页",
-        redirect: '/main',
+        redirect: '/login',
         hidden: true
         hidden: true
     },
     },
     {
     {
         path: '/',
         path: '/',
         component: Home,
         component: Home,
-        name: 'INDEX',
+        name: '主页',
         leaf: true,
         leaf: true,
         iconCls: 'el-icon-menu',
         iconCls: 'el-icon-menu',
         children: [
         children: [
@@ -137,21 +137,21 @@ let routes = [
     //     ]
     //     ]
     // },
     // },
     // { path: '/test', component: Main },
     // { path: '/test', component: Main },
-    // {
-    //     path: '/admin',
-    //     component: Home,
-    //     name: '系统设置',
-    //     iconCls: 'el-icon-setting',//图标样式class
-    //     children: [
-    //         {path: '/user', component: User, name: '用户管理'},
-    //         {path: '/role', component: Role, name: '组织机构'},
-    //         {path: '/perm', component: Perm, name: '权限管理'},
-    //         {path: '/log', component: LOG, name: '系统日志'},
-    //         {path: '/department', component: Department, name: '部门管理'},
-    //         {path: '/company', component: Company, name: '公司管理'},
-    //         {path: '/group', component: Group, name: '集团管理'}
-    //     ]
-    // },
+    {
+        path: '/admin',
+        component: Home,
+        name: '系统设置',
+        iconCls: 'el-icon-setting',//图标样式class
+        children: [
+            {path: '/user', component: User, name: '用户管理'},
+            {path: '/role', component: Role, name: '组织机构'},
+            {path: '/perm', component: Perm, name: '权限管理'},
+            {path: '/log', component: LOG, name: '系统日志'},
+            {path: '/department', component: Department, name: '部门管理'},
+            {path: '/company', component: Company, name: '公司管理'},
+            {path: '/group', component: Group, name: '集团管理'}
+        ]
+    },
 
 
     {
     {
         path: '/bus',
         path: '/bus',
@@ -159,7 +159,7 @@ let routes = [
         name: '消息控制中心',
         name: '消息控制中心',
         iconCls: 'el-icon-message',
         iconCls: 'el-icon-message',
         children: [
         children: [
-            // {path: '/userInfo', component: UserInfo, name: '用户关系管理'},
+            {path: '/userInfo', component: UserInfo, name: '用户关系管理'},
             {path: '/server', component: Server, name: '服务器管理'},
             {path: '/server', component: Server, name: '服务器管理'},
             // {path: '/host', component: VirtualHost, name: '虚拟主机管理'},
             // {path: '/host', component: VirtualHost, name: '虚拟主机管理'},
             {path: '/queue', component: Queue, name: '队列管理'},
             {path: '/queue', component: Queue, name: '队列管理'},
@@ -185,6 +185,15 @@ let routes = [
             // {path: '/exchangeView', component: ExchangeView, name: '交换机监控'},
             // {path: '/exchangeView', component: ExchangeView, name: '交换机监控'},
         ]
         ]
     },
     },
+    // {
+    //     path: '/nav3',
+    //     component: Home,
+    //     name: '组件练习',
+    //     iconCls: 'el-icon-view',
+    //     children: [
+    //         {path: '/page7', component: Page7, name: '组件'},
+    //     ]
+    // },
 
 
 
 
     // {
     // {

@@ -258,7 +258,7 @@
                             let para = Object.assign({}, this.addForm);
                             let para = Object.assign({}, this.addForm);
                             addType(para).then((res) => {
                             addType(para).then((res) => {
                                 this.$message({
                                 this.$message({
-                                    message: '提交成功',
+                                    message: res.data.msg,
                                     type: 'success'
                                     type: 'success'
                                 });
                                 });
                                 //数据初始化
                                 //数据初始化

@@ -352,8 +352,10 @@
                 _this.loadingStatus = true;
                 _this.loadingStatus = true;
                 api_batchAddRouter(this.params).then(response => {
                 api_batchAddRouter(this.params).then(response => {
                     let res = response.data;
                     let res = response.data;
-                    if (res.code !== '200') {
-                        return _this.$message.error('批量添加路由，失败！');
+                    console.log(res)
+                    if (res.code != '200') {
+                        return _this.$message.error(res.msg);
+                        _this.loadingStatus = false;
                     }
                     }
                     // 关闭加载
                     // 关闭加载
                     _this.$message.success('批量添加路由，成功！');
                     _this.$message.success('批量添加路由，成功！');

@@ -240,3 +240,4 @@
         }
         }
     }
     }
 </script>
 </script>
+<style scoped></style>