diff --git a/public/react/src/modules/courses/busyWork/CommonWorkAppraiseReviseAttachments.js b/public/react/src/modules/courses/busyWork/CommonWorkAppraiseReviseAttachments.js
index 31fd4b9e6..7305591df 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkAppraiseReviseAttachments.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkAppraiseReviseAttachments.js
@@ -14,9 +14,9 @@ function CommonWorkAppraiseReviseAttachments(props) {
}
`}</style>
<div className={"color-grey-6 mb10 font-16"}>
- 补交附件
+ 补交内容
</div>
-
+
{/* {age} */}
<div className={"ml20"}>
@@ -47,6 +47,6 @@ function CommonWorkAppraiseReviseAttachments(props) {
</div>}
</React.Fragment>
)
-
+
}
export default CommonWorkAppraiseReviseAttachments;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index ec59c46e3..070ceeed2 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -295,10 +295,10 @@ class Studentshavecompletedthelist extends Component {
)
},
{
- title:<span>最终成绩<Tooltip placement="top" visible={true} title={<pre>
+ title:<span>最终成绩<Tooltip placement="top" title={<pre>
鼠标停留具体分值上可查<br/>
看得分明细<br/>
- </pre>}></Tooltip></span>,
+ </pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
@@ -340,6 +340,22 @@ class Studentshavecompletedthelist extends Component {
}}>{record.efficiencyscore}</span>
</Tooltip>
:
+ <Tooltip placement="right" title={<div>
+
+ <div>{record.objective_score===undefined?"":record.objective_score === "--" ? <span>客观题得分：0分</span> :
+ <span>客观题得分：{record.objective_score}分</span>}
+ </div>
+
+ <div>{record.subjective_score===undefined?"":record.subjective_score === "--" ? <span>主观题得分：0分</span> :
+ <span>主观题得分：{record.subjective_score}分</span>}
+ </div>
+
+ <div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
+ <span>最终成绩：{record.efficiencyscore}分</span>}
+ </div>
+ </div>
+
+ }>
<span style={parseInt(record.efficiencyscore) > 90 ? {
color: '#DD1717',
textAlign: "center"
@@ -353,6 +369,7 @@ class Studentshavecompletedthelist extends Component {
color: '#747A7F',
textAlign: "center"
}}>{record.efficiencyscore}</span>
+ </Tooltip>
}
</span>
)
@@ -590,10 +607,10 @@ class Studentshavecompletedthelist extends Component {
)
},
{
- title:<span>最终成绩<Tooltip placement="top" visible={true} title={<pre>
+ title:<span>最终成绩<Tooltip placement="top" title={<pre>
鼠标停留具体分值上可查<br/>
看得分明细<br/>
- </pre>}></Tooltip></span>,
+ </pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
@@ -637,6 +654,22 @@ class Studentshavecompletedthelist extends Component {
}}>{record.efficiencyscore}</span>
</Tooltip>
:
+ <Tooltip placement="right" title={<div>
+
+ <div>{record.objective_score===undefined?"":record.objective_score === "--" ? <span>客观题得分：0分</span> :
+ <span>客观题得分：{record.objective_score}分</span>}
+ </div>
+
+ <div>{record.subjective_score===undefined?"":record.subjective_score === "--" ? <span>主观题得分：0分</span> :
+ <span>主观题得分：{record.subjective_score}分</span>}
+ </div>
+
+ <div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
+ <span>最终成绩：{record.efficiencyscore}分</span>}
+ </div>
+ </div>
+
+ }>
<span style={parseInt(record.efficiencyscore) > 90 ? {
color: '#DD1717',
textAlign: "center",
@@ -654,6 +687,7 @@ class Studentshavecompletedthelist extends Component {
textAlign: "center",
width:"199px"
}}>{record.efficiencyscore}</span>
+ </Tooltip>
}
</span>
@@ -877,10 +911,10 @@ class Studentshavecompletedthelist extends Component {
)
},
{
- title: <span>最终成绩<Tooltip placement="top" visible={true} title={<pre>
+ title: <span>最终成绩<Tooltip placement="top" title={<pre>
鼠标停留具体分值上可查<br/>
看得分明细<br/>
- </pre>}></Tooltip></span>,
+ </pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
@@ -918,6 +952,22 @@ class Studentshavecompletedthelist extends Component {
}}>{record.efficiencyscore}</span>
</Tooltip>
:
+ <Tooltip placement="right" title={<div>
+
+ <div>{record.objective_score===undefined?"":record.objective_score === "--" ? <span>客观题得分：0分</span> :
+ <span>客观题得分：{record.objective_score}分</span>}
+ </div>
+
+ <div>{record.subjective_score===undefined?"":record.subjective_score === "--" ? <span>主观题得分：0分</span> :
+ <span>主观题得分：{record.subjective_score}分</span>}
+ </div>
+
+ <div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
+ <span>最终成绩：{record.efficiencyscore}分</span>}
+ </div>
+ </div>
+
+ }>
<span style={parseInt(record.efficiencyscore) > 90 ? {
color: '#DD1717',
textAlign: "center",
@@ -931,6 +981,7 @@ class Studentshavecompletedthelist extends Component {
color: '#747A7F',
textAlign: "center",
}}>{record.efficiencyscore}</span>
+ </Tooltip>
}
</span>
)
@@ -1104,10 +1155,10 @@ class Studentshavecompletedthelist extends Component {
)
},
{
- title: <span>最终成绩<Tooltip placement="top" visible={true} title={<pre>
+ title: <span>最终成绩<Tooltip placement="top" title={<pre>
鼠标停留具体分值上可查<br/>
看得分明细<br/>
- </pre>}></Tooltip></span>,
+ </pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
@@ -1144,6 +1195,22 @@ class Studentshavecompletedthelist extends Component {
}}>{record.efficiencyscore}</span>
</Tooltip>
:
+ <Tooltip placement="right" title={<div>
+
+ <div>{record.objective_score===undefined?"":record.objective_score === "--" ? <span>客观题得分：0分</span> :
+ <span>客观题得分：{record.objective_score}分</span>}
+ </div>
+
+ <div>{record.subjective_score===undefined?"":record.subjective_score === "--" ? <span>主观题得分：0分</span> :
+ <span>主观题得分：{record.subjective_score}分</span>}
+ </div>
+
+ <div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
+ <span>最终成绩：{record.efficiencyscore}分</span>}
+ </div>
+ </div>
+
+ }>
<span style={parseInt(record.efficiencyscore) > 90 ? {
color: '#DD1717',
textAlign: "center",
@@ -1157,6 +1224,7 @@ class Studentshavecompletedthelist extends Component {
color: '#747A7F',
textAlign: "center",
}}>{record.efficiencyscore}</span>
+ </Tooltip>
}
</span>
)
@@ -1511,6 +1579,8 @@ class Studentshavecompletedthelist extends Component {
completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
+ objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
+ subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
operating: "评阅",
commit_method:exercise_users[i].commit_method,
})
@@ -1527,6 +1597,8 @@ class Studentshavecompletedthelist extends Component {
completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
+ objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
+ subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
operating: "--",
commit_method:exercise_users[i].commit_method
})
@@ -1552,6 +1624,8 @@ class Studentshavecompletedthelist extends Component {
submitstate: current_answer_user.commit_status === 1 ? "已提交" : "未提交",
updatetime: moment(current_answer_user.end_at).format('YYYY-MM-DD HH:mm') === "Invalid date" ? "--" : moment(current_answer_user.end_at).format('YYYY-MM-DD HH:mm'),
efficiencyscore: current_answer_user.score === undefined ? "--" : current_answer_user.score === null ? "--" : current_answer_user.score === "" ? "--" : current_answer_user.score,
+ objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
+ subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
review_status: current_answer_user.review_status,
completion: current_answer_user.objective_score === undefined ? "--" : current_answer_user.objective_score === null ? "--" : current_answer_user.objective_score === "" ? "--" : current_answer_user.objective_score,
levelscore: current_answer_user.subjective_score === undefined ? "--" : current_answer_user.subjective_score === null ? "--" : current_answer_user.subjective_score === "" ? "--" : current_answer_user.subjective_score,
@@ -1594,6 +1668,8 @@ class Studentshavecompletedthelist extends Component {
completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
+ objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
+ subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
operating: "查看",
commit_method:exercise_users[i].commit_method,
})
@@ -1739,6 +1815,8 @@ class Studentshavecompletedthelist extends Component {
completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
efficiencyscore: exercise_users[i].score === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
+ objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
+ subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
finalscore: "评阅",
user_id: exercise_users[i].user_id,
commit_method:exercise_users[i].commit_method
@@ -1756,6 +1834,8 @@ class Studentshavecompletedthelist extends Component {
completion: exercise_users[i].objective_score === undefined ? "--" : exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
efficiencyscore: exercise_users[i].score === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
+ objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
+ subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
finalscore: "--",
user_id: exercise_users[i].user_id,
commit_method:exercise_users[i].commit_method
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 3bd67f6c6..cd8061906 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -1204,10 +1204,10 @@ class Listofworksstudentone extends Component {
)
},
{
- title: <span>当前成绩<Tooltip placement="top" visible={true} title={<pre>
+ title: <span>当前成绩<Tooltip placement="top"title={<pre>
鼠标停留具体分值上可查<br/>
看得分明细<br/>
- </pre>}></Tooltip></span>,
+ </pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'work_score',
key: 'work_score',
align: 'center',
@@ -1572,10 +1572,10 @@ class Listofworksstudentone extends Component {
)
},
{
- title: <span>当前成绩<Tooltip placement="top" visible={true} title={<pre>
+ title: <span>当前成绩<Tooltip placement="top" title={<pre>
鼠标停留具体分值上可查<br/>
看得分明细<br/>
- </pre>}></Tooltip></span>,
+ </pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'work_score',
key: 'work_score',
align: 'center',
diff --git a/public/react/src/modules/user/account/AccountImg.js b/public/react/src/modules/user/account/AccountImg.js
index 3202c2bf7..bc95e4259 100644
--- a/public/react/src/modules/user/account/AccountImg.js
+++ b/public/react/src/modules/user/account/AccountImg.js
@@ -13,6 +13,7 @@ class AccountImg extends Component {
<ChangeHeaderPicModal
{...this.props} ref="picModal" imageSrc={picUrl} userLogin={this.props.current_user ? this.props.current_user.login : '' }></ChangeHeaderPicModal>
<style>{`
+
/*
.headphoto {
text-align: center;
@@ -26,11 +27,13 @@ class AccountImg extends Component {
margin-top: 19px;
box-sizing: border-box;
}
+
.headphoto img {
width: 109px;
border-radius: 50%;
height: 109px;
}
+
.headphoto-black {
display: none;
cursor: pointer;
@@ -45,9 +48,11 @@ class AccountImg extends Component {
background-color: rgba(0,0,0,0.3);
color: #fff;
} */
+
.headphoto:hover .headphoto-black {
display: block;
}
+
.newheadphotoblack{
position: absolute;
top: 49px;
@@ -59,9 +64,17 @@ class AccountImg extends Component {
line-height:23px;
background: rgba(76,172,255,0.7);
}
+
+ .borderradiusbox{
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ border-bottom-left-radius: 4px;
+ }
+
`}</style>
- <img alt="头像" id="user_avatar_show" nhname="avatar_image" src={`${picUrl}`}></img>
- <p className="newheadphotoblack" onClick={this.editImg} >修改头像</p>
+ <img alt="头像" id="user_avatar_show" nhname="avatar_image" className={"xiaoshou"} src={`${picUrl}`} onClick={this.editImg} ></img>
+ <div className="newheadphotoblack xiaoshou borderradiusbox" onClick={this.editImg} >修改头像</div>
</div>
);
}