Merge branch 'pre' of http://git.bjzxtw.org.cn:3000/zxt/admin_home into pre

src/router/index.js

@@ -11,7 +11,6 @@ import componentsRouter from './modules/components'
 import chartsRouter from './modules/charts'
 import tableRouter from './modules/table'
 import nestedRouter from './modules/nested'
-import dangyunlong from './modules/dangyunlong'
 
 /**
  * Note: sub-menu only appear when route children.length >= 1
@@ -40,7 +39,6 @@ import dangyunlong from './modules/dangyunlong'
  * all roles can be accessed
  */
 export const constantRoutes = [
-  ...dangyunlong,
   {
     path: '/redirect',
     component: Layout,
@@ -171,7 +169,7 @@ export const constantRoutes = [
         path: '',
         component: () => import('@/views/website/editNavigation'),
         meta: {
-          title: '栏目详情',
+          title: '导航详情',
           hidden: true,
           breadcrumb: true
         }
@@ -194,22 +192,6 @@ export const constantRoutes = [
       }
     ]
   },
-  {
-    path: '/examine',
-    component: Layout,
-    children: [
-      {
-        name: '',
-        path: '',
-        component: () => import('@/views/news/examine'),
-        meta: {
-          title: '待审核列表',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  },
   {
     path: '/creatNews',
     component: Layout,
@@ -323,80 +305,15 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/hall',
-    component: Layout,
-    children: [
-      {
-        name: '',
-        path: '',
-        component: () => import('@/views/chat/hall'),
-        meta: {
-          title: '聊天',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  },
-  {
-    path: '/creatWebsite',
-    component: Layout,
-    children: [
-      {
-        name: '',
-        path: '',
-        component: () => import('@/views/website/creatWebsite'),
-        meta: {
-          title: '搭建网站',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  },
-  {
-    path: '/contacts',
-    component: Layout,
-    children: [
-      {
-        name: '',
-        path: '',
-        component: () => import('@/views/chat/contacts'),
-        meta: {
-          title: '通讯录',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  },
-  {
-    path: '/webCrawler',
-    component: Layout,
-    children: [
-      {
-        name: '',
-        path: '',
-        component: () => import('@/views/crawler/webCrawler'),
-        meta: {
-          title: '建立网站',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  },
-  // ----fr-课题分类
-  {
-    path: '/topicType',
+    path: '/routerList',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/chat/topicType'),
+        component: () => import('@/views/router/routerList'),
         meta: {
-          title: '课题分类',
+          title: '路由白名单',
           hidden: true,
           breadcrumb: true
         }
@@ -404,32 +321,31 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/surveyList',
+    path: '/hall',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/news/surveyList'),
+        component: () => import('@/views/chat/hall'),
         meta: {
-          title: '投票列表',
+          title: '聊天',
           hidden: true,
           breadcrumb: true
         }
       }
     ]
   },
-  ,
   {
-    path: '/jobRecruitingList',
+    path: '/creatWebsite',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/job/jobRecruitingList'),
+        component: () => import('@/views/website/creatWebsite'),
         meta: {
-          title: '招聘列表',
+          title: '搭建网站',
           hidden: true,
           breadcrumb: true
         }
@@ -437,15 +353,15 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/checkjobRecruitingList',
+    path: '/contacts',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/job/checkjobRecruitingList'),
+        component: () => import('@/views/chat/contacts'),
         meta: {
-          title: '招聘审核列表',
+          title: '通讯录',
           hidden: true,
           breadcrumb: true
         }
@@ -453,15 +369,15 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/jobResumeList',
+    path: '/webCrawler',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/job/jobResumeList'),
+        component: () => import('@/views/crawler/webCrawler'),
         meta: {
-          title: '我的沟通列表',
+          title: '建立网站',
           hidden: true,
           breadcrumb: true
         }
@@ -469,33 +385,32 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/creatJob',
+    path: '/topic',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/job/creatJob'),
+        component: () => import('@/views/chat/topic'),
         meta: {
-          title: '发布职位',
+          title: '课题',
           hidden: true,
           breadcrumb: true
         }
       }
     ]
   },
-  // -----------fr---------
-  // ----------liuj------------
+  // ----fr-课题分类
   {
-    path: '/goodList',
+    path: '/topicType',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/news/GoodList'),
+        component: () => import('@/views/chat/topicType'),
         meta: {
-          title: '商品列表',
+          title: '课题分类',
           hidden: true,
           breadcrumb: true
         }
@@ -503,15 +418,15 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/goodListApply',
+    path: '/webRule',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/news/GoodListApply'),
+        component: () => import('@/views/crawler/webRule'),
         meta: {
-          title: '商品待审核列表',
+          title: '规则列表',
           hidden: true,
           breadcrumb: true
         }
@@ -519,32 +434,31 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/addGood',
+    path: '/gather',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/news/addGood'),
+        component: () => import('@/views/crawler/gather'),
         meta: {
-          title: '添加商品',
+          title: '采集器',
           hidden: true,
           breadcrumb: true
         }
       }
     ]
   },
-
   {
-    path: '/jobHuntingList',
+    path: '/creatTopic',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/news/jobHuntingList'),
+        component: () => import('@/views/chat/creatTopic'),
         meta: {
-          title: '求职信息',
+          title: '编辑课题',
           hidden: true,
           breadcrumb: true
         }
@@ -552,49 +466,47 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/jobHuntingListApply',
+    path: '/webCrawlerList',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/news/jobHuntingListApply'),
+        component: () => import('@/views/crawler/webCrawlerList'),
         meta: {
-          title: '求职信息',
+          title: '采集列表',
           hidden: true,
           breadcrumb: true
         }
       }
     ]
   },
-
   {
-    path: '/addJobHunting',
+    path: '/webCrawlerListEdit',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/news/addJobHunting'),
+        component: () => import('@/views/crawler/webCrawlerListEdit'),
         meta: {
-          title: '添加求职',
+          title: '编辑资讯',
           hidden: true,
           breadcrumb: true
         }
       }
     ]
-
   },
   {
-    path: '/addNotice',
+    path: '/adList',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/news/addNotice'),
+        component: () => import('@/views/advertise/advertiseList'),
         meta: {
-          title: '添加通知',
+          title: '广告列表',
           hidden: true,
           breadcrumb: true
         }
@@ -602,166 +514,186 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/noticeList',
+    path: '/adPlaceList',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/news/noticeList'),
+        component: () => import('@/views/advertise/adPlaceList'),
         meta: {
-          title: '行政通知列表',
+          title: '广告位管理',
           hidden: true,
           breadcrumb: true
         }
       }
     ]
-
   },
   {
-    path: '/noticeListApply',
+    path: '/adPlaceDetail',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/news/noticeListApply'),
+        component: () => import('@/views/advertise/adPlaceDetail'),
         meta: {
-          title: '行政通知审核列表',
+          title: '广告位详情',
           hidden: true,
           breadcrumb: true
         }
       }
     ]
-
   },
   {
-    path: '/ncomplaintList',
+    path: '/blogroll',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/news/ncomplaintList'),
+        component: () => import('@/views/website/blogroll.vue'),
         meta: {
-          title: '投诉举报',
+          title: '友情链接',
           hidden: true,
           breadcrumb: true
         }
       }
     ]
-
   },
   {
-    path: '/ncomplaintListApply',
+    path: '/blackWordList',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/news/ncomplaintListApply'),
+        component: () => import('@/views/website/blackWordList.vue'),
         meta: {
-          title: '投诉举报审核列表',
+          title: '违禁词',
           hidden: true,
           breadcrumb: true
         }
       }
     ]
