代码同步
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
import Vue from 'vue'
|
||||
<<<<<<< HEAD
|
||||
import Router from 'vue-router'
|
||||
import store from '../store'
|
||||
import { Message } from 'element-ui'
|
||||
@@ -9,6 +10,15 @@ const routes = [
|
||||
redirect: '/login'
|
||||
},
|
||||
// 登录页
|
||||
=======
|
||||
import VueRouter from 'vue-router'
|
||||
import Layout from '@/layouts'
|
||||
import EmptyLayout from '@/layouts/EmptyLayout'
|
||||
import { publicPath, routerMode } from '@/config'
|
||||
|
||||
Vue.use(VueRouter)
|
||||
export const constantRoutes = [
|
||||
>>>>>>> eaffe51836854f3e12a9c56f9ac3f743d659fed4
|
||||
{
|
||||
path: '/login',
|
||||
name: 'Login',
|
||||
@@ -1759,6 +1769,7 @@ const routes = [
|
||||
menuId: 'ABCLRLJUQN44ENBS93CQ'
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
// 技术要求清单
|
||||
{
|
||||
path: '/skillReq',
|
||||
@@ -1770,6 +1781,24 @@ const routes = [
|
||||
requireAuth: true,
|
||||
title: '技术要求清单'
|
||||
},
|
||||
=======
|
||||
]
|
||||
|
||||
export const asyncRoutes = [
|
||||
// {
|
||||
// path: '/',
|
||||
// component: Home,
|
||||
// meta: {
|
||||
// title: '首页',
|
||||
// icon: 'home',
|
||||
// affix: true,
|
||||
// },
|
||||
// },
|
||||
{
|
||||
path: '/',
|
||||
component: Layout,
|
||||
redirect: 'index',
|
||||
>>>>>>> eaffe51836854f3e12a9c56f9ac3f743d659fed4
|
||||
children: [
|
||||
{
|
||||
path: '/skillReqSee',
|
||||
@@ -1820,6 +1849,7 @@ const routes = [
|
||||
menuId: 'RAFQ4N4ARF'
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
{
|
||||
path: '/dynamicInformationMore',
|
||||
name: 'DynamicInformationMore',
|
||||
@@ -1951,9 +1981,56 @@ const routes = [
|
||||
parentPath: '/dynamicInformation',
|
||||
menuId: 'CHZFKH6J89'
|
||||
}
|
||||
=======
|
||||
],
|
||||
}, */
|
||||
|
||||
{
|
||||
path: '/vab',
|
||||
component: Layout,
|
||||
redirect: 'noRedirect',
|
||||
name: 'Vab',
|
||||
alwaysShow: true,
|
||||
meta: { title: '工作台', icon: 'box-open' },
|
||||
children: [
|
||||
{
|
||||
path: 'permissions',
|
||||
name: 'Permission',
|
||||
component: () => import('@/views/vab/permissions/index'),
|
||||
meta: {
|
||||
title: '流程中心',
|
||||
permissions: ['admin', 'editor'],
|
||||
},
|
||||
},
|
||||
{
|
||||
path: 'table',
|
||||
component: () => import('@/views/vab/table/index'),
|
||||
name: 'Table',
|
||||
meta: {
|
||||
title: '发起流程',
|
||||
permissions: ['admin'],
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
path: '/personnelManagement',
|
||||
component: Layout,
|
||||
redirect: 'noRedirect',
|
||||
name: 'PersonnelManagement',
|
||||
meta: { title: '标准法规部', icon: 'users-cog', permissions: ['admin'] },
|
||||
children: [
|
||||
{
|
||||
path: 'userManagement',
|
||||
name: 'UserManagement',
|
||||
component: () =>
|
||||
import('@/views/personnelManagement/userManagement/index'),
|
||||
meta: { title: '动态&资料' },
|
||||
>>>>>>> eaffe51836854f3e12a9c56f9ac3f743d659fed4
|
||||
},
|
||||
// 资料中心
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
path: '/informationCenter/:id?',
|
||||
name: 'InformationCenter',
|
||||
component: () =>
|
||||
@@ -1964,9 +2041,17 @@ const routes = [
|
||||
parentPath: '/dynamicInformation',
|
||||
menuId: 'MYVMD8FFJ8'
|
||||
}
|
||||
=======
|
||||
path: 'roleManagement',
|
||||
name: 'RoleManagement',
|
||||
component: () =>
|
||||
import('@/views/personnelManagement/roleManagement/index'),
|
||||
meta: { title: '国内标准法规' },
|
||||
>>>>>>> eaffe51836854f3e12a9c56f9ac3f743d659fed4
|
||||
},
|
||||
// 实施预警
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
path: '/implementWarning',
|
||||
name: 'ImplementWarning',
|
||||
component: () =>
|
||||
@@ -2000,9 +2085,35 @@ const routes = [
|
||||
menuId: '3YVZP8R4TC',
|
||||
parentPath: '/enterpriseStandardDatabase'
|
||||
}
|
||||
=======
|
||||
path: 'menuManagement',
|
||||
name: 'MenuManagement',
|
||||
component: () =>
|
||||
import('@/views/personnelManagement/menuManagement/index'),
|
||||
meta: { title: '海外标准法规', badge: 'New' },
|
||||
},
|
||||
{
|
||||
path: 'foreignRegulationsDatabase',
|
||||
name: 'ForeignRegulationsDatabase',
|
||||
component: () =>
|
||||
import(
|
||||
'@/views/personnelManagement/foreignRegulationsDatabase/index'
|
||||
),
|
||||
meta: { title: '国内外政策' },
|
||||
},
|
||||
{
|
||||
path: 'enterpriseStandardDatabase',
|
||||
name: 'EnterpriseStandardDatabase',
|
||||
component: () =>
|
||||
import(
|
||||
'@/views/personnelManagement/enterpriseStandardDatabase/index'
|
||||
),
|
||||
meta: { title: '企业标准' },
|
||||
>>>>>>> eaffe51836854f3e12a9c56f9ac3f743d659fed4
|
||||
},
|
||||
// 标准法规库 - 标准法规清单
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
path: '/accessStandardsAndRegulations',
|
||||
name: 'AccessStandardsAndRegulations',
|
||||
component: () =>
|
||||
@@ -2025,9 +2136,28 @@ const routes = [
|
||||
title: '标准法规清单详情'
|
||||
// menuId: 'A594R75XEQ'
|
||||
}
|
||||
=======
|
||||
path: 'accessStandardsAndRegulations',
|
||||
name: 'AccessStandardsAndRegulations',
|
||||
component: () =>
|
||||
import(
|
||||
'@/views/personnelManagement/accessStandardsAndRegulations/index'
|
||||
),
|
||||
meta: { title: '标准法规清单' },
|
||||
},
|
||||
{
|
||||
path: 'localProductsOrProjectLibrary',
|
||||
name: 'LocalProductsOrProjectLibrary',
|
||||
component: () =>
|
||||
import(
|
||||
'@/views/personnelManagement/localProductsOrProjectLibrary/index'
|
||||
),
|
||||
meta: { title: '车型项目库' },
|
||||
>>>>>>> eaffe51836854f3e12a9c56f9ac3f743d659fed4
|
||||
},
|
||||
// 标准法规库 - 标准法规清单 - 新增、编辑
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
path: '/listOfStandardsAndRegulationsDetails',
|
||||
name: 'ListOfStandardsAndRegulationsDetails',
|
||||
component: () =>
|
||||
@@ -2074,9 +2204,58 @@ const routes = [
|
||||
title: '备案产品标准库',
|
||||
menuId: 'MQBAGJQMSRZDRX3X5AVR'
|
||||
}
|
||||
=======
|
||||
path: 'nonConfomity',
|
||||
name: 'NonConfomity',
|
||||
component: () =>
|
||||
import('@/views/personnelManagement/nonConfomity/index'),
|
||||
meta: { title: '未符合项整改' },
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
path: '/standardWarning',
|
||||
component: Layout,
|
||||
redirect: 'noRedirect',
|
||||
children: [
|
||||
{
|
||||
path: 'standardWarning',
|
||||
name: 'StandardWarning',
|
||||
component: () => import('@/views/standardWarning/index'),
|
||||
meta: {
|
||||
title: '标准预警',
|
||||
icon: 'home',
|
||||
affix: true,
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
path: '/localTool',
|
||||
component: Layout,
|
||||
redirect: 'noRedirect',
|
||||
name: 'LocalTool',
|
||||
meta: {
|
||||
title: '本地工具',
|
||||
icon: 'shopping-cart',
|
||||
permissions: ['admin'],
|
||||
},
|
||||
|
||||
children: [
|
||||
{
|
||||
path: 'standardRecognition',
|
||||
name: 'StandardRecognition',
|
||||
component: () => import('@/views/localTool/standardRecognition/index'),
|
||||
meta: {
|
||||
title: '标准内容自动识别',
|
||||
noKeepAlive: true,
|
||||
},
|
||||
children: null,
|
||||
>>>>>>> eaffe51836854f3e12a9c56f9ac3f743d659fed4
|
||||
},
|
||||
// 动态信息
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
path: '/information',
|
||||
name: 'information',
|
||||
component: () =>
|
||||
@@ -2097,6 +2276,31 @@ const routes = [
|
||||
parentPath: '/information',
|
||||
title: '动态信息详情'
|
||||
}
|
||||
=======
|
||||
path: 'standAutoSplit',
|
||||
name: 'StandAutoSplit',
|
||||
component: () => import('@/views/localTool/standAutoSplit/index'),
|
||||
meta: {
|
||||
title: '标准拆分',
|
||||
},
|
||||
},
|
||||
{
|
||||
path: 'standContrast',
|
||||
name: 'StandContrast',
|
||||
component: () => import('@/views/localTool/standContrast/index'),
|
||||
meta: {
|
||||
title: '标准比对',
|
||||
},
|
||||
},
|
||||
{
|
||||
path: 'standardComparisonLibrary',
|
||||
name: 'StandardComparisonLibrary',
|
||||
component: () =>
|
||||
import('@/views/localTool/standardComparisonLibrary/index'),
|
||||
meta: {
|
||||
title: '标准比对库',
|
||||
},
|
||||
>>>>>>> eaffe51836854f3e12a9c56f9ac3f743d659fed4
|
||||
},
|
||||
// 动态信息-更多
|
||||
{
|
||||
@@ -2123,7 +2327,12 @@ const routes = [
|
||||
import('@/pages/config'),
|
||||
meta: {
|
||||
title: '配置管理',
|
||||
<<<<<<< HEAD
|
||||
menuId: '95KGANGWCV'
|
||||
=======
|
||||
icon: 'shopping-cart',
|
||||
permissions: ['admin'],
|
||||
>>>>>>> eaffe51836854f3e12a9c56f9ac3f743d659fed4
|
||||
},
|
||||
children: [
|
||||
{
|
||||
@@ -2317,10 +2526,17 @@ const routes = [
|
||||
component: () =>
|
||||
import('@/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails'),
|
||||
meta: {
|
||||
<<<<<<< HEAD
|
||||
requireAuth: true,
|
||||
title: '资料中心详情',
|
||||
parentPath: '/dynamicInformationManage'
|
||||
}
|
||||
=======
|
||||
title: '角色管理',
|
||||
noKeepAlive: true,
|
||||
},
|
||||
children: null,
|
||||
>>>>>>> eaffe51836854f3e12a9c56f9ac3f743d659fed4
|
||||
},
|
||||
{
|
||||
path: '/dynamicInformationManage/dynamicInfomationDetails2',
|
||||
@@ -2328,10 +2544,15 @@ const routes = [
|
||||
component: () =>
|
||||
import('@/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2'),
|
||||
meta: {
|
||||
<<<<<<< HEAD
|
||||
requireAuth: true,
|
||||
title: '资料中心详情',
|
||||
isBoolean: true
|
||||
}
|
||||
=======
|
||||
title: '用户管理',
|
||||
},
|
||||
>>>>>>> eaffe51836854f3e12a9c56f9ac3f743d659fed4
|
||||
},
|
||||
// svpps
|
||||
{
|
||||
@@ -2351,6 +2572,7 @@ const routes = [
|
||||
// 详情页
|
||||
// ************************** 其他详情页 ******************************* //
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
path: '/details',
|
||||
name: 'Details',
|
||||
component: () =>
|
||||
@@ -2437,6 +2659,25 @@ const routes = [
|
||||
isBoolean: true,
|
||||
title: '符合性详情'
|
||||
}
|
||||
=======
|
||||
path: '/error',
|
||||
component: EmptyLayout,
|
||||
redirect: 'noRedirect',
|
||||
name: 'Error',
|
||||
meta: { title: '个人中心', icon: 'bug' },
|
||||
children: [
|
||||
{
|
||||
path: '401',
|
||||
name: 'Error401',
|
||||
component: () => import('@/views/401'),
|
||||
meta: { title: '我的消息' },
|
||||
},
|
||||
{
|
||||
path: '404',
|
||||
name: 'Error404',
|
||||
component: () => import('@/views/404'),
|
||||
meta: { title: '我的问答' },
|
||||
>>>>>>> eaffe51836854f3e12a9c56f9ac3f743d659fed4
|
||||
},
|
||||
{
|
||||
path: '/enterBSysRevPlanManaLibDetail/:id/:pageType',
|
||||
|
||||
Reference in New Issue
Block a user