m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

调整试卷题库选用

Browse Source
dev_new_shixunsrepository
杨树林 5 years ago
parent 4ee639828f
commit fc3fd27d49
4 changed files with 110 additions and 36 deletions
Show Stats Download Patch File Download Diff File

34
public/react/src/modules/question/NewMyShixunModel.js
Unescape View File

@ -91,7 +91,7 @@ class NewMyShixunModel extends Component {
page: this.state.page, page: this.state.page,
per_page:10, per_page:10,
oj_status:null, oj_status:null,
item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
}; };
this.getdata(data); this.getdata(data);
@ -117,7 +117,7 @@ class NewMyShixunModel extends Component {
page: 1, page: 1,
per_page:10, per_page:10,
oj_status:null, oj_status:null,
item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
}; };
this.getdata(data); this.getdata(data);
} }
@ -141,7 +141,7 @@ class NewMyShixunModel extends Component {
page: 1, page: 1,
per_page:10, per_page:10,
oj_status:null, oj_status:null,
item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
}; };
this.getdata(data); this.getdata(data);
} }
@ -156,7 +156,7 @@ class NewMyShixunModel extends Component {
public: defaultActiveKey, public: defaultActiveKey,
page:1, page:1,
per_page:10, per_page:10,
item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
}; };
this.getdata(data); this.getdata(data);
@ -209,7 +209,7 @@ class NewMyShixunModel extends Component {
page: 1, page: 1,
per_page:10, per_page:10,
oj_status:null, oj_status:null,
item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
}; };
this.getdata(data); this.getdata(data);
@ -342,7 +342,7 @@ class NewMyShixunModel extends Component {
page: pageNumber, page: pageNumber,
per_page:10, per_page:10,
oj_status:this.state.oj_status, oj_status:this.state.oj_status,
item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
}; };
this.getdata(data); this.getdata(data);
@ -461,7 +461,7 @@ class NewMyShixunModel extends Component {
page:1, page:1,
per_page:10, per_page:10,
oj_status:null, oj_status:null,
item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
}; };
this.getdata(data); this.getdata(data);
@ -488,7 +488,7 @@ class NewMyShixunModel extends Component {
per_page:10, per_page:10,
keywords:null, keywords:null,
oj_status:null, oj_status:null,
item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
}; };
this.getdata(data); this.getdata(data);
@ -543,7 +543,7 @@ class NewMyShixunModel extends Component {
page: this.state.page, page: this.state.page,
per_page:10, per_page:10,
oj_status:this.state.oj_status, oj_status:this.state.oj_status,
item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
}; };
this.getdata(data); this.getdata(data);
@ -567,7 +567,7 @@ class NewMyShixunModel extends Component {
keywords: this.state.keywords, keywords: this.state.keywords,
page: this.state.page, page: this.state.page,
per_page:10, per_page:10,
item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
}; };
this.getdata(data); this.getdata(data);
} }
@ -593,7 +593,7 @@ class NewMyShixunModel extends Component {
keywords: this.state.keywords, keywords: this.state.keywords,
page: this.state.page, page: this.state.page,
per_page:10, per_page:10,
item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
}; };
this.getdata(data); this.getdata(data);
@ -661,7 +661,7 @@ class NewMyShixunModel extends Component {
keywords: this.state.keywords, keywords: this.state.keywords,
page: this.state.page, page: this.state.page,
per_page:10, per_page:10,
item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
}; };
this.getdatasy(data); this.getdatasy(data);
this.getbasket_listdata(); this.getbasket_listdata();
@ -683,7 +683,7 @@ class NewMyShixunModel extends Component {
} }
axios.delete(url,{ data: { axios.delete(url,{ data: {
item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
}}) }})
.then((result) => { .then((result) => {
if (result.data.status == 0) { if (result.data.status == 0) {
@ -698,7 +698,7 @@ class NewMyShixunModel extends Component {
keywords: this.state.keywords, keywords: this.state.keywords,
page: this.state.page, page: this.state.page,
per_page:10, per_page:10,
item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
}; };
this.getdatasy(data); this.getdatasy(data);
this.getbasket_listdata(); this.getbasket_listdata();
@ -739,7 +739,7 @@ class NewMyShixunModel extends Component {
} }
const data={ const data={
item_ids:item_idsdata, item_ids:item_idsdata,
item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
} }
this.getitem_baskets(data); this.getitem_baskets(data);
this.setState({ this.setState({
@ -768,7 +768,7 @@ class NewMyShixunModel extends Component {
keywords: this.state.keywords, keywords: this.state.keywords,
page: this.state.page, page: this.state.page,
per_page:10, per_page:10,
item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
}; };
this.getdata(data); this.getdata(data);
this.getbasket_listdata(); this.getbasket_listdata();
@ -806,7 +806,7 @@ class NewMyShixunModel extends Component {
page: this.state.page, page: this.state.page,
per_page:10, per_page:10,
oj_status:oj_status, oj_status:oj_status,
item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), exam_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id),
}; };
this.getdata(data); this.getdata(data);
} }

5
public/react/src/modules/question/questioncss/questioncom.css
Unescape View File

@ -951,3 +951,8 @@
.tites{ .tites{
color: #888888 !important; color: #888888 !important;
} }
.ant-popover-inner-content{
padding: 0px !important;
}

98
public/react/src/modules/testpaper/component/Paperlibraryseeid_items.js
Unescape View File

@ -15,6 +15,7 @@ import {
} from "antd"; } from "antd";
import '../testioncss/testioncss.css'; import '../testioncss/testioncss.css';
import '../../tpm/newshixuns/css/Newshixuns.css'; import '../../tpm/newshixuns/css/Newshixuns.css';
import QuillForEditor from "../../../common/quillForEditor";
const tagArray = [ const tagArray = [
'A．', 'B．', 'C．', 'D．', 'E．', 'F．', 'G．', 'H．', 'I．', 'A．', 'B．', 'C．', 'D．', 'E．', 'F．', 'G．', 'H．', 'I．',
@ -67,15 +68,42 @@ class Paperlibraryseeid_items extends Component {
render() { render() {
let {questions, totalscore, total, items} = this.state; let {questions, totalscore, total, items} = this.state;
let {objectsingle, indexx, paperreviewsingleindex, indexxy,name} = this.props; let {objectsingle, indexx, paperreviewsingleindex, indexxy,name} = this.props;
// console.log("objectsingle");
// console.log(objectsingle);
var itemssname="";
try {
itemssname= JSON.parse(objectsingle.name);
}catch (e) {
}
if(itemssname===undefined){
itemssname=objectsingle.name
}
return ( return (
<div key={indexxy} <div key={indexxy}
className={ "w100s borderwdswuh mb20 pd20 "} className={ "w100s borderwdswuh mb20 pd20 "}
style={{ style={{
minHeight: "114px", minHeight: "114px",
}}> }}>
<style>{
`
.programquill .ql-editor{
padding: 0px;
}
.programquill .ql-editor p{
line-height: 28px;
}
.programquills .ql-editor{
padding: 0px;
}
.programquills .ql-editor p{
line-height: 20px;
}
`
}</style>
{/*顶部*/} {/*顶部*/}
<div className="w100s sortinxdirection "> <div className="w100s sortinxdirection ">
<div className=" sortinxdirection "> <div className=" sortinxdirection ">
@ -100,29 +128,46 @@ class Paperlibraryseeid_items extends Component {
} }
</style> </style>
{ {
this.props.typenames==="PROGRAM"? objectsingle.item_type==="PROGRAM"?
<div className=" lh28 listjihetixingstit markdown-body cretitlecolrlist" style={{wordBreak: "break-word"}} <div className="w100s sortinxdirection">
dangerouslySetInnerHTML={{__html: markdownToHTML( objectsingle.name).replace(/▁/g, "▁▁▁")}}> <div className=" tites lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{wordBreak: "break-word"}}
>
({objectsingle.score}分)
</div>
<div className="ml10 lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{wordBreak: "break-word"}}
dangerouslySetInnerHTML={{__html: markdownToHTML(objectsingle.name).replace(/▁/g, "▁▁▁")}}>
</div>
</div> </div>
: :
<div className=" lh28 listjihetixingstit markdown-body cretitlecolrlist" style={{wordBreak: "break-word"}} <div className="w100s sortinxdirection">
dangerouslySetInnerHTML={{__html: markdownToHTML(`（${objectsingle.score}分) ` + objectsingle.name).replace(/▁/g, "▁▁▁")}}> <div className="tites lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{wordBreak: "break-word"}}
>
({objectsingle.score}分)
</div> </div>
<div className="ml10 lh28 listjihetixingstit cretitlecolrlist programquill" style={{wordBreak: "break-word"}}
>
<QuillForEditor
readOnly={true}
value={itemssname}
/>
</div>
</div>
} }
</div> </div>
{/*内容*/} {/*内容*/}
<div className="w100s sortinxdirection"> <div className="w100s sortinxdirection">
{ {
objectsingle.item_type === "JUDGMENT" ? objectsingle.item_type === "JUDGMENT" ?
<p className="w100s listjihetixingstits sortinxdirection "> <p className="w100s listjihetixingstits sortinxdirection ">
{ {
objectsingle === undefined || objectsingle === null ? "" : objectsingle.choices.map((object, index) => { objectsingle === undefined || objectsingle === null ? "" : objectsingle.choices.map((object, index) => {
return ( return (
<p className={index === 1 ? "sortinxdirection ml10" : "sortinxdirection "} key={index}> <p className={index === 1 ? "sortinxdirection ml10" : "sortinxdirection "}>
<Radio checked={object.is_answer}> <Radio disabled={false}>
{object.choice_text} {object.choice_text}
</Radio> </Radio>
</p> </p>
@ -134,8 +179,17 @@ class Paperlibraryseeid_items extends Component {
objectsingle.item_type === "PROGRAM" ? objectsingle.item_type === "PROGRAM" ?
<p className="w100s listjihetixingstitssy sortinxdirection "> <p className="w100s listjihetixingstitssy sortinxdirection ">
<p className={"sortinxdirection mt15"}> <p className={"sortinxdirection mt15"}>
<p style={{wordBreak: "break-word"}} {
dangerouslySetInnerHTML={{__html: markdownToHTML(objectsingle.program_attr.description).replace(/▁/g, "▁▁▁")}}></p> objectsingle&&objectsingle.program_attr&&objectsingle.program_attr.description?
<p className="programquill" style={{wordBreak: "break-word"}}
>
<QuillForEditor
readOnly={true}
value={JSON.parse(objectsingle.program_attr.description)}
/>
</p>
:
""}
</p> </p>
</p> </p>
: :
@ -143,10 +197,23 @@ class Paperlibraryseeid_items extends Component {
{ {
objectsingle === undefined || objectsingle === null ? "" : objectsingle.choices.map((object, index) => { objectsingle === undefined || objectsingle === null ? "" : objectsingle.choices.map((object, index) => {
return ( return (
<p className={index === 0 ? "sortinxdirection" : "sortinxdirection mt15"} key={index}> <p className={index === 0 ? "sortinxdirection" : "sortinxdirection mt15"}>
{tagArray[index]} {tagArray[index]}
<p style={{wordBreak: "break-word"}} <p className="programquills" style={{wordBreak: "break-word"}}>
dangerouslySetInnerHTML={{__html: markdownToHTML(object.choice_text).replace(/▁/g, "▁▁▁")}}></p> {object ?
object.choice_text === undefined || object.choice_text=== null || object.choice_text === "" ?
""
:
object.choice_text.length>0?
<QuillForEditor
readOnly={true}
value={JSON.parse(object.choice_text)}
/>
:""
:
""
}
</p>
</p> </p>
) )
}) })
@ -154,7 +221,6 @@ class Paperlibraryseeid_items extends Component {
</p> </p>
} }
</div> </div>

3
public/react/src/modules/testpaper/testioncss/testioncss.css
Unescape View File

@ -892,3 +892,6 @@
width: 39px; width: 39px;
height: 44px; height: 44px;
} }
.tites{
color: #888888 !important;
}

Write Preview
Loading…
Cancel
Save