-
   },
   {
-    path: '/ncomplaintListDeal',
+    path: '/tabbar',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/news/ncomplaintListDeal'),
+        component: () => import('@/views/tabbar/tabbar.vue'),
         meta: {
-          title: '投诉举报处理页面',
+          title: '单页',
           hidden: true,
           breadcrumb: true
         }
       }
     ]
-
   },
-
   {
-    path: '/addNcomplaint',
+    path: '/tabbarDetail',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/news/addNcomplaint'),
+        component: () => import('@/views/tabbar/tabbarDetail.vue'),
         meta: {
-          title: '添加投诉举报',
+          title: '单页详情',
           hidden: true,
           breadcrumb: true
         }
       }
     ]
-
   },
+  // {
+  //   path: '/documentation',
+  //   component: Layout,
+  //   children: [
+  //     {
+  //       path: 'index',
+  //       component: () => import('@/views/documentation/index'),
+  //       name: 'Documentation',
+  //       meta: { title: 'documentation', icon: 'documentation', affix: true }
+  //     }
+  //   ]
+  // },
+  // {
+  //   path: '/guide',
+  //   component: Layout,
+  //   redirect: '/guide/index',
+  //   children: [
+  //     {
+  //       path: 'index',
+  //       component: () => import('@/views/guide/index'),
+  //       name: 'Guide',
+  //       meta: { title: 'guide', icon: 'guide', noCache: true }
+  //     }
+  //   ]
+  // },
   {
-    path: '/addBook',
+    path: '/profile',
     component: Layout,
+    redirect: '/profile/index',
+    hidden: true,
     children: [
       {
-        name: '',
-        path: '',
-        component: () => import('@/views/news/addBook'),
+        path: 'index',
+        component: () => import('@/views/profile/index'),
+        name: 'Profile',
         meta: {
-          title: '添加书刊音像',
+          title: '个人中心',
           hidden: true,
           breadcrumb: true
         }
       }
     ]
   },
