Skip to content

X
xiaomai-cloud-class-web
Commit bf272604 by zhujian
Options

'fix'

parent a0da10ee
Showing with 39 additions and 21 deletions
src/modules/common/TeacherSelect.tsx
...@@ -10,7 +10,8 @@ export default function ExaminationManager(props: any) { ...@@ -10,7 +10,8 @@ export default function ExaminationManager(props: any) {
const teacherQueryInit: any = {}; const teacherQueryInit: any = {};
const [teacherQuery, setTeacherQuery] = useState({ const [teacherQuery, setTeacherQuery] = useState({
current:1, current:1,
size: 10 size: 10,
roleCodes:props.roleCodes
}); });
const [teacherList, setTeacherList] = useState([]); const [teacherList, setTeacherList] = useState([]);
const [hasNext, setHasNext] = useState(true); const [hasNext, setHasNext] = useState(true);
...@@ -68,6 +69,7 @@ export default function ExaminationManager(props: any) { ...@@ -68,6 +69,7 @@ export default function ExaminationManager(props: any) {
onClear={() => { onClear={() => {
props.onChange(null) props.onChange(null)
setTeacherQuery({ setTeacherQuery({
roleCodes:props.roleCodes,
current:1, current:1,
size: 10 size: 10
}) })
......
src/modules/teach-tool/examination-manager/ExamData.tsx
...@@ -25,6 +25,7 @@ function ExamData(props: any) { ...@@ -25,6 +25,7 @@ function ExamData(props: any) {
const [query, setQuery] = useState(queryInit); const [query, setQuery] = useState(queryInit);
const [total, setTotal] = useState(0); const [total, setTotal] = useState(0);
const [field, setfield] = useState(''); const [field, setfield] = useState('');
const [allData, setAllData] = useState(0);
const [order, setOrder] = useState(sortStatus.type); const [order, setOrder] = useState(sortStatus.type);
const questionTypeList = { const questionTypeList = {
SINGLE_CHOICE: "单选题", SINGLE_CHOICE: "单选题",
...@@ -88,6 +89,9 @@ function ExamData(props: any) { ...@@ -88,6 +89,9 @@ function ExamData(props: any) {
}).then((res) => { }).then((res) => {
setList(res.result.records); setList(res.result.records);
setTotal(parseInt(res.result.total)) setTotal(parseInt(res.result.total))
if (!allData) {
setAllData(parseInt(res.result.total))
}
}) })
} }
...@@ -214,7 +218,10 @@ function ExamData(props: any) { ...@@ -214,7 +218,10 @@ function ExamData(props: any) {
<div className="subTitle"><div className="type"><span className="icon iconfont">&#xe7fe;</span>不定项选择题 <span>(共{examData.indefiniteChoiceCnt}题)</span></div></div> <div className="subTitle"><div className="type"><span className="icon iconfont">&#xe7fe;</span>不定项选择题 <span>(共{examData.indefiniteChoiceCnt}题)</span></div></div>
</div> </div>
</div> </div>
<Button style={{ marginBottom: 12, marginTop: 12 }} onClick={download} >导出</Button> {
!!allData && <Button style={{ marginBottom: 12, marginTop: 12 }} onClick={download} >导出</Button>
}
<div className="content"> <div className="content">
<Table <Table
......
src/modules/teach-tool/examination-manager/Index.tsx
...@@ -238,11 +238,11 @@ function ExaminationManager(props: any) { ...@@ -238,11 +238,11 @@ function ExaminationManager(props: any) {
} }
function getList() { function getList() {
const _query ={...query}; const _query = { ...query };
// if(_query.examCreator){ // if(_query.examCreator){
// _query.examCreator =parseInt(_query.examCreator) // _query.examCreator =parseInt(_query.examCreator)
// } // }
Service.Hades("public/hades/queryExamPageList", { Service.Hades("public/hades/queryExamPageList", {
..._query, userId: User.getStoreUserId(), ..._query, userId: User.getStoreUserId(),
tenantId: User.getStoreId(), tenantId: User.getStoreId(),
...@@ -294,12 +294,15 @@ function ExaminationManager(props: any) { ...@@ -294,12 +294,15 @@ function ExaminationManager(props: any) {
/> />
</div> </div>
<TeacherSelect val={query.examCreator} onChange={(examCreator: any) => { <TeacherSelect val={query.examCreator}
onChange={(examCreator: any) => {
const _query = { ...query } const _query = { ...query }
_query.examCreator = examCreator; _query.examCreator = examCreator;
setQuery(_query); setQuery(_query);
}} ></TeacherSelect> }}
roleCodes={["CloudManager"]}
></TeacherSelect>
<div className="search-condition__item"> <div className="search-condition__item">
<span className="search-name">考试时间:</span> <span className="search-name">考试时间:</span>
......
src/modules/teach-tool/examination-manager/UserData.tsx
import React, { useState, useRef, useEffect } from 'react' import React, { useState, useRef, useEffect } from 'react'
import Service from "@/common/js/service"; import Service from "@/common/js/service";
import { PageControl } from "@/components"; import { PageControl } from "@/components";
import { Input, Select, Tooltip, Table,Button } from 'antd'; import { Input, Select, Tooltip, Table, Button } from 'antd';
import User from "@/common/js/user"; import User from "@/common/js/user";
import moment from 'moment'; import moment from 'moment';
import './userData.less' import './userData.less'
...@@ -25,6 +25,7 @@ function DataAnalysic(props: any) { ...@@ -25,6 +25,7 @@ function DataAnalysic(props: any) {
const [query, setQuery] = useState(queryInit); const [query, setQuery] = useState(queryInit);
const [total, setTotal] = useState(0); const [total, setTotal] = useState(0);
const [field, setfield] = useState(''); const [field, setfield] = useState('');
const [allData, setAllData] = useState(0);
const [order, setOrder] = useState(sortStatus.type); const [order, setOrder] = useState(sortStatus.type);
const userTypeEnum = { const userTypeEnum = {
...@@ -103,6 +104,9 @@ function DataAnalysic(props: any) { ...@@ -103,6 +104,9 @@ function DataAnalysic(props: any) {
}).then((res) => { }).then((res) => {
setList(res.result.records); setList(res.result.records);
setTotal(parseInt(res.result.total)) setTotal(parseInt(res.result.total))
if (!allData) {
setAllData(parseInt(res.result.total))
}
}) })
} }
...@@ -154,21 +158,21 @@ function DataAnalysic(props: any) { ...@@ -154,21 +158,21 @@ function DataAnalysic(props: any) {
setOrder(sorter.order) setOrder(sorter.order)
console.log(sorter.field, sorter.order, (orderEnum as any)[sorter.field]) console.log(sorter.field, sorter.order, (orderEnum as any)[sorter.field])
let _query: any = { ...queryRef.current }; let _query: any = { ...queryRef.current };
_query.order = (orderEnum as any)[sorter.field][sorter.order] _query.order = (orderEnum as any)[sorter.field][sorter.order]
setQuery(_query) setQuery(_query)
} }
function download(){ function download() {
Service.Hades('public/hades/exportExamData', { Service.Hades('public/hades/exportExamData', {
...query, ...query,
examId: props.examId, examId: props.examId,
exportDataType:'EXAM_USER_DATA', exportDataType: 'EXAM_USER_DATA',
tenantId: User.getStoreId(), tenantId: User.getStoreId(),
userId: User.getStoreUserId(), userId: User.getStoreUserId(),
source: 0 source: 0
}).then((res) => { }).then((res) => {
const dom =(document as any).getElementById("load-play-back-excel") const dom = (document as any).getElementById("load-play-back-excel")
dom.setAttribute('href',res.result); dom.setAttribute('href', res.result);
dom.click(); dom.click();
}) })
...@@ -177,12 +181,12 @@ function DataAnalysic(props: any) { ...@@ -177,12 +181,12 @@ function DataAnalysic(props: any) {
return <div className="rr"> return <div className="rr">
<a <a
target="_blank" target="_blank"
download download
id="load-play-back-excel" id="load-play-back-excel"
style={{ position: "absolute", left: "-10000px" }} style={{ position: "absolute", left: "-10000px" }}
> >
111 111
</a> </a>
<div className="dataPanal"> <div className="dataPanal">
<div className="item"> <div className="item">
...@@ -275,8 +279,10 @@ function DataAnalysic(props: any) { ...@@ -275,8 +279,10 @@ function DataAnalysic(props: any) {
</div> </div>
</div> </div>
</div> </div>
{
!!allData && <Button style={{ marginBottom: 12 }} onClick={download} >导出</Button>
}
<Button style={{marginBottom:12}} onClick={download} >导出</Button>
<div className="content"> <div className="content">
<Table <Table
......
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