Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js

@@ -295,7 +295,10 @@ class Studentshavecompletedthelist extends Component {
 					)
 				},
 				{
-					title: '最终成绩',
+					title:<span>最终成绩<Tooltip placement="top" visible={true} title={<pre>
+						 鼠标停留具体分值上可查<br/>
+             看得分明细<br/>
+					</pre>}></Tooltip></span>,
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',
@@ -587,7 +590,10 @@ class Studentshavecompletedthelist extends Component {
 					)
 				},
 				{
-					title: '最终成绩',
+					title:<span>最终成绩<Tooltip placement="top" visible={true} title={<pre>
+						 鼠标停留具体分值上可查<br/>
+             看得分明细<br/>
+					</pre>}></Tooltip></span>,
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',
@@ -871,7 +877,10 @@ class Studentshavecompletedthelist extends Component {
 					)
 				},
 				{
-					title: '最终成绩',
+					title: <span>最终成绩<Tooltip placement="top" visible={true} title={<pre>
+						 鼠标停留具体分值上可查<br/>
+             看得分明细<br/>
+					</pre>}></Tooltip></span>,
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',
@@ -1095,7 +1104,10 @@ class Studentshavecompletedthelist extends Component {
 					)
 				},
 				{
-					title: '最终成绩',
+					title: <span>最终成绩<Tooltip placement="top" visible={true} title={<pre>
+						 鼠标停留具体分值上可查<br/>
+             看得分明细<br/>
+					</pre>}></Tooltip></span>,
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -461,7 +461,7 @@ class Listofworksstudentone extends Component {
 					)
 				},
 				{
-					title: '当前成绩',
+					title:'当前成绩',
 					dataIndex: 'work_score',
 					key: 'work_score',
 					align: "center",
@@ -856,7 +856,7 @@ class Listofworksstudentone extends Component {
 					)
 				},
 				{
-					title: '当前成绩',
+					title:'当前成绩',
 					dataIndex: 'work_score',
 					key: 'work_score',
 					align: "center",
@@ -1204,7 +1204,10 @@ class Listofworksstudentone extends Component {
 					)
 				},
 				{
-					title: '当前成绩',
+					title: <span>当前成绩<Tooltip placement="top" visible={true} title={<pre>
+						 鼠标停留具体分值上可查<br/>
+             看得分明细<br/>
+					</pre>}></Tooltip></span>,
 					dataIndex: 'work_score',
 					key: 'work_score',
 					align: 'center',
@@ -1569,7 +1572,10 @@ class Listofworksstudentone extends Component {
 					)
 				},
 				{
-					title: '当前成绩',
+					title: <span>当前成绩<Tooltip placement="top" visible={true} title={<pre>
+						 鼠标停留具体分值上可查<br/>
+             看得分明细<br/>
+					</pre>}></Tooltip></span>,
 					dataIndex: 'work_score',
 					key: 'work_score',
 					align: 'center',

public/react/src/modules/user/account/AccountImg.js

@@ -10,7 +10,7 @@ class AccountImg extends Component {
       const picUrl = getImageUrl("images/"+this.props.src)
       return (
         <div className="headphoto mt14">
-          <ChangeHeaderPicModal 
+          <ChangeHeaderPicModal
             {...this.props} ref="picModal" imageSrc={picUrl} userLogin={this.props.current_user ? this.props.current_user.login : '' }></ChangeHeaderPicModal>
           <style>{`
             /*
@@ -48,9 +48,20 @@ class AccountImg extends Component {
             .headphoto:hover .headphoto-black {
               display: block;
             }
+             .newheadphotoblack{       
+                position: absolute;
+                top: 49px;
+                left: 4px;
+                text-align: center;
+                color: #fff;
+                width: 107px;
+                height: 23px;
+                line-height:23px;
+                background: rgba(76,172,255,0.7);
+            } 
           `}</style>
           <img alt="头像" id="user_avatar_show" nhname="avatar_image" src={`${picUrl}`}></img>
-          <p className="headphoto-black" onClick={this.editImg} >修改头像</p>
+          <p className="newheadphotoblack" onClick={this.editImg} >修改头像</p>
         </div>
       );
     }