-  {
-    path: '/bookList',
+  {//站点标识
+    path: '/websiteTag',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/news/bookList'),
+        component: () => import('@/views/website/websiteTag'),
         meta: {
-          title: '书刊音像列表',
+          title: '网站分组',
           hidden: true,
           breadcrumb: true
         }
       }
     ]
   },
-  {
-    path: '/bookListApply',
+  {//待审核列表
+    path: '/examine',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/news/bookListApply'),
+        component: () => import('@/views/news/examine'),
         meta: {
-          title: '书刊音像待审核列表',
+          title: '待审核列表',
           hidden: true,
           breadcrumb: true
         }
       }
     ]
   },
-  {
-    path: '/jobHuntingApplyList',
+  { //投票列表
+    path: '/surveyList',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/news/jobHuntingApplyList'),
+        component: () => import('@/views/news/surveyList'),
         meta: {
-          title: '人才库',
+          title: '投票列表',
           hidden: true,
           breadcrumb: true
         }
@@ -769,15 +701,15 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/jobHuntingApplyDetil',
+    path: '/goodList',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/news/jobHuntingApplyDetil'),
+        component: () => import('@/views/news/GoodList'),
         meta: {
-          title: '人才库',
+          title: '商品列表',
           hidden: true,
           breadcrumb: true
         }
@@ -785,15 +717,15 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/jobOpportunities',
+    path: '/goodListApply',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/job/jobOpportunitiesList'),
+        component: () => import('@/views/news/GoodListApply'),
         meta: {
-          title: '职场机会',
+          title: '商品待审核列表',
           hidden: true,
           breadcrumb: true
         }
@@ -801,15 +733,15 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/jobOpportunitiesDetails',
+    path: '/addGood',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/job/jobOpportunitiesDetails'),
+        component: () => import('@/views/news/addGood'),
         meta: {
-          title: '职场机会',
+          title: '添加商品',
           hidden: true,
           breadcrumb: true
         }
@@ -817,33 +749,31 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/myApplyList',
+    path: '/addBook',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/news/myApplyList'),
+        component: () => import('@/views/news/addBook'),
         meta: {
-          title: '我的申请',
+          title: '添加书刊音像',
           hidden: true,
           breadcrumb: true
         }
       }
     ]
   },
-  // ----------liuj------------
-
   {
-    path: '/topic',
+    path: '/bookList',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/chat/topic'),
+        component: () => import('@/views/news/bookList'),
         meta: {
-          title: '课题',
+          title: '书刊音像列表',
           hidden: true,
           breadcrumb: true
         }
@@ -851,336 +781,21 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/webRule',
+    path: '/bookListApply',
     component: Layout,
     children: [
       {
         name: '',
         path: '',
-        component: () => import('@/views/crawler/webRule'),
+        component: () => import('@/views/news/bookListApply'),
         meta: {
-          title: '规则列表',
+          title: '书刊音像待审核列表',
           hidden: true,
           breadcrumb: true
         }
       }
     ]
   },
