fix:The "marking/score/test/list" interface is not returned;The login page cannot be redirected. (#25)
This commit is contained in:
parent
922d651696
commit
a284c82767
|
@ -76,6 +76,7 @@ func (c *ApiController) List() {
|
|||
if err != nil {
|
||||
resp := Response{Status: "10001", Msg: "get user info fail", Data: err}
|
||||
c.Data["json"] = resp
|
||||
c.ServeJSON()
|
||||
return
|
||||
}
|
||||
|
||||
|
|
|
@ -5,7 +5,6 @@ import AuthCallback from "./AuthCallback";
|
|||
import Home from "./views/Home";
|
||||
import * as Setting from "./Setting";
|
||||
import * as Conf from "./Conf";
|
||||
import normalLogin from "./views/Login/normaluser";
|
||||
|
||||
class App extends React.Component {
|
||||
constructor(props) {
|
||||
|
@ -24,8 +23,6 @@ class App extends React.Component {
|
|||
<BrowserRouter>
|
||||
<Route path="/" component={Home} />
|
||||
<Route exact path="/callback" component={AuthCallback} />
|
||||
<Route path="/normalLogin" component={normalLogin} />
|
||||
<Route path="/home" component={Home} />
|
||||
</BrowserRouter>
|
||||
</div>
|
||||
);
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
import {message} from "antd";
|
||||
import Sdk from "casdoor-js-sdk";
|
||||
import axios from "axios";
|
||||
// import {isMobile as isMobileDevice} from "react-device-detect";
|
||||
|
||||
export let ServerUrl = "";
|
||||
|
@ -11,6 +12,7 @@ export function initServerUrl() {
|
|||
ServerUrl = `http://${hostname}:8080`;
|
||||
}
|
||||
}
|
||||
axios.defaults.withCredentials = true;
|
||||
|
||||
export function initCasdoorSdk(config) {
|
||||
CasdoorSdk = new Sdk(config);
|
||||
|
|
|
@ -11,6 +11,10 @@ axios.defaults.baseURL = getServerUrl();
|
|||
axios.defaults.headers["Content-Type"] = "application/x-www-form-urlencoded;charset=UTF-8";
|
||||
const group = {
|
||||
|
||||
UserLogin(data) {
|
||||
return axios.post("/login", data);
|
||||
},
|
||||
|
||||
userInfo(data) {
|
||||
return axios.post("/marking/supervisor/user/info", data);
|
||||
},
|
||||
|
|
|
@ -31,7 +31,7 @@ import paperManage from "../Manage/paper_manage/manage";
|
|||
import detail from "../Manage/paper_manage/detail";
|
||||
|
||||
import menuList from "../../menu/menuTab.js";
|
||||
|
||||
import normalLogin from "../Login/normaluser";
|
||||
import logoUrl from "../../asset/images/OpenCT_Logo.png";
|
||||
import group from "../../api/group";
|
||||
import "./index.less";
|
||||
|
@ -40,7 +40,6 @@ const {Header, Sider, Content} = Layout;
|
|||
const {SubMenu} = Menu;
|
||||
|
||||
export default class index extends Component {
|
||||
|
||||
state = {
|
||||
account: null,
|
||||
current: "home",
|
||||
|
@ -174,9 +173,10 @@ export default class index extends Component {
|
|||
<a href={Setting.getSigninUrl()} style={{color: "#ffffff", marginLeft: "50px"}}>
|
||||
管理员登录
|
||||
</a>
|
||||
<a onClick={() => {Setting.goToLink("/normalLogin");}} style={{color: "#ffffff", marginLeft: "50px"}}>
|
||||
<Link
|
||||
to={"/home/normaluser"} style={{color: "#ffffff", marginLeft: "50px"}}>
|
||||
组长/阅卷老师登录
|
||||
</a>
|
||||
</Link>
|
||||
</>
|
||||
);
|
||||
} else {
|
||||
|
@ -294,6 +294,7 @@ export default class index extends Component {
|
|||
<Route path="/home/management/paper_manage" component={paperManage} exact></Route>
|
||||
<Route path="/home/management/detailTable" component={detail} exact></Route>
|
||||
|
||||
<Route path="/home/normaluser" component={normalLogin} exact></Route>
|
||||
</>
|
||||
|
||||
: null
|
||||
|
|
|
@ -14,7 +14,7 @@ export async function login(account, password) {
|
|||
}).then(res => {
|
||||
resolve(res.data);
|
||||
}).catch(error => {
|
||||
console.log(error);
|
||||
Settings.showMessage("error", error);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
.bg {
|
||||
height: 900px;
|
||||
background: linear-gradient(180deg, #85b4ff, #ffffff);
|
||||
margin: auto;
|
||||
// padding: 200px;
|
||||
|
@ -14,7 +13,7 @@
|
|||
height: 450px;
|
||||
background: #f2f3f7;
|
||||
border-radius: 20px;
|
||||
margin: auto;
|
||||
margin-top: 10%;
|
||||
text-align: center;
|
||||
justify-content: center;
|
||||
padding: 51px 60px;
|
||||
|
|
Loading…
Reference in New Issue