From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/router/index.js | 82 +++++++++++++++++------------------------
1 files changed, 34 insertions(+), 48 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index a4a55f7..a1bc174 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,7 +1,5 @@
import React, {Component} from 'react'
import {HashRouter, Switch, Route, Redirect} from 'react-router-dom'
-import md5 from 'md5'
-import moment from 'moment'
import asyncComponent from '@/utils/asyncComponent'
import asyncLoadComponent from '@/utils/asyncLoadComponent'
@@ -16,7 +14,6 @@
const AppCheck = asyncLoadComponent(() => import('@/views/appcheck'))
const PCDesign = asyncLoadComponent(() => import('@/views/pcdesign'))
const MobDesign = asyncLoadComponent(() => import('@/views/mobdesign'))
-const PopDesign = asyncLoadComponent(() => import('@/views/popdesign'))
const ImDesign = asyncLoadComponent(() => import('@/views/imdesign'))
const MenuDesign = asyncLoadComponent(() => import('@/views/menudesign'))
const BaseDesign = asyncLoadComponent(() => import('@/views/basedesign'))
@@ -26,60 +23,49 @@
const Interface = asyncLoadComponent(() => import('@/views/interface'))
const RoleManage = asyncLoadComponent(() => import('@/views/rolemanage'))
const SystemFunc = asyncLoadComponent(() => import('@/views/systemfunc'))
+const SystemProc = asyncLoadComponent(() => import('@/views/systemproc'))
+// const SystemCheck = asyncLoadComponent(() => import('@/views/syscheck'))
+const MkIframe = asyncLoadComponent(() => import('@/views/mkiframe'))
+// const MkAi = asyncLoadComponent(() => import('@/views/mkai'))
const routers = [
- {path: '/login', name: 'login', component: Login, auth: false},
- {path: '/main', name: 'main', component: Main, auth: true},
- {path: '/pay/:param', name: 'pay', component: Pay, auth: false},
- {path: '/print/:param', name: 'print', component: PrintT, auth: false},
- {path: '/ssologin/:param', name: 'ssologin', component: Sso, auth: false},
- {path: '/design', name: 'design', component: Design, auth: true},
- {path: '/appmanage', name: 'appmanage', component: AppManage, auth: true},
- {path: '/appcheck', name: 'appcheck', component: AppCheck, auth: true},
- {path: '/pcdesign/:param', name: 'pcdesign', component: PCDesign, auth: true},
- {path: '/mobdesign/:param', name: 'mobdesign', component: MobDesign, auth: true},
- {path: '/imdesign/:param', name: 'imdesign', component: ImDesign, auth: true},
- {path: '/menudesign/:param', name: 'menudesign', component: MenuDesign, auth: true},
- {path: '/basedesign/:param', name: 'basedesign', component: BaseDesign, auth: true},
- {path: '/tabledesign/:param', name: 'tabledesign', component: TableDesign, auth: true},
- {path: '/popdesign/:param', name: 'popdesign', component: PopDesign, auth: true},
- {path: '/billprint/:param', name: 'billprint', component: BillPrint, auth: true},
- {path: '/docprint/:menuId', name: 'docprint', component: BillPrint, auth: false},
- {path: '/docprint/:menuId/:id', name: 'docprint', component: BillPrint, auth: false},
- {path: '/tab/:menuId', name: 'tab', component: MainParams, auth: false},
- {path: '/role/:param', name: 'role', component: RoleManage, auth: true},
- {path: '/hs', name: 'hs', component: SystemFunc, auth: true},
- {path: '/interface', name: 'interface', component: Interface, auth: true}
+ {path: '/login', name: 'login', component: Login},
+ {path: '/main', name: 'main', component: Main},
+ {path: '/pay/:param', name: 'pay', component: Pay},
+ {path: '/print/:param', name: 'print', component: PrintT},
+ {path: '/ssologin/:param', name: 'ssologin', component: Sso},
+ {path: '/design', name: 'design', component: Design},
+ {path: '/appmanage', name: 'appmanage', component: AppManage},
+ {path: '/appcheck', name: 'appcheck', component: AppCheck},
+ {path: '/pcdesign/:param', name: 'pcdesign', component: PCDesign},
+ {path: '/mobdesign/:param', name: 'mobdesign', component: MobDesign},
+ {path: '/imdesign/:param', name: 'imdesign', component: ImDesign},
+ {path: '/menudesign/:param', name: 'menudesign', component: MenuDesign},
+ {path: '/basedesign/:param', name: 'basedesign', component: BaseDesign},
+ {path: '/tabledesign/:param', name: 'tabledesign', component: TableDesign},
+ {path: '/billprint/:param', name: 'billprint', component: BillPrint},
+ {path: '/docprint/:menuId', name: 'docprint', component: BillPrint},
+ {path: '/docprint/:menuId/:id', name: 'docprint', component: BillPrint},
+ {path: '/tab/:menuId', name: 'tab', component: MainParams},
+ {path: '/role/:param', name: 'role', component: RoleManage},
+ {path: '/hs', name: 'hs', component: SystemFunc},
+ {path: '/proc', name: 'proc', component: SystemProc},
+ {path: '/proc/:func', name: 'proc', component: SystemProc},
+ {path: '/iframe/:menuId/:loginUid', name: 'iframe', component: MkIframe},
+ {path: '/iframe/:menuId/:loginUid/:bid', name: 'iframe', component: MkIframe},
+ {path: '/view/:menuId', name: 'iframe', component: MkIframe},
+ {path: '/view/:menuId/:bid', name: 'iframe', component: MkIframe},
+ {path: '/interface', name: 'interface', component: Interface},
+ // {path: '/ai', name: 'ai', component: MkAi},
+ // {path: '/syscheck', name: 'syscheck', component: SystemCheck}
]
export default class RouteConfig extends Component {
- controlRoute (item, props) {
- if (!item.auth) { // 涓嶉渶瑕佹巿鏉冿紝鐩存帴璺宠浆
- return (<item.component {...props}/>)
- }
-
- let authCode = localStorage.getItem(window.location.href.split('#')[0] + 'AuthCode') // 鍒ゆ柇绯荤粺鏄惁鍦ㄦ巿鏉冩湡闄愬唴
- let _s = md5('mksoft' + moment().format('YYYYMMDD'))
- let isauth = authCode && authCode.includes(_s)
- let key = md5(window.GLOB.appId + 'minke_software' + window.GLOB.appkey).toUpperCase().substr(-6)
- let key1 = window.GLOB.licenseKey ? window.GLOB.licenseKey.substring(0, 6) : ''
-
- if (key1 === key) {
- isauth = true
- }
-
- if (isauth) {
- return (<item.component {...props}/>)
- } else {
- return (<Redirect to={{ pathname: '/login'}}/>)
- }
- }
-
render () {
return (
<HashRouter>
<Switch>
- {routers.map((item, index) => <Route key={index} path={item.path} name={item.name} exact render={ props => this.controlRoute(item, props)}/>)}
+ {routers.map((item, index) => <Route key={index} path={item.path} name={item.name} exact render={ props => <item.component {...props}/>}/>)}
<Redirect exact from="/" to="login"/>
<Route component= {NotFound}/>
</Switch>
--
Gitblit v1.8.0