-  {
-    path: '/gather',
-    component: Layout,
-    children: [
-      {
-        name: '',
-        path: '',
-        component: () => import('@/views/crawler/gather'),
-        meta: {
-          title: '采集器',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  },
-  {
-    path: '/creatTopic',
-    component: Layout,
-    children: [
-      {
-        name: '',
-        path: '',
-        component: () => import('@/views/chat/creatTopic'),
-        meta: {
-          title: '编辑课题',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  },
-  {
-    path: '/webCrawlerList',
-    component: Layout,
-    children: [
-      {
-        name: '',
-        path: '',
-        component: () => import('@/views/crawler/webCrawlerList'),
-        meta: {
-          title: '采集列表',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  },
-  {
-    path: '/webCrawlerListEdit',
-    component: Layout,
-    children: [
-      {
-        name: '',
-        path: '',
-        component: () => import('@/views/crawler/webCrawlerListEdit'),
-        meta: {
-          title: '编辑资讯',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  },
-  {
-    path: '/adList',
-    component: Layout,
-    children: [
-      {
-        name: '',
-        path: '',
-        component: () => import('@/views/advertise/advertiseList.vue'),
-        meta: {
-          title: '广告列表',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  },
-  {
-    path: '/adPlaceList',
-    component: Layout,
-    children: [
-      {
-        name: '',
-        path: '',
-        component: () => import('@/views/advertise/adPlaceList'),
-        meta: {
-          title: '广告位管理',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  },
-  {//站点标识
-    path: '/websiteTag',
-    component: Layout,
-    children: [
-      {
-        name: '',
-        path: '',
-        component: () => import('@/views/website/websiteTag'),
-        meta: {
-          title: '网站分组',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  },
-  {
-    path: '/adPlaceDetail',
-    component: Layout,
-    children: [
-      {
-        name: '',
-        path: '',
-        component: () => import('@/views/advertise/adPlaceDetail'),
-        meta: {
-          title: '广告位详情',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  },
-  {
-    path: '/blogroll',
-    component: Layout,
-    children: [
-      {
-        name: '',
-        path: '',
-        component: () => import('@/views/website/blogroll.vue'),
-        meta: {
-          title: '友情链接',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  },
-  {
-    path: '/blackWordList',
-    component: Layout,
-    children: [
-      {
-        name: '',
-        path: '',
-        component: () => import('@/views/website/blackWordList.vue'),
-        meta: {
-          title: '违禁词',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  },
-  {
-    path: '/tabbar',
-    component: Layout,
-    children: [
-      {
-        name: '',
-        path: '',
-        component: () => import('@/views/tabbar/tabbar.vue'),
-        meta: {
-          title: '单页',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  },
-  {
-    path: '/tabbarDetail',
-    component: Layout,
-    children: [
-      {
-        name: '',
-        path: '',
-        component: () => import('@/views/tabbar/tabbarDetail.vue'),
-        meta: {
-          title: '单页详情',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  },
-  {
-    path: '/creatTabbarDetail',
-    component: Layout,
-    children: [
-      {
-        name: '',
-        path: '',
-        component: () => import('@/views/tabbar/creatTabbarDetail.vue'),
-        meta: {
-          title: '添加单页详情',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  },
-  {
-    path: '/style',
-    component: Layout,
-    children: [
-      {
-        name: '',
-        path: '',
-        component: () => import('@/views/componentGallery/style.vue'),
-        meta: {
-          title: '风格',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  },
-  {
-    path: '/plate',
-    component: Layout,
-    children: [
-      {
-        name: '',
-        path: '',
-        component: () => import('@/views/componentGallery/plate.vue'),
-        meta: {
-          title: '版块',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  },
-  {
-    path: '/module',
-    component: Layout,
-    children: [
-      {
-        name: '',
-        path: '',
-        component: () => import('@/views/componentGallery/module.vue'),
-        meta: {
-          title: '组件',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  },
-  {
-    path: '/imgList',
-    component: Layout,
-    children: [
-      {
-        name: '',
-        path: '',
-        component: () => import('@/views/componentGallery/imgList.vue'),
-        meta: {
-          title: '静态资源管理',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  },
-  // {
-  //   path: '/documentation',
-  //   component: Layout,
-  //   children: [
-  //     {
-  //       path: 'index',
-  //       component: () => import('@/views/documentation/index'),
-  //       name: 'Documentation',
-  //       meta: { title: 'documentation', icon: 'documentation', affix: true }
-  //     }
-  //   ]
-  // },
-  // {
-  //   path: '/guide',
-  //   component: Layout,
-  //   redirect: '/guide/index',
-  //   children: [
-  //     {
-  //       path: 'index',
-  //       component: () => import('@/views/guide/index'),
-  //       name: 'Guide',
-  //       meta: { title: 'guide', icon: 'guide', noCache: true }
-  //     }
-  //   ]
-  // },
-  {
-    path: '/profile',
-    component: Layout,
-    redirect: '/profile/index',
-    hidden: true,
-    children: [
-      {
-        path: 'index',
-        component: () => import('@/views/profile/index'),
-        name: 'Profile',
-        meta: {
-          title: '个人中心',
-          hidden: true,
-          breadcrumb: true
-        }
-      }
-    ]
-  }
 ]
 
 /**