合并管理端修改路由及登录
This commit is contained in:
unknown
commit
f57380b167
25
src/App.js
25
src/App.js
|
|
@ -123,8 +123,20 @@ const AboutUs = Loadable({
|
|||
loading: Loading,
|
||||
})
|
||||
|
||||
const Teaching = Loadable({
|
||||
loader : () => import("./forge/TeachingPractice/Teaching"),
|
||||
// const Teaching = Loadable({
|
||||
// loader : () => import("./forge/TeachingPractice/Teaching"),
|
||||
// loading: Loading,
|
||||
// });
|
||||
|
||||
// 首页
|
||||
const HomePage = Loadable({
|
||||
loader: () => import('./home'),
|
||||
loading: Loading,
|
||||
});
|
||||
|
||||
// 管理页面
|
||||
const Managements = Loadable({
|
||||
loader: () => import('./military/managements'),
|
||||
loading: Loading,
|
||||
})
|
||||
// const CreateMerge = Loadable({
|
||||
|
|
@ -386,6 +398,11 @@ class App extends Component {
|
|||
path="/register"
|
||||
render={(props) =><LoginRegisterPage {...this.props} {...props}/>}
|
||||
></Route>
|
||||
{/*管理页面*/}
|
||||
<Route path="/managements" component={Managements} />
|
||||
|
||||
{/*403*/}
|
||||
<Route path="/403" component={Shixunauthority} />
|
||||
|
||||
{/* 忘记密码 */}
|
||||
<Route
|
||||
|
|
@ -400,10 +417,10 @@ class App extends Component {
|
|||
></Route>
|
||||
|
||||
{/* 教学实践 */}
|
||||
<Route
|
||||
{/* <Route
|
||||
path="/educoder"
|
||||
render={(props) => <Teaching {...this.props} {...props} />}
|
||||
></Route>
|
||||
></Route> */}
|
||||
|
||||
{/* 组织 */}
|
||||
<Route path={"/organize"}
|
||||
|
|
|
|||
|
|
@ -13,14 +13,18 @@ export default props => {
|
|||
|
||||
|
||||
const [current,setCurrent]=useState(JSON.parse(sessionStorage.adminRouter||'[]'));
|
||||
const [title,setTitle]=useState('');
|
||||
|
||||
function handleClick (e){
|
||||
console.log(e)
|
||||
setCurrent([e.key]);
|
||||
setTitle(e.item.props.title);
|
||||
sessionStorage.setItem( 'adminRouter',JSON.stringify([e.key]));
|
||||
};
|
||||
|
||||
const projectMenu = useMemo(() => {
|
||||
return <Menu>
|
||||
<Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${current_main_site_url}/admins`}>项目管理后台</a></Menu.Item>
|
||||
<Menu.Item><a rel="noopener noreferrer" href={`${current_main_site_url}/admins`}>项目管理后台</a></Menu.Item>
|
||||
</Menu>
|
||||
});
|
||||
|
||||
|
|
@ -35,85 +39,78 @@ export default props => {
|
|||
<Menu.Item><a href={`${main_web_site_url}/admin/sign_agreement_setting`}>应征投稿协议内容</a></Menu.Item>
|
||||
</SubMenu>
|
||||
<SubMenu title="代办事项" >
|
||||
<Menu.Item key="delayManage"><Link to={`/task/delayManage`}>延期任务处理</Link></Menu.Item>
|
||||
{/* <Menu.Item><a href={`${main_web_site_url}/admin/audit_files`}>协议签订凭证上传</a></Menu.Item> */}
|
||||
<Menu.Item key="payProof"><Link to="/task/payProof">支付报酬凭证上传</Link></Menu.Item>
|
||||
<Menu.Item title="task" key="delayManage"><Link to="/managements/task/delayManage">延期任务处理</Link></Menu.Item>
|
||||
<Menu.Item title="task" key="payProof"><Link to="/managements/task/payProof">支付报酬凭证上传</Link></Menu.Item>
|
||||
</SubMenu>
|
||||
|
||||
<Menu.Item key="taskAdmin"><Link to="/task/taskAdmin">创客任务列表</Link></Menu.Item>
|
||||
<Menu.Item title="task" key="taskAdmin"><Link to="/managements/task/taskAdmin">创客任务列表</Link></Menu.Item>
|
||||
</Menu>
|
||||
});
|
||||
|
||||
const competitionMenu = useMemo(() => {
|
||||
return <Menu>
|
||||
<Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/admin/competitions/list`}>竞赛列表</a></Menu.Item>
|
||||
<Menu.Item><Link to="/expert/admin/competition">评审任务列表</Link></Menu.Item>
|
||||
return <Menu selectedKeys={current} onClick={handleClick} >
|
||||
<Menu.Item><a rel="noopener noreferrer" href={`${main_web_site_url}/admin/competitions/list`}>竞赛列表</a></Menu.Item>
|
||||
<Menu.Item><a rel="noopener noreferrer" href={`${main_web_site_url}/admin/competitions/region_zone_edit`}>赛区配置</a></Menu.Item>
|
||||
<Menu.Item title="competition" key="competitionReview" ><Link to="/managements/expert/competition">竞赛评审列表</Link></Menu.Item>
|
||||
</Menu>
|
||||
});
|
||||
|
||||
// const expertMenu = useMemo(() => {
|
||||
// return <Menu>
|
||||
// <Menu.Item><Link to={`/expert/admin/register`}>专家注册审核</Link></Menu.Item>
|
||||
// <Menu.Item><Link to={`/expert/admin/list`}>专家库</Link></Menu.Item>
|
||||
// </Menu>
|
||||
// });
|
||||
|
||||
const userMenu = useMemo(() => {
|
||||
return <Menu selectedKeys={current} onClick={handleClick}>
|
||||
<Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/managements/users`}>用户列表</a></Menu.Item>
|
||||
<Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/admin/entities`}>主体信息列表</a></Menu.Item>
|
||||
<Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/managements/users_trial`}>试用授权列表</a></Menu.Item>
|
||||
<Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/managements/auto_users_trial`}>自动授权列表</a></Menu.Item>
|
||||
<Menu.Item key={'register'}><Link to={`/expert/admin/register`}>专家注册列表</Link></Menu.Item>
|
||||
<Menu.Item key={'expertList'}><Link to={`/expert/admin/list`}>专家库列表</Link></Menu.Item>
|
||||
<Menu.Item><a rel="noopener noreferrer" href={`${main_web_site_url}/managements/users`}>用户列表</a></Menu.Item>
|
||||
<Menu.Item><a rel="noopener noreferrer" href={`${main_web_site_url}/admin/entities`}>主体信息列表</a></Menu.Item>
|
||||
<Menu.Item><a rel="noopener noreferrer" href={`${main_web_site_url}/managements/users_trial`}>试用授权列表</a></Menu.Item>
|
||||
<Menu.Item><a rel="noopener noreferrer" href={`${main_web_site_url}/managements/auto_users_trial`}>自动授权列表</a></Menu.Item>
|
||||
<Menu.Item title="user" key={'register'}><Link to="/managements/expert/register">专家注册列表</Link></Menu.Item>
|
||||
<Menu.Item title="user" key={'expertList'}><Link to="/managements/expert/list">专家库列表</Link></Menu.Item>
|
||||
</Menu>
|
||||
});
|
||||
|
||||
const forumMenu = useMemo(() => {
|
||||
return <Menu >
|
||||
<Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/managements/messages_list`}>帖子</a></Menu.Item>
|
||||
<Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/managements/apply_destroy_memos`}>申请删帖</a></Menu.Item>
|
||||
<Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/managements/memo_reply_list`}>回复</a></Menu.Item>
|
||||
<Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/admin/forum_sections`}>版块配置</a></Menu.Item>
|
||||
<Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/admin/banned_users`}>禁言列表</a></Menu.Item>
|
||||
<Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/admin/forum_applies`}>版主审批</a></Menu.Item>
|
||||
<Menu.Item><a rel="noopener noreferrer" href={`${main_web_site_url}/managements/messages_list`}>帖子</a></Menu.Item>
|
||||
<Menu.Item><a rel="noopener noreferrer" href={`${main_web_site_url}/managements/apply_destroy_memos`}>申请删帖</a></Menu.Item>
|
||||
<Menu.Item><a rel="noopener noreferrer" href={`${main_web_site_url}/managements/memo_reply_list`}>回复</a></Menu.Item>
|
||||
<Menu.Item><a rel="noopener noreferrer" href={`${main_web_site_url}/admin/forum_sections`}>版块配置</a></Menu.Item>
|
||||
<Menu.Item><a rel="noopener noreferrer" href={`${main_web_site_url}/admin/banned_users`}>禁言列表</a></Menu.Item>
|
||||
<Menu.Item><a rel="noopener noreferrer" href={`${main_web_site_url}/admin/forum_applies`}>版主审批</a></Menu.Item>
|
||||
</Menu>
|
||||
});
|
||||
|
||||
|
||||
const checkMenu = useMemo(() => {
|
||||
return <Menu selectedKeys={current} onClick={handleClick}>
|
||||
<Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/managements/enterprise_authentication`}>企业认证</a></Menu.Item>
|
||||
{/* <Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/admin/reviews/projects_list`}>开源项目</a></Menu.Item> */}
|
||||
<Menu.Item key={"taskManage1"}><Link to="/task/taskManage/1">统筹任务发布审批</Link></Menu.Item>
|
||||
<Menu.Item key={"taskManage0"}><Link to="/task/taskManage/0">自主任务发布审批</Link></Menu.Item>
|
||||
<Menu.Item key={"paperManage"}><Link to="/task/paperManage">成果/评论审批</Link></Menu.Item>
|
||||
<Menu.Item key={"paperComplain"}><Link to="/task/paperComplain">成果上传申诉审批</Link></Menu.Item>
|
||||
<Menu.Item key={"publicityComplain"}><Link to="/task/publicityComplain">公示期成果申诉审批</Link></Menu.Item>
|
||||
<Menu.Item key={"agreementManage"}><Link to="/task/agreementManage">协议审批</Link></Menu.Item>
|
||||
<Menu.Item ><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/admin/tasks/report_result_tasks`}>成果举报申诉</a></Menu.Item>
|
||||
<Menu.Item key={"proofManage"}><Link to="/task/proofManage">评选佐证材料</Link></Menu.Item>
|
||||
<Menu.Item><a rel="noopener noreferrer" href={`${main_web_site_url}/managements/enterprise_authentication`}>企业认证</a></Menu.Item>
|
||||
<Menu.Item><a rel="noopener noreferrer" href={`${main_web_site_url}/admin/reviews/projects_list`}>开源项目</a></Menu.Item>
|
||||
<Menu.Item title="approver" key={"taskManage1"}><Link to="/managements/task/taskManage/1">统筹任务发布审批</Link></Menu.Item>
|
||||
<Menu.Item title="approver" key={"taskManage0"}><Link to="/managements/task/taskManage/0">自主任务发布审批</Link></Menu.Item>
|
||||
<Menu.Item title="approver" key={"paperManage"}><Link to="/managements/task/paperManage">成果/评论审批</Link></Menu.Item>
|
||||
<Menu.Item title="approver" key={"paperComplain"}><Link to="/managements/task/paperComplain">成果上传申诉审批</Link></Menu.Item>
|
||||
<Menu.Item title="approver" key={"publicityComplain"}><Link to="/managements/task/publicityComplain">公示期成果申诉审批</Link></Menu.Item>
|
||||
<Menu.Item title="approver" key={"agreementManage"}><Link to="/managements/task/agreementManage">协议审批</Link></Menu.Item>
|
||||
<Menu.Item ><a rel="noopener noreferrer" href={`${main_web_site_url}/admin/tasks/report_result_tasks`}>成果举报申诉</a></Menu.Item>
|
||||
<Menu.Item title="approver" key={"proofManage"}><Link to="/managements/task/proofManage">评选佐证材料</Link></Menu.Item>
|
||||
</Menu>
|
||||
});
|
||||
|
||||
|
||||
const limitsMenu = useMemo(() => {
|
||||
return <Menu>
|
||||
<Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/managements/user_admin_roles`}>权限组配置</a></Menu.Item>
|
||||
<Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/managements/admin_role_permissions`}>权限操作配置</a></Menu.Item>
|
||||
<Menu.Item><a rel="noopener noreferrer" href={`${main_web_site_url}/managements/user_admin_roles`}>权限组配置</a></Menu.Item>
|
||||
<Menu.Item><a rel="noopener noreferrer" href={`${main_web_site_url}/managements/admin_role_permissions`}>权限操作配置</a></Menu.Item>
|
||||
</Menu>
|
||||
});
|
||||
|
||||
|
||||
const configMenu = useMemo(() => {
|
||||
return <Menu>
|
||||
<Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/admin/about_infos/new"`}>关于我们</a></Menu.Item>
|
||||
<Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/admin/home_sections"`}>首页版块</a></Menu.Item>
|
||||
<Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/admin/partners`}>合作伙伴</a></Menu.Item>
|
||||
<Menu.Item><a rel="noopener noreferrer" href={`${main_web_site_url}/admin/about_infos/new"`}>关于我们</a></Menu.Item>
|
||||
<Menu.Item><a rel="noopener noreferrer" href={`${main_web_site_url}/admin/home_sections"`}>首页版块</a></Menu.Item>
|
||||
<Menu.Item><a rel="noopener noreferrer" href={`${main_web_site_url}/admin/partners`}>合作伙伴</a></Menu.Item>
|
||||
</Menu>
|
||||
});
|
||||
|
||||
|
||||
console.log(title);
|
||||
return (
|
||||
<div className="centerbox managements_menus clearfix">
|
||||
<Dropdown key={'projectMenu'} overlay={projectMenu} placement="bottomLeft">
|
||||
|
|
@ -123,21 +120,17 @@ export default props => {
|
|||
</Dropdown>
|
||||
|
||||
<Dropdown key={'taskMenu'} overlay={taskMenu} placement="bottomLeft">
|
||||
<div className="drop-div">
|
||||
<div className={`${title=='task'&&'active'} drop-div`}>
|
||||
创客
|
||||
</div>
|
||||
</Dropdown>
|
||||
|
||||
<Dropdown key={'competitionMenu'} overlay={competitionMenu} placement="bottomLeft">
|
||||
<div className="drop-div">竞赛</div>
|
||||
<div className={`${title=='competition'&&'active'} drop-div`}>竞赛</div>
|
||||
</Dropdown>
|
||||
|
||||
{/* <Dropdown key={'expert'} overlay={expertMenu} placement="bottomLeft">
|
||||
<div className="drop-div">专家</div>
|
||||
</Dropdown> */}
|
||||
|
||||
<Dropdown key={'userMenu'} overlay={userMenu} placement="bottomLeft">
|
||||
<div className="drop-div">用户</div>
|
||||
<div className={`${title=='user'&&'active'} drop-div`}>用户</div>
|
||||
</Dropdown>
|
||||
|
||||
<Dropdown key={'forumMenu'} overlay={forumMenu} placement="bottomLeft">
|
||||
|
|
@ -145,7 +138,7 @@ export default props => {
|
|||
</Dropdown>
|
||||
|
||||
<Dropdown key={'checkMenu'} overlay={checkMenu} placement="bottomLeft">
|
||||
<div className="drop-div">审批</div>
|
||||
<div className={`${title=='approver'&&'active'} drop-div`}>审批</div>
|
||||
</Dropdown>
|
||||
|
||||
<Dropdown key={'limitsMenu'} overlay={limitsMenu} placement="bottomLeft">
|
||||
|
|
|
|||
|
|
@ -11,6 +11,9 @@
|
|||
box-sizing: border-box;
|
||||
position: relative;
|
||||
cursor: pointer;
|
||||
&.active{
|
||||
color: #4154f1;
|
||||
}
|
||||
&::after {
|
||||
content: "";
|
||||
position: absolute;
|
||||
|
|
|
|||
|
|
@ -16,10 +16,10 @@ const Review = Loadable({
|
|||
loading: Loading,
|
||||
});
|
||||
|
||||
const AdminRouter = Loadable({
|
||||
loader: () => import("./expert/adminRouter"),
|
||||
loading: Loading,
|
||||
});
|
||||
// const AdminRouter = Loadable({
|
||||
// loader: () => import("./expert/adminRouter"),
|
||||
// loading: Loading,
|
||||
// });
|
||||
|
||||
// const ReviewTasks = Loadable({
|
||||
// loader: () => import("./expert/reviewTasks"),
|
||||
|
|
@ -56,12 +56,12 @@ const Expert = (propsTransmit) => {
|
|||
></Route>
|
||||
|
||||
{/* 管理员管理 */}
|
||||
<Route
|
||||
{/* <Route
|
||||
path="/expert/admin/:admin"
|
||||
render={(props) => (
|
||||
<AdminRouter {...propsF} {...props} />
|
||||
)}
|
||||
></Route>
|
||||
></Route> */}
|
||||
<Route
|
||||
path="/expert"
|
||||
render={(props) => (
|
||||
|
|
|
|||
|
|
@ -0,0 +1,227 @@
|
|||
import React, { useEffect, useState } from "react";
|
||||
|
||||
import { Route, Switch } from "react-router-dom";
|
||||
import { withRouter } from "react-router";
|
||||
import { SnackbarHOC } from "educoder";
|
||||
import { CNotificationHOC } from "../modules/courses/common/CNotificationHOC";
|
||||
import { TPMIndexHOC } from "../modules/tpm/TPMIndexHOC";
|
||||
import Loadable from "react-loadable";
|
||||
import Loading from "../Loading";
|
||||
import AdminRouter from "./components/adminRouter";
|
||||
import { ImageLayerOfCommentHOC } from "../modules/page/layers/ImageLayerOfCommentHOC";
|
||||
import './index.scss';
|
||||
|
||||
{/* 任务管理审核 */}
|
||||
const TaskManage = Loadable({
|
||||
loader: () => import("./task/taskManage"),
|
||||
loading: Loading,
|
||||
});
|
||||
|
||||
{/* 成果管理审核 */}
|
||||
const PaperManage = Loadable({
|
||||
loader: () => import("./task/paperManage"),
|
||||
loading: Loading,
|
||||
});
|
||||
|
||||
{/* 成果申诉管理审核 */}
|
||||
const PaperComplain = Loadable({
|
||||
loader: () => import("./task/paperComplain"),
|
||||
loading: Loading,
|
||||
});
|
||||
|
||||
const ProofManage = Loadable({
|
||||
loader: () => import("./task/proofManage"),
|
||||
loading: Loading,
|
||||
});
|
||||
|
||||
const PublicityComplain = Loadable({
|
||||
loader: () => import("./task/publicityComplain"),
|
||||
loading: Loading,
|
||||
});
|
||||
|
||||
const AgreementManage = Loadable({
|
||||
loader: () => import("./task/agreementManage"),
|
||||
loading: Loading,
|
||||
});
|
||||
|
||||
const PayProof = Loadable({
|
||||
loader: () => import("./task/payProof"),
|
||||
loading: Loading,
|
||||
});
|
||||
|
||||
const TaskAdmin = Loadable({
|
||||
loader: () => import("./task/taskAdmin"),
|
||||
loading: Loading,
|
||||
});
|
||||
|
||||
const DelayManage = Loadable({
|
||||
loader: () => import("./task/delayManage"),
|
||||
loading: Loading,
|
||||
});
|
||||
|
||||
|
||||
|
||||
// 专家库
|
||||
const ExpertList = Loadable({
|
||||
loader: () => import("./expert/expertList"),
|
||||
loading: Loading,
|
||||
});
|
||||
// 专家审核
|
||||
const RegisterList = Loadable({
|
||||
loader: () => import("./expert/registerList"),
|
||||
loading: Loading,
|
||||
});
|
||||
//创客任务评审规则
|
||||
const ReviewRules = Loadable({
|
||||
loader : () => import("./expert/reviewRules"),
|
||||
loading: Loading,
|
||||
});
|
||||
//创客任务选择评审专家
|
||||
const SelectExpert = Loadable({
|
||||
loader: () => import("./expert/selectExpert"),
|
||||
loading: Loading,
|
||||
});
|
||||
//创客任务评审结果查看
|
||||
const ReviewResult = Loadable({
|
||||
loader: () => import("./expert/reviewResult"),
|
||||
loading: Loading,
|
||||
});
|
||||
//竞赛评审任务列表
|
||||
const CompetitionList = Loadable({
|
||||
loader: () => import("./expert/competionList"),
|
||||
loading: Loading,
|
||||
})
|
||||
|
||||
const Managements = (propsF) => {
|
||||
|
||||
return (
|
||||
<div className="newMain clearfix">
|
||||
<AdminRouter {...propsF} />
|
||||
<Switch {...propsF}>
|
||||
{/* 任务管理审核 */}
|
||||
<Route
|
||||
path="/managements/task/taskManage/:publishMode"
|
||||
render={(props) => (
|
||||
<TaskManage {...propsF} {...props} />
|
||||
)}
|
||||
></Route>
|
||||
|
||||
{/* 成果管理审核 */}
|
||||
<Route
|
||||
path="/managements/task/paperManage"
|
||||
render={(props) => (
|
||||
<PaperManage {...propsF} {...props} />
|
||||
)}
|
||||
></Route>
|
||||
|
||||
{/* 成果申诉管理审核 */}
|
||||
<Route
|
||||
path="/managements/task/paperComplain"
|
||||
render={(props) => (
|
||||
<PaperComplain {...propsF} {...props} />
|
||||
)}
|
||||
></Route>
|
||||
|
||||
{/* 公示期成果申诉管理审核 */}
|
||||
<Route
|
||||
path="/managements/task/publicityComplain"
|
||||
render={(props) => (
|
||||
<PublicityComplain {...propsF} {...props} />
|
||||
)}
|
||||
></Route>
|
||||
|
||||
{/* 佐证管理审核 */}
|
||||
<Route
|
||||
path="/managements/task/proofManage"
|
||||
render={(props) => (
|
||||
<ProofManage {...propsF} {...props} />
|
||||
)}
|
||||
></Route>
|
||||
|
||||
{/* 管理员协议审核 */}
|
||||
<Route
|
||||
path="/managements/task/agreementManage"
|
||||
render={(props) => (
|
||||
<AgreementManage {...propsF} {...props} />
|
||||
)}
|
||||
></Route>
|
||||
|
||||
{/* 管理员上传支付凭证 */}
|
||||
<Route
|
||||
path="/managements/task/payProof"
|
||||
render={(props) => (
|
||||
<PayProof {...propsF} {...props} />
|
||||
)}
|
||||
></Route>
|
||||
|
||||
{/* 管理员任务列表 */}
|
||||
<Route
|
||||
path="/managements/task/taskAdmin"
|
||||
render={(props) => (
|
||||
<TaskAdmin {...propsF} {...props} />
|
||||
)}
|
||||
></Route>
|
||||
|
||||
{/* 延期管理 */}
|
||||
<Route
|
||||
path="/managements/task/delayManage"
|
||||
render={(props) => (
|
||||
<DelayManage {...propsF} {...props} />
|
||||
)}
|
||||
></Route>
|
||||
|
||||
|
||||
|
||||
{/* 专家审核 */}
|
||||
<Route
|
||||
path="/managements/expert/admin/register"
|
||||
render={(props) => (
|
||||
<RegisterList {...propsF} {...props} />
|
||||
)}
|
||||
></Route>
|
||||
{/* 专家库列表 */}
|
||||
<Route
|
||||
path="/managements/expert/list"
|
||||
render={(props) => (
|
||||
<ExpertList {...propsF} {...props} />
|
||||
)}
|
||||
></Route>
|
||||
{/* 创客任务评审规则 */}
|
||||
<Route
|
||||
path="/managements/expert/task/review/rules/:containerType/:containerId"
|
||||
render={(props) => (
|
||||
<ReviewRules {...propsF} {...props} />
|
||||
)}
|
||||
></Route>
|
||||
{/* 创客任务选择评审专家 */}
|
||||
<Route
|
||||
path="/managements/expert/task/review/select/:containerType/:containerId"
|
||||
render={(props) => (
|
||||
<SelectExpert {...propsF} {...props} />
|
||||
)}
|
||||
></Route>
|
||||
{/* 创客任务评审结果查看 */}
|
||||
<Route
|
||||
path="/managements/expert/task/review/results/:containerType/:containerId"
|
||||
render={(props) => (
|
||||
<ReviewResult {...propsF} {...props} />
|
||||
)}
|
||||
></Route>
|
||||
{/* 竞赛评审任务列表 */}
|
||||
<Route
|
||||
path="/managements/expert/competition"
|
||||
render={(props) => (
|
||||
<CompetitionList {...propsF} {...props} />
|
||||
)}
|
||||
></Route>
|
||||
</Switch>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default withRouter(
|
||||
ImageLayerOfCommentHOC({
|
||||
imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget",
|
||||
parentSelector: ".newMain",
|
||||
})(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Managements))))
|
||||
);
|
||||
|
|
@ -32,10 +32,10 @@ const MyTask = Loadable({
|
|||
});
|
||||
|
||||
|
||||
const TaskAdminRouter = Loadable({
|
||||
loader: () => import("./task/taskAdminRouter"),
|
||||
loading: Loading,
|
||||
});
|
||||
// const TaskAdminRouter = Loadable({
|
||||
// loader: () => import("./task/taskAdminRouter"),
|
||||
// loading: Loading,
|
||||
// });
|
||||
|
||||
|
||||
|
||||
|
|
@ -90,12 +90,12 @@ const Index = (propsTransmit) => {
|
|||
></Route>
|
||||
|
||||
{/* 管理员管理 */}
|
||||
<Route
|
||||
{/* <Route
|
||||
path="/task/:admin"
|
||||
render={(props) => (
|
||||
<TaskAdminRouter {...propsF} {...props} />
|
||||
)}
|
||||
></Route>
|
||||
></Route> */}
|
||||
|
||||
{/* 任务列表 */}
|
||||
<Route
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import React, { Component } from 'react';
|
||||
import { Base64 } from 'js-base64';
|
||||
|
||||
import Dialog from 'material-ui/Dialog';
|
||||
import { notification } from 'antd';
|
||||
|
|
@ -367,7 +368,7 @@ class LoginDialog extends Component {
|
|||
let url = '/accounts/login.json'
|
||||
axios.post(url, {
|
||||
login: newloginValue,
|
||||
password: newpassValue,
|
||||
password: Base64.encode(newpassValue),
|
||||
autologin: isGoingValue
|
||||
}
|
||||
).then((response) => {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
import React, {Component} from 'react';
|
||||
import {setmiyah,broadcastChannelPostMessage} from 'educoder';
|
||||
import {Tabs, Input, Checkbox, Button, notification,Menu} from 'antd';
|
||||
import { Base64 } from 'js-base64';
|
||||
import passopen from '../../../src/images/login/passopen.png';
|
||||
import passoff from '../../../src/images/login/passoff.png';
|
||||
import axios from 'axios';
|
||||
|
|
@ -351,7 +352,7 @@ class LoginRegisterComponent extends Component {
|
|||
var url = "/accounts/login.json";
|
||||
axios.post(url, {
|
||||
login: this.state.login,
|
||||
password: this.state.password,
|
||||
password: Base64.encode(this.state.password),
|
||||
}).then((response) => {
|
||||
|
||||
if (response === undefined) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue