调整

public/react/src/modules/tpm/component/TPMRightSection.js

@@ -8,7 +8,7 @@ import {getImageUrl,} from "educoder";
 
 import './TPMright.css';
 
-import {Icon, Tooltip} from 'antd';
+import {Progress, Tooltip} from 'antd';
 
 // import "antd/dist/antd.css";
 
@@ -59,7 +59,7 @@ class TPMRightSection extends Component {
   render() {
     let {TPMRightSection, clickNewsubscripttype} = this.state;
     let {TPMRightSectionData} = this.props
-    console.log(this.props)
+    console.log(this.props.status)
     return (
       <div>
         {
@@ -93,6 +93,22 @@ class TPMRightSection extends Component {
                   </div>
                 </div>
               </div>
+
+              <div className="edu-back-white padd252020px relative">
+                <div className="font-16 mb5">
+                  <span><i className={"iconfont icon-biaoqian2 audit_situationactive font-14"}></i>  技能标签</span>
+                  <span className={"sortinxdirection space-between fr"}>
+												<span className="color888hezuo font-12">已完成 {TPMRightSectionData&&TPMRightSectionData.complete_count} 个 / 共 {TPMRightSectionData&&TPMRightSectionData.challenge_count} 关</span>
+											</span>
+
+                </div>
+                {console.log(TPMRightSectionData&&TPMRightSectionData.complete_count)}
+                {console.log(TPMRightSectionData&&TPMRightSectionData.challenge_count)}
+                <Progress percent={(parseInt(TPMRightSectionData&&TPMRightSectionData.complete_count) / parseInt(TPMRightSectionData&&TPMRightSectionData.challenge_count))/ 100.00} showInfo={false} status="active" strokeColor={{
+                  '0%': '#29BD8B',
+                  '100%': '#29BD8B',
+                }} />
+              </div>
               {
                 TPMRightSectionData === undefined ? "" : TPMRightSectionData.tags === undefined ? "" : TPMRightSectionData.tags.length === 0 ? "" :
                   <div className="edu-back-white padd252020px mb10 relative">
@@ -123,7 +139,7 @@ class TPMRightSection extends Component {
                       <span className="mr8">
                         <div>
                            <p className={"font-12"}>展开全部</p>
-                           <p className={"font-12"}><i className={"iconfont icon-jiantou9"}></i></p>
+                           <p className={"font-12"}><i className={"iconfont icon-jiantou9 font-12"}></i></p>
                         </div>
                       </span>
                     </div>
@@ -133,7 +149,7 @@ class TPMRightSection extends Component {
                       onClick={() => this.clickNewsubscript(1)}>
                       <span className="mr8">
                         <div>
-                           <p className={"font-12"}><i className={"iconfont icon-changyongtubiao-xianxingdaochu-zhuanqu-"}></i></p>
+                           <p className={"font-12"}><i className={"iconfont icon-changyongtubiao-xianxingdaochu-zhuanqu- font-12"}></i></p>
                            <p className={"font-12"}>收起全部</p>
                         </div>
                       </span>
@@ -148,7 +164,7 @@ class TPMRightSection extends Component {
               <div className="padding20 edu-back-white mb10 mt10" style={{
                 display: TPMRightSectionData === undefined ? "none" : TPMRightSectionData.paths === undefined ? "" : TPMRightSectionData.paths.length === 0 ? "none" : "block"
               }}>
-                <p className="mb20 font-16 clearfix">所属课程</p>
+                <p className="mb20 font-16 clearfix"><i className={"iconfont icon-shu1 audit_situationactive font-14"}></i>  所属课程</p>
                 <div className="recommend-list">
                   {
                     TPMRightSectionData === undefined ? "" : TPMRightSectionData.paths === undefined ? "" : TPMRightSectionData.paths.map((i, k) => {
@@ -198,7 +214,7 @@ class TPMRightSection extends Component {
                                                                                  TPMRightSectionData === undefined ? "none" : TPMRightSectionData.recommands === undefined ? "none" : TPMRightSectionData.recommands.length === 0 ? "none" : "block"
                                                                              }}
                 >
-                  <p className="mb20 font-16 clearfix">推荐实训</p>
+                  <p className="mb20 font-16 clearfix"><i className={"iconfont icon-tuijian audit_situationactive font-14"}></i>  推荐实训</p>
                   <div className="recommend-list">
                     {
                       TPMRightSectionData === undefined ? "" : TPMRightSectionData.recommands === undefined ? "" : TPMRightSectionData.recommands.map((item, key) => {