fix: solve all warnings (#20)
Co-authored-by: Khlros <khlros777@gmail.com>
This commit is contained in:
parent
89e405d124
commit
bd98896db7
|
@ -12,7 +12,7 @@ class AuthCallback extends React.Component {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
componentWillMount() {
|
UNSAFE_componentWillMount() {
|
||||||
this.login();
|
this.login();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,154 +10,158 @@ export default class index extends Component {
|
||||||
this.questionList();
|
this.questionList();
|
||||||
}
|
}
|
||||||
|
|
||||||
// 选择区
|
// 选择区
|
||||||
state = {
|
state = {
|
||||||
questionList: [],
|
questionList: [],
|
||||||
tableData: [],
|
tableData: [],
|
||||||
fullScore: undefined,
|
fullScore: undefined,
|
||||||
averageScore: undefined,
|
averageScore: undefined,
|
||||||
}
|
}
|
||||||
|
|
||||||
questionList = () => {
|
questionList = () => {
|
||||||
group.questionList({adminId: "1", subjectName: JSON.parse(localStorage.getItem("userInfo")).SubjectName})
|
group.questionList({adminId: "1", subjectName: JSON.parse(localStorage.getItem("userInfo")).SubjectName})
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
if (res.data.status == "10000") {
|
if (res.data.status === "10000") {
|
||||||
this.setState({
|
this.setState({
|
||||||
questionList: res.data.data.questionsList,
|
questionList: res.data.data.questionsList,
|
||||||
});
|
});
|
||||||
console.log(res.data.data.questionsList);
|
console.log(res.data.data.questionsList);
|
||||||
this.tableData(res.data.data.questionsList[0].QuestionId);
|
this.tableData(res.data.data.questionsList[0].QuestionId);
|
||||||
}
|
|
||||||
})
|
|
||||||
.catch((e) => {
|
|
||||||
console.log(e);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
// 题目选择区
|
|
||||||
selectBox = () => {
|
|
||||||
let selectList;
|
|
||||||
if (this.state.questionList.length != 0) {
|
|
||||||
selectList = this.state.questionList.map((item, i) => {
|
|
||||||
return <Option key={i} value={item.QuestionName} label={item.QuestionName}>{item.QuestionName}</Option>;
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return selectList;
|
|
||||||
}
|
|
||||||
select = (e) => {
|
|
||||||
let index;
|
|
||||||
for (let i = 0; i < this.state.questionList.length; i++) {
|
|
||||||
if (this.state.questionList[i].QuestionName === e) {
|
|
||||||
index = i;
|
|
||||||
}
|
}
|
||||||
}
|
})
|
||||||
this.tableData(this.state.questionList[index].QuestionId);
|
.catch((e) => {
|
||||||
|
console.log(e);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
// 题目选择区
|
||||||
|
selectBox = () => {
|
||||||
|
let selectList;
|
||||||
|
if (this.state.questionList.length !== 0) {
|
||||||
|
selectList = this.state.questionList.map((item, i) => {
|
||||||
|
return <Option key={i} value={item.QuestionName} label={item.QuestionName}>{item.QuestionName}</Option>;
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
tableData = (questionId) => {
|
return selectList;
|
||||||
group.averageMonitor({supervisorId: "2", questionId: questionId})
|
}
|
||||||
.then((res) => {
|
select = (e) => {
|
||||||
if (res.data.status == "10000") {
|
let index;
|
||||||
let tableData = [];
|
for (let i = 0; i < this.state.questionList.length; i++) {
|
||||||
for (let i = 0; i < res.data.data.scoreAverageVOList.length; i++) {
|
if (this.state.questionList[i].QuestionName === e) {
|
||||||
let item = res.data.data.scoreAverageVOList[i];
|
index = i;
|
||||||
tableData.push({
|
}
|
||||||
UserName: item.UserName,
|
}
|
||||||
Average: item.Average,
|
this.tableData(this.state.questionList[index].QuestionId);
|
||||||
});
|
}
|
||||||
}
|
tableData = (questionId) => {
|
||||||
this.setState({
|
group.averageMonitor({supervisorId: "2", questionId: questionId})
|
||||||
tableData,
|
.then((res) => {
|
||||||
fullScore: res.data.data.fullScore,
|
if (res.data.status === "10000") {
|
||||||
averageScore: res.data.data.questionAverageScore,
|
let tableData = [];
|
||||||
|
for (let i = 0; i < res.data.data.scoreAverageVOList.length; i++) {
|
||||||
|
let item = res.data.data.scoreAverageVOList[i];
|
||||||
|
tableData.push({
|
||||||
|
UserName: item.UserName,
|
||||||
|
Average: item.Average,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
})
|
this.setState({
|
||||||
.catch((e) => {
|
tableData,
|
||||||
console.log(e);
|
fullScore: res.data.data.fullScore,
|
||||||
});
|
averageScore: res.data.data.questionAverageScore,
|
||||||
}
|
});
|
||||||
columns = [
|
}
|
||||||
{
|
})
|
||||||
title: "教师",
|
.catch((e) => {
|
||||||
width: 150,
|
console.log(e);
|
||||||
dataIndex: "UserName",
|
});
|
||||||
},
|
}
|
||||||
{
|
columns = [
|
||||||
title: "平均分",
|
{
|
||||||
width: 180,
|
title: "教师",
|
||||||
dataIndex: "Average",
|
width: 150,
|
||||||
},
|
dataIndex: "UserName",
|
||||||
]
|
},
|
||||||
progressItem = () => {
|
{
|
||||||
let progressItem = [];
|
title: "平均分",
|
||||||
if (this.state.tableData.length != 0) {
|
width: 180,
|
||||||
progressItem = this.state.tableData.map((item) => {
|
dataIndex: "Average",
|
||||||
return <div className="progress-item"><span>{item.UserName} </span><Progress percent={item.Average / this.state.fullScore * 100} showInfo={false} /> <span>{item.Average}</span></div>;
|
},
|
||||||
});
|
]
|
||||||
} else {
|
progressItem = () => {
|
||||||
return null;
|
let progressItem = [];
|
||||||
}
|
if (this.state.tableData.length !== 0) {
|
||||||
return progressItem;
|
progressItem = this.state.tableData.map((item, index) => {
|
||||||
|
return <div className="progress-item" key={index}>
|
||||||
|
<span>{item.UserName} </span>
|
||||||
|
<Progress percent={item.Average / this.state.fullScore * 100} showInfo={false} />
|
||||||
|
<span>{item.Average}</span>
|
||||||
|
</div>;
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
return progressItem;
|
||||||
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<DocumentTitle title="阅卷系统-平均分监控">
|
<DocumentTitle title="阅卷系统-平均分监控">
|
||||||
<div className="average-monitor-page" data-component="average-monitor-page">
|
<div className="average-monitor-page" data-component="average-monitor-page">
|
||||||
<div className="search-container">
|
<div className="search-container">
|
||||||
<div className="question-select">
|
<div className="question-select">
|
||||||
题目选择:<Select
|
题目选择:<Select
|
||||||
showSearch
|
showSearch
|
||||||
style={{width: 120}}
|
style={{width: 120}}
|
||||||
optionFilterProp="label"
|
optionFilterProp="label"
|
||||||
onSelect={(e) => {this.select(e);}}
|
onSelect={(e) => {this.select(e);}}
|
||||||
filterOption={(input, option) =>
|
filterOption={(input, option) =>
|
||||||
option.label.indexOf(input) >= 0
|
option.label.indexOf(input) >= 0
|
||||||
}
|
|
||||||
filterSort={(optionA, optionB) =>
|
|
||||||
optionA.label.localeCompare(optionB.label)
|
|
||||||
}
|
|
||||||
placeholder={this.state.questionList.length > 0 ? this.state.questionList[0].QuestionName : null}
|
|
||||||
defaultValue={this.state.questionList.length > 0 ? this.state.questionList[0].QuestionName : null}
|
|
||||||
>
|
|
||||||
{
|
|
||||||
this.selectBox()
|
|
||||||
}
|
|
||||||
|
|
||||||
</Select>
|
|
||||||
</div>
|
|
||||||
<div className="question-score">
|
|
||||||
满分:{this.state.fullScore}
|
|
||||||
</div>
|
|
||||||
<div className="question-score">
|
|
||||||
平均分:{this.state.averageScore}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="display-container">
|
|
||||||
<div className="display-table">
|
|
||||||
<Table
|
|
||||||
pagination={{position: ["bottomCenter"]}}
|
|
||||||
columns={this.columns}
|
|
||||||
dataSource={this.state.tableData}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div className="progress">
|
|
||||||
<div className="progress-header">
|
|
||||||
<span>教师</span><span>平均分</span>
|
|
||||||
</div>
|
|
||||||
{
|
|
||||||
this.progressItem()
|
|
||||||
}
|
}
|
||||||
<div className="progress-footer">
|
filterSort={(optionA, optionB) =>
|
||||||
<span>满分:{this.state.fullScore}</span>
|
optionA.label.localeCompare(optionB.label)
|
||||||
</div>
|
}
|
||||||
|
placeholder={this.state.questionList.length > 0 ? this.state.questionList[0].QuestionName : null}
|
||||||
|
defaultValue={this.state.questionList.length > 0 ? this.state.questionList[0].QuestionName : null}
|
||||||
|
>
|
||||||
|
{
|
||||||
|
this.selectBox()
|
||||||
|
}
|
||||||
|
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
<div className="question-score">
|
||||||
|
满分:{this.state.fullScore}
|
||||||
|
</div>
|
||||||
|
<div className="question-score">
|
||||||
|
平均分:{this.state.averageScore}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="display-container">
|
||||||
|
<div className="display-table">
|
||||||
|
<Table
|
||||||
|
pagination={{position: ["bottomCenter"]}}
|
||||||
|
columns={this.columns}
|
||||||
|
dataSource={this.state.tableData}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="progress">
|
||||||
|
<div className="progress-header">
|
||||||
|
<span>教师</span><span>平均分</span>
|
||||||
|
</div>
|
||||||
|
{
|
||||||
|
this.progressItem()
|
||||||
|
}
|
||||||
|
<div className="progress-footer">
|
||||||
|
<span>满分:{this.state.fullScore}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</DocumentTitle>
|
|
||||||
);
|
</div>
|
||||||
}
|
</DocumentTitle>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,10 +1,8 @@
|
||||||
import React, {Component} from "react";
|
import React, {Component} from "react";
|
||||||
import {Layout, Menu} from "antd";
|
import {Avatar, Dropdown, Layout, Menu} from "antd";
|
||||||
import DocumentTitle from "react-document-title";
|
import DocumentTitle from "react-document-title";
|
||||||
import {Redirect, Route, Switch} from "react-router-dom";
|
import {Link, Redirect, Route, Switch} from "react-router-dom";
|
||||||
import * as Icon from "@ant-design/icons";
|
import * as Icon from "@ant-design/icons";
|
||||||
import {Avatar, Dropdown} from "antd";
|
|
||||||
import {Link} from "react-router-dom";
|
|
||||||
import {LogoutOutlined, SettingOutlined} from "@ant-design/icons";
|
import {LogoutOutlined, SettingOutlined} from "@ant-design/icons";
|
||||||
import * as Setting from "../../Setting";
|
import * as Setting from "../../Setting";
|
||||||
import * as AccountBackend from "../../backend/AccountBackend";
|
import * as AccountBackend from "../../backend/AccountBackend";
|
||||||
|
@ -37,6 +35,7 @@ import menuList from "../../menu/menuTab.js";
|
||||||
import logoUrl from "../../asset/images/OpenCT_Logo.png";
|
import logoUrl from "../../asset/images/OpenCT_Logo.png";
|
||||||
import group from "../../api/group";
|
import group from "../../api/group";
|
||||||
import "./index.less";
|
import "./index.less";
|
||||||
|
|
||||||
const {Header, Sider, Content} = Layout;
|
const {Header, Sider, Content} = Layout;
|
||||||
const {SubMenu} = Menu;
|
const {SubMenu} = Menu;
|
||||||
|
|
||||||
|
@ -74,7 +73,7 @@ export default class index extends Component {
|
||||||
userInfo = () => {
|
userInfo = () => {
|
||||||
group.userInfo({supervisorId: "1"})
|
group.userInfo({supervisorId: "1"})
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
if (res.data.status == "10000") {
|
if (res.data.status === "10000") {
|
||||||
this.setState({
|
this.setState({
|
||||||
userInfo: res.data.data.userInfo,
|
userInfo: res.data.data.userInfo,
|
||||||
});
|
});
|
||||||
|
@ -183,9 +182,10 @@ export default class index extends Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
bindMenu = (menulist) => {
|
bindMenu = (menulist) => {
|
||||||
let MenuList = menulist.map((item) => {
|
return menulist.map((item) => {
|
||||||
if (item.chidPermissions.length === 0) { // 没有子菜单
|
if (item.chidPermissions.length === 0) { // 没有子菜单
|
||||||
return <Menu.Item key={item.key} icon={item.icon ? React.createElement(Icon[item.icon]) : null} ><Link to={item.menu_url}>{item.menu_name}</Link></Menu.Item>;
|
return <Menu.Item key={item.key} icon={item.icon ? React.createElement(Icon[item.icon]) : null}><Link
|
||||||
|
to={item.menu_url}>{item.menu_name}</Link></Menu.Item>;
|
||||||
} else {
|
} else {
|
||||||
return <SubMenu key={item.key} title={item.menu_name} icon={React.createElement(Icon[item.icon])}>
|
return <SubMenu key={item.key} title={item.menu_name} icon={React.createElement(Icon[item.icon])}>
|
||||||
{this.bindMenu(item.chidPermissions)}
|
{this.bindMenu(item.chidPermissions)}
|
||||||
|
@ -193,7 +193,6 @@ export default class index extends Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
return MenuList;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onOpenChange = (openKeys) => {
|
onOpenChange = (openKeys) => {
|
||||||
|
|
|
@ -14,7 +14,7 @@ export default class index extends Component {
|
||||||
Marking.testList({userId: this.userId})
|
Marking.testList({userId: this.userId})
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
console.log(res);
|
console.log(res);
|
||||||
if (res.data.status == "10000") {
|
if (res.data.status === "10000") {
|
||||||
let papers = [...res.data.data.TestIds];
|
let papers = [...res.data.data.TestIds];
|
||||||
this.setState(
|
this.setState(
|
||||||
{
|
{
|
||||||
|
@ -34,7 +34,7 @@ export default class index extends Component {
|
||||||
Marking.testAnswer({userId: this.userId, testId: this.state.papers[0]})
|
Marking.testAnswer({userId: this.userId, testId: this.state.papers[0]})
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
console.log(res);
|
console.log(res);
|
||||||
if (res.data.status == "10000") {
|
if (res.data.status === "10000") {
|
||||||
this.setState({
|
this.setState({
|
||||||
keyTest: res.data.data.Pics,
|
keyTest: res.data.data.Pics,
|
||||||
});
|
});
|
||||||
|
@ -51,9 +51,9 @@ export default class index extends Component {
|
||||||
// 答案区
|
// 答案区
|
||||||
showTest = () => {
|
showTest = () => {
|
||||||
let testPaper = null;
|
let testPaper = null;
|
||||||
if (this.state.keyTest != undefined || this.state.keyTest != null) {
|
if (this.state.keyTest !== undefined) {
|
||||||
testPaper = this.state.keyTest.map((item) => {
|
testPaper = this.state.keyTest.map((item, index) => {
|
||||||
return <div className="test-question-img">
|
return <div key={index} className="test-question-img">
|
||||||
<img src={"data:image/jpg;base64," + item} alt="加载失败" />
|
<img src={"data:image/jpg;base64," + item} alt="加载失败" />
|
||||||
</div>;
|
</div>;
|
||||||
});
|
});
|
||||||
|
|
|
@ -2,9 +2,7 @@ import React, {Component} from "react";
|
||||||
import DocumentTitle from "react-document-title";
|
import DocumentTitle from "react-document-title";
|
||||||
import {Button, Input, Modal, Radio, Select, Space, message} from "antd";
|
import {Button, Input, Modal, Radio, Select, Space, message} from "antd";
|
||||||
import {ExclamationCircleOutlined} from "@ant-design/icons";
|
import {ExclamationCircleOutlined} from "@ant-design/icons";
|
||||||
|
|
||||||
import "./index.less";
|
import "./index.less";
|
||||||
|
|
||||||
import * as Util from "../../../util/Util";
|
import * as Util from "../../../util/Util";
|
||||||
import Marking from "../../../api/marking";
|
import Marking from "../../../api/marking";
|
||||||
const {Option} = Select;
|
const {Option} = Select;
|
||||||
|
@ -42,7 +40,7 @@ export default class index extends Component {
|
||||||
);
|
);
|
||||||
this.getCurrentPaper();
|
this.getCurrentPaper();
|
||||||
}else if(res.data.status === "10003") {
|
}else if(res.data.status === "10003") {
|
||||||
if (res.data.msg == "there is no paper to correct") {
|
if (res.data.msg === "there is no paper to correct") {
|
||||||
message.warning("没有试卷待批改");
|
message.warning("没有试卷待批改");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -56,7 +54,7 @@ export default class index extends Component {
|
||||||
getCurrentPaper = () => {
|
getCurrentPaper = () => {
|
||||||
Marking.testDisplay({userId: this.userId, testId: this.state.papers[0]})
|
Marking.testDisplay({userId: this.userId, testId: this.state.papers[0]})
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
if (res.data.status == "10000") {
|
if (res.data.status === "10000") {
|
||||||
let currentPaper = res.data.data;
|
let currentPaper = res.data.data;
|
||||||
let subTopic = res.data.data.subTopic;
|
let subTopic = res.data.data.subTopic;
|
||||||
let testLength = res.data.data.subTopic.length;
|
let testLength = res.data.data.subTopic.length;
|
||||||
|
@ -81,7 +79,7 @@ export default class index extends Component {
|
||||||
imgScore = (item) => {
|
imgScore = (item) => {
|
||||||
let index;
|
let index;
|
||||||
for (let i = 0; i < this.state.selectId.length; i++) {
|
for (let i = 0; i < this.state.selectId.length; i++) {
|
||||||
if (item == this.state.selectId[i]) {
|
if (item === this.state.selectId[i]) {
|
||||||
index = i;
|
index = i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -92,9 +90,9 @@ export default class index extends Component {
|
||||||
// 阅卷区
|
// 阅卷区
|
||||||
showTest = () => {
|
showTest = () => {
|
||||||
let testPaper = null;
|
let testPaper = null;
|
||||||
if (this.state.currentPaper.testInfos != undefined) {
|
if (this.state.currentPaper.testInfos !== undefined) {
|
||||||
testPaper = this.state.currentPaper.testInfos.map((item) => {
|
testPaper = this.state.currentPaper.testInfos.map((item, index) => {
|
||||||
return <div className="test-question-img" data-content-before={this.imgScore(item.test_detail_id)}>
|
return <div key={index} className="test-question-img" data-content-before={this.imgScore(item.test_detail_id)}>
|
||||||
<img src={"data:image/jpg;base64," + item.picCode} alt="加载失败" />
|
<img src={"data:image/jpg;base64," + item.picCode} alt="加载失败" />
|
||||||
</div>;
|
</div>;
|
||||||
});
|
});
|
||||||
|
@ -128,7 +126,7 @@ export default class index extends Component {
|
||||||
// 评分区
|
// 评分区
|
||||||
selectBox = (index) => {
|
selectBox = (index) => {
|
||||||
let selectList;
|
let selectList;
|
||||||
if (this.state.markScore.length != 0) {
|
if (this.state.markScore.length !== 0) {
|
||||||
selectList = this.state.markScore[index].map((item, i) => {
|
selectList = this.state.markScore[index].map((item, i) => {
|
||||||
return <Option key={i} value={item} label={item}>{item}</Option>;
|
return <Option key={i} value={item} label={item}>{item}</Option>;
|
||||||
});
|
});
|
||||||
|
@ -140,9 +138,9 @@ export default class index extends Component {
|
||||||
|
|
||||||
showSelect = () => {
|
showSelect = () => {
|
||||||
let scoreSelect = null;
|
let scoreSelect = null;
|
||||||
if (this.state.currentPaper.testInfos != undefined) {
|
if (this.state.currentPaper.testInfos !== undefined) {
|
||||||
scoreSelect = this.state.currentPaper.subTopic.map((item, index) => {
|
scoreSelect = this.state.currentPaper.subTopic.map((item, index) => {
|
||||||
return <div className="score-select">
|
return <div key={index} className="score-select">
|
||||||
{item.question_detail_name}:<Select
|
{item.question_detail_name}:<Select
|
||||||
showSearch
|
showSearch
|
||||||
key={index}
|
key={index}
|
||||||
|
@ -159,7 +157,7 @@ export default class index extends Component {
|
||||||
>
|
>
|
||||||
{
|
{
|
||||||
this.selectBox(index)
|
this.selectBox(index)
|
||||||
// this.selectBox(item.question_detail_score)
|
// this.selectBox(item.question_detail_score)
|
||||||
}
|
}
|
||||||
</Select>
|
</Select>
|
||||||
</div>;
|
</div>;
|
||||||
|
@ -179,12 +177,12 @@ export default class index extends Component {
|
||||||
let reviseSelectNo = 0;
|
let reviseSelectNo = 0;
|
||||||
let newSelectScore = [];
|
let newSelectScore = [];
|
||||||
for (let i = 0; i < this.state.selectId.length; i++) {
|
for (let i = 0; i < this.state.selectId.length; i++) {
|
||||||
if (this.state.selectId[i] == item) {
|
if (this.state.selectId[i] === item) {
|
||||||
reviseSelectNo = i;
|
reviseSelectNo = i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.state.selectScore.map((e, index) => {
|
this.state.selectScore.map((e, index) => {
|
||||||
if (index == reviseSelectNo) {
|
if (index === reviseSelectNo) {
|
||||||
newSelectScore.push(value);
|
newSelectScore.push(value);
|
||||||
} else {
|
} else {
|
||||||
newSelectScore.push(e);
|
newSelectScore.push(e);
|
||||||
|
@ -246,11 +244,11 @@ export default class index extends Component {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (value == 1) {
|
if (value === 1) {
|
||||||
let selectOrdered = [];
|
let selectOrdered = [];
|
||||||
for (let i = 0; i < this.state.subTopic.length; i++) {
|
for (let i = 0; i < this.state.subTopic.length; i++) {
|
||||||
for (let j = 0; j < this.state.selectId.length; j++) {
|
for (let j = 0; j < this.state.selectId.length; j++) {
|
||||||
if (this.state.selectId[j] == this.state.subTopic[i].test_detail_id) {
|
if (this.state.selectId[j] === this.state.subTopic[i].test_detail_id) {
|
||||||
selectOrdered.push(this.state.selectScore[j]);
|
selectOrdered.push(this.state.selectScore[j]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -270,7 +268,7 @@ export default class index extends Component {
|
||||||
onOk: () => {
|
onOk: () => {
|
||||||
let Qustion_detail_id = Util.getTextByJs(this.state.selectId);
|
let Qustion_detail_id = Util.getTextByJs(this.state.selectId);
|
||||||
let Question_detail_score = Util.getTextByJs(this.state.selectScore);
|
let Question_detail_score = Util.getTextByJs(this.state.selectScore);
|
||||||
if (value == 1) {
|
if (value === 1) {
|
||||||
if (this.state.selectScore.length < this.state.testLength) {
|
if (this.state.selectScore.length < this.state.testLength) {
|
||||||
message.warning("请将分数打全");
|
message.warning("请将分数打全");
|
||||||
} else {
|
} else {
|
||||||
|
@ -281,7 +279,7 @@ export default class index extends Component {
|
||||||
testDetailId: Qustion_detail_id,
|
testDetailId: Qustion_detail_id,
|
||||||
})
|
})
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
if (res.data.status == "10000") {
|
if (res.data.status === "10000") {
|
||||||
this.setState({
|
this.setState({
|
||||||
selectId: [],
|
selectId: [],
|
||||||
selectScore: [],
|
selectScore: [],
|
||||||
|
@ -295,7 +293,7 @@ export default class index extends Component {
|
||||||
console.log(e);
|
console.log(e);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else if (value == 3) {
|
} else if (value === 3) {
|
||||||
console.log("3");
|
console.log("3");
|
||||||
} else {
|
} else {
|
||||||
console.log("2", this);
|
console.log("2", this);
|
||||||
|
@ -308,14 +306,14 @@ export default class index extends Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
handleOk = () => {
|
handleOk = () => {
|
||||||
if (this.state.problemValue == 3) {
|
if (this.state.problemValue === 3) {
|
||||||
Marking.testProblem({
|
Marking.testProblem({
|
||||||
userId: this.userId,
|
userId: this.userId,
|
||||||
testId: this.state.currentPaper.testId,
|
testId: this.state.currentPaper.testId,
|
||||||
problemType: this.state.problemValue,
|
problemType: this.state.problemValue,
|
||||||
problemMessage: this.state.inpValu,
|
problemMessage: this.state.inpValu,
|
||||||
})
|
})
|
||||||
.then((res) => {
|
.then(() => {
|
||||||
this.setState({
|
this.setState({
|
||||||
selectId: [],
|
selectId: [],
|
||||||
selectScore: [],
|
selectScore: [],
|
||||||
|
@ -332,7 +330,7 @@ export default class index extends Component {
|
||||||
testId: this.state.currentPaper.testId,
|
testId: this.state.currentPaper.testId,
|
||||||
problemType: this.state.problemValue,
|
problemType: this.state.problemValue,
|
||||||
})
|
})
|
||||||
.then((res) => {
|
.then(() => {
|
||||||
this.setState({
|
this.setState({
|
||||||
selectId: [],
|
selectId: [],
|
||||||
selectScore: [],
|
selectScore: [],
|
||||||
|
|
|
@ -32,7 +32,7 @@ export default class index extends Component {
|
||||||
getReviewList = () => {
|
getReviewList = () => {
|
||||||
Marking.testReview({userId: this.userId})
|
Marking.testReview({userId: this.userId})
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
if (res.data.status == "10000") {
|
if (res.data.status === "10000") {
|
||||||
let reviewList = [];
|
let reviewList = [];
|
||||||
for (let i = 0; i < res.data.data.testId.length; i++) {
|
for (let i = 0; i < res.data.data.testId.length; i++) {
|
||||||
reviewList.push({
|
reviewList.push({
|
||||||
|
@ -90,19 +90,19 @@ export default class index extends Component {
|
||||||
|
|
||||||
}
|
}
|
||||||
handleOk = (value) => {
|
handleOk = (value) => {
|
||||||
if (value == 1) {
|
if (value === 1) {
|
||||||
this.setState({
|
this.setState({
|
||||||
reviewVisible: false,
|
reviewVisible: false,
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
if (this.state.problemValue == 3) {
|
if (this.state.problemValue === 3) {
|
||||||
Marking.testProblem({
|
Marking.testProblem({
|
||||||
userId: this.userId,
|
userId: this.userId,
|
||||||
testId: this.state.currentPaper.testId,
|
testId: this.state.currentPaper.testId,
|
||||||
problemType: this.state.problemValue,
|
problemType: this.state.problemValue,
|
||||||
problemMessage: this.state.inpValu,
|
problemMessage: this.state.inpValu,
|
||||||
})
|
})
|
||||||
.then((res) => {
|
.then(() => {
|
||||||
this.setState({
|
this.setState({
|
||||||
selectId: [],
|
selectId: [],
|
||||||
selectScore: [],
|
selectScore: [],
|
||||||
|
@ -119,7 +119,7 @@ export default class index extends Component {
|
||||||
testId: this.state.currentPaper.testId,
|
testId: this.state.currentPaper.testId,
|
||||||
problemType: this.state.problemValue,
|
problemType: this.state.problemValue,
|
||||||
})
|
})
|
||||||
.then((res) => {
|
.then(() => {
|
||||||
this.setState({
|
this.setState({
|
||||||
selectId: [],
|
selectId: [],
|
||||||
selectScore: [],
|
selectScore: [],
|
||||||
|
@ -229,7 +229,7 @@ export default class index extends Component {
|
||||||
imgScore = (item) => {
|
imgScore = (item) => {
|
||||||
let index;
|
let index;
|
||||||
for (let i = 0; i < this.state.selectId.length; i++) {
|
for (let i = 0; i < this.state.selectId.length; i++) {
|
||||||
if (item == this.state.selectId[i]) {
|
if (item === this.state.selectId[i]) {
|
||||||
index = i;
|
index = i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -240,8 +240,8 @@ export default class index extends Component {
|
||||||
showTest = () => {
|
showTest = () => {
|
||||||
let testPaper = null;
|
let testPaper = null;
|
||||||
if (this.state.currentPaper.testInfos !== undefined) {
|
if (this.state.currentPaper.testInfos !== undefined) {
|
||||||
testPaper = this.state.currentPaper.testInfos.map((item) => {
|
testPaper = this.state.currentPaper.testInfos.map((item, index) => {
|
||||||
return <div className="test-question-img" data-content-before={this.imgScore(item.test_detail_id)}>
|
return <div key={index} className="test-question-img" data-content-before={this.imgScore(item.test_detail_id)}>
|
||||||
<img src={"data:image/jpg;base64," + item.picCode} alt="加载失败" />
|
<img src={"data:image/jpg;base64," + item.picCode} alt="加载失败" />
|
||||||
</div>;
|
</div>;
|
||||||
});
|
});
|
||||||
|
@ -293,7 +293,7 @@ export default class index extends Component {
|
||||||
let scoreSelect = null;
|
let scoreSelect = null;
|
||||||
if (this.state.currentPaper.testInfos !== undefined) {
|
if (this.state.currentPaper.testInfos !== undefined) {
|
||||||
scoreSelect = this.state.currentPaper.subTopic.map((item, index) => {
|
scoreSelect = this.state.currentPaper.subTopic.map((item, index) => {
|
||||||
return <div className="score-select">
|
return <div key={index} className="score-select">
|
||||||
{item.question_detail_name}:<Select
|
{item.question_detail_name}:<Select
|
||||||
showSearch
|
showSearch
|
||||||
key={index}
|
key={index}
|
||||||
|
@ -330,12 +330,12 @@ export default class index extends Component {
|
||||||
let reviseSelectNo = 0;
|
let reviseSelectNo = 0;
|
||||||
let newSelectScore = [];
|
let newSelectScore = [];
|
||||||
for (let i = 0; i < this.state.selectId.length; i++) {
|
for (let i = 0; i < this.state.selectId.length; i++) {
|
||||||
if (this.state.selectId[i] == item) {
|
if (this.state.selectId[i] === item) {
|
||||||
reviseSelectNo = i;
|
reviseSelectNo = i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.state.selectScore.map((e, index) => {
|
this.state.selectScore.map((e, index) => {
|
||||||
if (index == reviseSelectNo) {
|
if (index === reviseSelectNo) {
|
||||||
newSelectScore.push(value);
|
newSelectScore.push(value);
|
||||||
} else {
|
} else {
|
||||||
newSelectScore.push(e);
|
newSelectScore.push(e);
|
||||||
|
@ -396,11 +396,11 @@ export default class index extends Component {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (value == 1) {
|
if (value === 1) {
|
||||||
let selectOrdered = [];
|
let selectOrdered = [];
|
||||||
for (let i = 0; i < this.state.subTopic.length; i++) {
|
for (let i = 0; i < this.state.subTopic.length; i++) {
|
||||||
for (let j = 0; j < this.state.selectId.length; j++) {
|
for (let j = 0; j < this.state.selectId.length; j++) {
|
||||||
if (this.state.selectId[j] == this.state.subTopic[i].test_detail_id) {
|
if (this.state.selectId[j] === this.state.subTopic[i].test_detail_id) {
|
||||||
selectOrdered.push(this.state.selectScore[j]);
|
selectOrdered.push(this.state.selectScore[j]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -421,7 +421,7 @@ export default class index extends Component {
|
||||||
onOk: () => {
|
onOk: () => {
|
||||||
let Qustion_detail_id = Util.getTextByJs(this.state.selectId);
|
let Qustion_detail_id = Util.getTextByJs(this.state.selectId);
|
||||||
let Question_detail_score = Util.getTextByJs(this.state.selectScore);
|
let Question_detail_score = Util.getTextByJs(this.state.selectScore);
|
||||||
if (value == 1) {
|
if (value === 1) {
|
||||||
Marking.testReviewPoint({
|
Marking.testReviewPoint({
|
||||||
userId: this.userId,
|
userId: this.userId,
|
||||||
testId: this.state.currentPaper.testId,
|
testId: this.state.currentPaper.testId,
|
||||||
|
@ -429,7 +429,7 @@ export default class index extends Component {
|
||||||
testDetailId: Qustion_detail_id,
|
testDetailId: Qustion_detail_id,
|
||||||
})
|
})
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
if (res.data.status == "10000") {
|
if (res.data.status === "10000") {
|
||||||
this.setState({
|
this.setState({
|
||||||
selectId: [],
|
selectId: [],
|
||||||
selectScore: [],
|
selectScore: [],
|
||||||
|
@ -443,7 +443,7 @@ export default class index extends Component {
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
console.log(e);
|
console.log(e);
|
||||||
});
|
});
|
||||||
} else if (value == 3) {
|
} else if (value === 3) {
|
||||||
console.log("3");
|
console.log("3");
|
||||||
} else {
|
} else {
|
||||||
console.log("2", this);
|
console.log("2", this);
|
||||||
|
|
|
@ -84,9 +84,9 @@ export default class index extends Component {
|
||||||
|
|
||||||
showTest = () => {
|
showTest = () => {
|
||||||
let testPaper = null;
|
let testPaper = null;
|
||||||
if (this.state.samplePaper !== undefined || this.state.samplePaper !== null) {
|
if (this.state.samplePaper !== undefined) {
|
||||||
testPaper = this.state.samplePaper.map((item) => {
|
testPaper = this.state.samplePaper.map((item, index) => {
|
||||||
return <img src={"data:image/jpg;base64," + item.pic_src} alt="加载失败" className="test-question-img" />;
|
return <img key={index} src={"data:image/jpg;base64," + item.pic_src} alt="加载失败" className="test-question-img" />;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -130,7 +130,7 @@ export default class index extends Component {
|
||||||
console.log(record.order);
|
console.log(record.order);
|
||||||
Marking.testDetail({userId: this.userId, exampleTestId: record.question_id})
|
Marking.testDetail({userId: this.userId, exampleTestId: record.question_id})
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
if (res.data.status == "10000") {
|
if (res.data.status === "10000") {
|
||||||
this.setState({
|
this.setState({
|
||||||
samplePaper: res.data.data.test[record.order],
|
samplePaper: res.data.data.test[record.order],
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue