Commit f3ba206f authored by suhuiguang's avatar suhuiguang

1.修改路由,待整理

parent 2d6f356a
......@@ -6,8 +6,18 @@ import notFound from 'amos-security/lib/routes/notfound';
import redirect from 'amos-security/lib/routes/notfound/redirect';
import SysConsts from 'amos-security/lib/consts';
import calcRoutes from './calcRoutes';
import addCustomRoutes, { customRoutes } from './customRoutes';
import pageCompontent, { AsyncRootView, AsyncLogin, AsyncUserInfo, AsyncRootBizView, AsyncConsoleView, AsyncRegionList } from './asyncView';
import addCustomRoutes, { customRoutes, planChildrenRoutes } from './customRoutes';
import pageCompontent,
{ AsyncRootView,
AsyncLogin,AsyncUserInfo,
AsyncRootBizView,
AsyncConsoleView,
AsyncRegionList,
AsyncIot3DGraphBiz,
AsyncShareTextPlan,
AsyncPublishApp,
AsyncModelEdit
} from './asyncView';
import routerFilter, { checkLogin } from 'amos-security/lib/routes/validateRouter';
import signUp, { signupRouters } from 'amos-security/lib/routes/signUp';
import AutoLogin from './../view/autoLogin/AutoLogin';
......@@ -15,7 +25,7 @@ import AutoLogin from './../view/autoLogin/AutoLogin';
const apiKey = SysConsts.api_key;
const groups = [
'main', 'biz', 'console'
'main', 'biz', 'console', 'ruleConfig'
];
const injectRoutes = menus => {
......@@ -24,9 +34,13 @@ const injectRoutes = menus => {
const bizChilds = addCustomRoutes(biz);
const consoleChilds = addCustomRoutes(consoleRoutes);
const routes = [
{ path: 'viz3d/:subjectId', component: AsyncIot3DGraphBiz },
{ path: 'viz3dpub', component: AsyncPublishApp },
{ path: 'models/:modelId', component: AsyncModelEdit },
{ path: 'login', component: AsyncLogin },
{ path: 'autologin', component: AutoLogin },
{ path: 'region', component: AsyncRegionList }, // 区域选择
{ path: 'shareTextPlan', component: AsyncShareTextPlan },
...signUp,
{
path: 'main',
......@@ -36,7 +50,9 @@ const injectRoutes = menus => {
{
path: 'biz',
component: AsyncRootBizView,
childRoutes: [...bizChilds, ...customRoutes]
childRoutes: [...bizChilds, ...customRoutes,
planChildrenRoutes
]
},
{
path: 'console',
......
......@@ -61,7 +61,11 @@ const AsyncAlarmVideoMonitor = props => <AsyncLoader load={import('./../view/biz
const AsyncAlarmTestView = props => <AsyncLoader load={import('./../view/bizview/alarm')} componentProps={props} />;
const AsyncCusVizLib = props => <AsyncLoader load={import('./../view/planMgmt/cusVizLib')} componentProps={props} />;
const AsyncGraph3DModel = props => <AsyncLoader load={import('amos-iot-3dgraph/lib/view/modelMgmt')} componentProps={props} />;
const AsyncLeaderStruct = props => <AsyncLoader load={import('./../view/planMgmt/view/leaderStruct')} componentProps={props} />;
const AsyncIot3DGraphBiz = props => <AsyncLoader load={import('./../view/planMgmt/iot3DGraph')} componentProps={props} />;
const AsyncShareTextPlan = props => <AsyncLoader load={import('./../view/planMgmt/view/ShareTextPlan')} componentProps={props} />;
const AsyncPublishApp = props => <AsyncLoader load={import('amos-iot-3dgraph/lib/view/pubview')} componentProps={props} />;
const AsyncModelEdit = props => <AsyncLoader load={import('amos-iot-3dgraph/lib/view/modelMgmt/edit/ModelEdit')} componentProps={props} />;
const Routes = {
// 添加 rules 路由
......@@ -118,13 +122,25 @@ const Routes = {
alarmVideoMonitor: AsyncAlarmVideoMonitor,
alarmTest: AsyncAlarmTestView,
vizlib: AsyncCusVizLib,
modelManage: AsyncGraph3DModel
modelManage: AsyncGraph3DModel,
leaderStruct: AsyncLeaderStruct
};
const pageCompontent = key => {
return Routes[key] || AsyncEmptyPage;
};
export { AsyncLogin, AsyncRootView, AsyncUserInfo, AsyncRootBizView, AsyncConsoleView, AsyncRegionList };
export {
AsyncLogin,
AsyncRootView,
AsyncUserInfo,
AsyncRootBizView,
AsyncConsoleView,
AsyncRegionList,
AsyncIot3DGraphBiz,
AsyncShareTextPlan,
AsyncPublishApp,
AsyncModelEdit
};
export default pageCompontent;
export default pageCompontent;
\ No newline at end of file
......@@ -17,7 +17,6 @@ import pageCompontent, {
} from './view';
import Iot3DGraphBiz from './../view/planMgmt/iot3DGraph';
import ShareTextPlan from './../view/planMgmt/view/ShareTextPlan';
import TextPlan from './../view/planMgmt/view/TextPlan';
import PublishApp from 'amos-iot-3dgraph/lib/view/pubview';
import ModelEdit from 'amos-iot-3dgraph/lib/view/modelMgmt/edit/ModelEdit';
......@@ -34,10 +33,10 @@ const injectRoutes = menus => {
{ path: 'viz3d/:subjectId', component: Iot3DGraphBiz },
{ path: 'viz3dpub', component: PublishApp },
{ path: 'models/:modelId', component: ModelEdit },
{ path: 'shareTextPlan', component: ShareTextPlan },
{ path: 'login', component: Login },
{ path: 'autologin', component: AutoLogin },
{ path: 'region', component: RegionList }, // 区域选择
{ path: 'shareTextPlan', component: ShareTextPlan },
...signUp,
{
path: 'main',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment