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

调整

Browse Source
dev_aliyun2
杨树林 5 years ago committed by harry
parent 330caed864
commit e04adf35c2
4 changed files with 86 additions and 41 deletions
Show Stats Download Patch File Download Diff File

10
public/react/src/AppConfig.js
Unescape View File

@ -47,11 +47,15 @@ if (isDev) {
window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin' window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
} }
// 超管 // 超管
debugType = "admin"; debugType="admin";
// 老师 // 老师
//debugType="teacher"; // debugType="teacher";
// 学生 // 学生
//debugType="student"; // debugType="student";
function clearAllCookie() { function clearAllCookie() {
cookie.remove('_educoder_session', { path: '/' }); cookie.remove('_educoder_session', { path: '/' });

28
public/react/src/modules/question/Paperreview_single.js
Unescape View File

@ -113,7 +113,7 @@ class Paperreview_single extends Component {
{/*顶部*/} {/*顶部*/}
<div className="w100s sortinxdirection "> <div className="w100s sortinxdirection ">
<div className=" sortinxdirection "> <div className=" sortinxdirection ">
<p className="cretitlecolrlis lh28">{indexx}</p>、 <p className="cretitlecolrlis lh28" style={{fontWeight:"bold"}}>{indexx}</p>、
</div> </div>
<style> <style>
{ {
@ -124,27 +124,32 @@ class Paperreview_single extends Component {
line-height: 28px; line-height: 28px;
} }
.markdown-body p { .markdown-body p {
color: #333333; color: #333333;
font-size: 14px !important; font-size: 14px !important;
line-height: 28px; line-height: 28px;
font-weight: bold;
} }
.bodyysls .ql-editor p span{
font-weight: bold;
}
` `
} }
</style> </style>
{ {
objectsingle.item_type === "PROGRAM" ? objectsingle.item_type==="PROGRAM"?
<div className="w100s sortinxdirection"> <div className="w100s sortinxdirection">
<div className=" tites lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{ <div className=" tites lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{wordBreak: "break-word",
wordBreak: "break-word", minWidth:"32px",fontWeight:"bold"
minWidth: "32px"
}} }}
> >
({objectsingle.score}分) ({objectsingle.score}分)
</div> </div>
<div id={"titessone"} className="ml10 lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{wordBreak: "break-word"}} <div id={"titessone"} className="ml10 lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{wordBreak: "break-word",fontWeight:"bold"}}
dangerouslySetInnerHTML={{__html: markdownToHTML(fenshul+objectsingle.name).replace(/▁/g, "▁▁▁")}}> dangerouslySetInnerHTML={{__html: markdownToHTML(fenshul+objectsingle.name).replace(/▁/g, "▁▁▁")}}>
</div> </div>
@ -152,19 +157,18 @@ class Paperreview_single extends Component {
: :
<div className="w100s sortinxdirection titesstwos"> <div className="w100s sortinxdirection titesstwos">
<div id={"titesstwo"} className="tites titesstwostest lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{wordBreak: "break-word", <div id={"titesstwo"} className="tites titesstwostest lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{wordBreak: "break-word",
minWidth:"32px" minWidth:"32px",fontWeight:"bold"
}} }}
> >
({objectsingle.score}分) ({objectsingle.score}分)
</div> </div>
<div className={objectsingle.score<10?" lh28 listjihetixingstit text-indents40 cretitlecolrlist programquill":objectsingle.score<100?" lh28 listjihetixingstit text-indents44 cretitlecolrlist programquill":" lh28 listjihetixingstit text-indents50 cretitlecolrlist programquill" }style={{wordBreak: "break-word"}} <div className={objectsingle.score<10?" lh28 listjihetixingstit text-indents40 bodyysls cretitlecolrlist programquill":objectsingle.score<100?" lh28 listjihetixingstit text-indents44 bodyysls cretitlecolrlist programquill":" lh28 listjihetixingstit text-indents50 bodyysls cretitlecolrlist programquill" }style={{wordBreak: "break-word",fontWeight:"bold"}}
> >
{ {
itemssname===null|| itemssname===undefined? itemssname===null|| itemssname===undefined?
"" ""
: :
<QuillForEditor <QuillForEditor
options={options}
readOnly={true} readOnly={true}
value={itemssname} value={itemssname}
/> />
@ -200,11 +204,11 @@ class Paperreview_single extends Component {
<p className="w100s listjihetixingstitssy sortinxdirection "> <p className="w100s listjihetixingstitssy sortinxdirection ">
<p className={"sortinxdirection mt15"}> <p className={"sortinxdirection mt15"}>
{ {
objectsingle && objectsingle.program_attr && objectsingle.program_attr.description ? objectsingle&&objectsingle.program_attr&&objectsingle.program_attr.description?
<p className="programquill" style={{ wordBreak: "break-word" }} <p className="programquill " style={{wordBreak: "break-word"}}
> >
{ {
itemsnamesy === null || itemsnamesy === undefined ? itemsnamesy===null || itemsnamesy===undefined?
"" ""
: :
<QuillForEditor <QuillForEditor

21
public/react/src/modules/question/component/Listjihe.js
Unescape View File

@ -180,18 +180,29 @@ class Listjihe extends Component {
padding-left: 0px !important; padding-left: 0px !important;
padding-top: 0px !important; padding-top: 0px !important;
} }
.markdown-body .ql-editor p span{
font-weight: bold;
}
.markdown-body .ql-editor p {
font-weight: bold;
}
.programquill .ql-editor{ .programquill .ql-editor{
padding-left: 0px !important; padding-left: 0px !important;
padding-top: 0px !important; padding-top: 0px !important;
} }
.ql-editor{
display: inline-block;
text-align: justify;
}
` `
} }
</style> </style>
<div className="w100s sortinxdirection"> <div className="w100s sortinxdirection">
<div className="listjihetixingstitsy"> <div className="listjihetixingstitsy" style={{
fontWeight:"bold"
}} >
{ {
this.props.listjihe this.props.listjihe
}. }.
@ -199,10 +210,11 @@ class Listjihe extends Component {
{ {
items.item_type==="PROGRAM"? items.item_type==="PROGRAM"?
<a href={`/problems/${items.program_attr.identifier}/edit`}> <a href={`/problems/${items.program_attr.identifier}/edit`}>
<div className="ml10 w100s " style={{wordBreak: "break-word"}} dangerouslySetInnerHTML={{__html: markdownToHTML(items&&items.name).replace(/▁/g, "▁▁▁")}}></div> <div className="ml10 w100s " style={{wordBreak: "break-word",fontWeight:"bold"}} dangerouslySetInnerHTML={{__html: markdownToHTML(items&&items.name).replace(/▁/g, "▁▁▁")}}></div>
</a> </a>
: :
<div className="ml10 w100s markdown-body" style={{wordBreak: "break-word"}}> <div className="ml10 w100s markdown-body" style={{wordBreak: "break-word",fontWeight:"bold"}}>
{ items===undefined||items===null||items===""?"": { items===undefined||items===null||items===""?"":
items.name === undefined || items.name === null || items.name === "" ? items.name === undefined || items.name === null || items.name === "" ?
"" ""
@ -210,7 +222,6 @@ class Listjihe extends Component {
items.name.length>0? items.name.length>0?
itemssname===null|| itemssname===undefined?"": itemssname===null|| itemssname===undefined?"":
<QuillForEditor <QuillForEditor
options={options}
readOnly={true} readOnly={true}
value={itemssname} value={itemssname}
/> />

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

@ -111,7 +111,7 @@ class Paperlibraryseeid_items extends Component {
{/*顶部*/} {/*顶部*/}
<div className="w100s sortinxdirection "> <div className="w100s sortinxdirection ">
<div className=" sortinxdirection "> <div className=" sortinxdirection ">
<p className="cretitlecolrlis lh28">{indexx}</p>、 <p className="cretitlecolrlis lh28" style={{fontWeight:"bold"}}>{indexx}</p>、
</div> </div>
<style> <style>
{ {
@ -126,28 +126,47 @@ class Paperlibraryseeid_items extends Component {
color: #333333; color: #333333;
font-size: 14px !important; font-size: 14px !important;
line-height: 28px; line-height: 28px;
font-weight: bold;
} }
.bodyysls .ql-editor p span{
font-weight: bold;
}
.markdown-body .ql-editor p {
font-weight: bold;
}
` `
} }
</style> </style>
{ {
objectsingle.item_type === "PROGRAM" ? objectsingle.item_type === "PROGRAM" ?
<div className="w100s sortinxdirection"> <div className="w100s sortinxdirection">
<<<<<<< HEAD
<div className=" tites lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{ <div className=" tites lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{
wordBreak: "break-word", wordBreak: "break-word",
minWidth: "32px" minWidth: "32px"
=======
<div className=" tites lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{wordBreak: "break-word",
minWidth:"32px",fontWeight:"bold"
>>>>>>> c6b13f1... 调整
}} }}
> >
({objectsingle.score}分) ({objectsingle.score}分)
</div> </div>
<<<<<<< HEAD
<div className="ml10 lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{ wordBreak: "break-word" }} <div className="ml10 lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{ wordBreak: "break-word" }}
dangerouslySetInnerHTML={{ __html: markdownToHTML(objectsingle.name).replace(/▁/g, "▁▁▁") }}> dangerouslySetInnerHTML={{ __html: markdownToHTML(objectsingle.name).replace(/▁/g, "▁▁▁") }}>
=======
<div className="ml10 lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{wordBreak: "break-word",fontWeight:"bold"}}
dangerouslySetInnerHTML={{__html: markdownToHTML(objectsingle.name).replace(/▁/g, "▁▁▁")}}>
>>>>>>> c6b13f1... 调整
</div> </div>
</div> </div>
: :
<div className="w100s sortinxdirection"> <div className="w100s sortinxdirection">
<<<<<<< HEAD
<div className="tites lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{ <div className="tites lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{
wordBreak: "break-word", wordBreak: "break-word",
minWidth: "32px" minWidth: "32px"
@ -156,13 +175,20 @@ class Paperlibraryseeid_items extends Component {
({objectsingle.score}分) ({objectsingle.score}分)
</div> </div>
<div className="ml10 lh28 listjihetixingstit cretitlecolrlist programquill" style={{ wordBreak: "break-word" }} <div className="ml10 lh28 listjihetixingstit cretitlecolrlist programquill" style={{ wordBreak: "break-word" }}
=======
<div className="tites lh28 listjihetixingstit markdown-body cretitlecolrlist " style={{wordBreak: "break-word",
minWidth:"32px",fontWeight:"bold"}}
>
({objectsingle.score}分)
</div>
<div className="ml10 lh28 listjihetixingstit bodyysls cretitlecolrlist programquill" style={{wordBreak: "break-word",fontWeight:"bold"}}
>>>>>>> c6b13f1... 调整
> >
{ {
itemssname===null || itemssname===undefined? itemssname===null || itemssname===undefined?
"" ""
: :
<QuillForEditor <QuillForEditor
options={options}
readOnly={true} readOnly={true}
value={itemssname} value={itemssname}
/> />

Write Preview
Loading…
Cancel
Save