diff --git a/src/router/modules/base.ts b/src/router/modules/base.ts index 0ad5672e..4d95eaee 100644 --- a/src/router/modules/base.ts +++ b/src/router/modules/base.ts @@ -1,8 +1,8 @@ import { Layout } from '@/utils/routerHelper' import xmCoreRouter from './xm_core' -import xmProRouter from './xm_pro' -// import xmProxyRouter from './xm_proxy' +// import xmProRouter from './xm_pro' +import xmProxyRouter from './xm_proxy' import profileRouter from './profile' @@ -184,7 +184,7 @@ const BaseRouter: AppRouteRecordRaw[] = [ const allRouter:AppRouteRecordRaw[] = BaseRouter .concat(profileRouter) .concat(xmCoreRouter) -.concat(xmProRouter) -// .concat(xmProxyRouter) +// .concat(xmProRouter) +.concat(xmProxyRouter) .concat(baseWorkflowRouter) export default allRouter diff --git a/src/views/xm/index.js b/src/views/xm/index.js index e805fa11..d90423d5 100644 --- a/src/views/xm/index.js +++ b/src/views/xm/index.js @@ -50,29 +50,25 @@ import XmDynamics from '@/views/xm/core/components/XmDynamics.vue' //下面为开源版引入 proxy中的组件 -// import XmRpt from '@/views/xm/proxy/index.vue'; -// import XmTaskGantt from '@/views/xm/proxy/index.vue'; -// import WbsGantt from '@/views/xm/proxy/index.vue'; -// import XmKpi from '@/views/xm/proxy/index.vue'; -// import XmKpiForm from '@/views/xm/proxy/index.vue'; -// import XmKpiHis from '@/views/xm/proxy/index.vue'; -// import XmKpiTree from '@/views/xm/proxy/index.vue'; -// import XmBudgetForProject from '@/views/xm/proxy/index.vue'; -// import XmCostForProject from '@/views/xm/proxy/index.vue'; +import XmRpt from '@/views/xm/proxy/index.vue'; +import XmTaskGantt from '@/views/xm/proxy/index.vue'; +import WbsGantt from '@/views/xm/proxy/index.vue'; +import XmKpi from '@/views/xm/proxy/index.vue'; +import XmKpiForm from '@/views/xm/proxy/index.vue'; +import XmKpiHis from '@/views/xm/proxy/index.vue'; +import XmKpiTree from '@/views/xm/proxy/index.vue'; // end 开源版 // 下面为专业版引入的 pro中的组件 -import XmRpt from '@/views/xm/pro/rpt/index/index.vue'; -import XmTaskGantt from "@/views/xm/pro/gantt/XmTaskGantt.vue"; //甘特图 -import WbsGantt from "@/views/xm/pro/gantt/WbsGantt.vue"; //甘特图 -import XmKpi from "@/views/xm/pro/kpi/Index.vue"; //kpi -import XmKpiForm from "@/views/xm/pro/kpi/Form.vue"; //kpi -import XmKpiHis from "@/views/xm/pro/kpi/IndexHis.vue"; //kpi -import XmKpiTree from "@/views/xm/pro/kpi/XmKpiTree.vue"; //kpi -// import XmBudgetForProject from "@/views/xm/pro/fin/XmBudgetForProject.vue"; //budget -// import XmCostForProject from "@/views/xm/pro/fin/XmCostForProject.vue"; //cost +// import XmRpt from '@/views/xm/pro/rpt/index/index.vue'; +// import XmTaskGantt from "@/views/xm/pro/gantt/XmTaskGantt.vue"; //甘特图 +// import WbsGantt from "@/views/xm/pro/gantt/WbsGantt.vue"; //甘特图 +// import XmKpi from "@/views/xm/pro/kpi/Index.vue"; //kpi +// import XmKpiForm from "@/views/xm/pro/kpi/Form.vue"; //kpi +// import XmKpiHis from "@/views/xm/pro/kpi/IndexHis.vue"; //kpi +// import XmKpiTree from "@/views/xm/pro/kpi/XmKpiTree.vue"; //kpi // end 专业版 @@ -117,8 +113,6 @@ const compLists = { Vue.component('XmKpiForm', XmKpiForm) Vue.component('XmKpiHis', XmKpiHis) Vue.component('XmKpiTree', XmKpiTree) - // Vue.component('XmBudgetForProject', XmBudgetForProject) - // Vue.component('XmCostForProject', XmCostForProject) } } export default compLists