git cherry-pick 1432afebfd

src/forge/users/Statistics/Index.jsx

@@ -70,21 +70,19 @@ function Index(props) {
       if(result && result.data){
         setRadarData(result.data);
         let score = result.data.user && result.data.user.each_language_score;
-        if(score){
-          var sortData = [];
-          for (var item in score) {
-            sortData.push([item, score[item]])
-          }
-          sortData.sort(function(a, b) {
-            return b[1] - a[1];
-          });
-          setTopThree(sortData.slice(0,3));
+        var sortData = []
+        for (var item in score) {
+          sortData.push([item, score[item]])
         }
+        sortData.sort(function(a, b) {
+          return b[1] - a[1];
+        });
+        setTopThree(sortData.slice(0,3));
 
         let percent = result.data.user && result.data.user.languages_percent;
         let arr = [];
         Object.keys(percent).map((item,key)=>{
-          arr.push({name:item,p:parseFloat(percent[item]*100).toFixed(1),color:getColor()});
+          arr.push({name:item,p:percent[item]*100,color:getColor()});
         })
         setPercentData(arr);
       }
@@ -109,8 +107,8 @@ function Index(props) {
     const url = `/users/${username}/statistics/major.json`;
     Axios.get(url,{
       params:{
-        start_time:cData && cData[0],
-        end_time:cData && cData[1]
+        start_time:rDates && rDates[0],
+        end_time:rDates && rDates[1]
       }
     }).then(result=>{
       if(result && result.data){
@@ -122,7 +120,7 @@ function Index(props) {
   return(
     <div>
       <div className="boxes">
-        <FlexAJ style={{marginBottom:"15px"}}>
+        <FlexAJ>
           <span className="font-18">开发能力</span>
           <RangePicker 
             disabledDate={disabledDate} 
@@ -130,47 +128,44 @@ function Index(props) {
             format={dateFormat}
           />
         </FlexAJ>
-        <div className="echartBox">
-          <p>从五个维度刻画你的开发能力：语言能力、影响力、贡献度、活跃度、项目经验，同时可以查看社区平均数据。</p>
-          <Radar data={radarData}/>
-          {
-            topThree && topThree.length > 0 && 
-            <div className="roundBox">
-              <Round num={topThree[0][1]} color="#FF7F69" name={topThree[0][0]}/>
-              <Round num={topThree[1][1]} color="#99dfff" name={topThree[1][0]}/>
-              <Round num={topThree[2][1]} color="#ff9e48" name={topThree[2][0]}/>
+        <Radar data={radarData}/>
+        {
+          topThree &&
+          <div className="roundBox">
+            <Round num={topThree[0][1]} color="#FF7F69" name={topThree[0][0]}/>
+            <Round num={topThree[1][1]} color="#99dfff" name={topThree[1][0]}/>
+            <Round num={topThree[2][1]} color="#ff9e48" name={topThree[2][0]}/>
+          </div>
+        }
+        {
+          percentData &&
+          <div className="pBox">
+            <div class="progress">
+              {
+                percentData.map((i,k)=>{
+                  return(
+                    <span style={{width: `${i.p}%`, backgroundColor:`${i.color}`}}></span>
+                  )
+                })
+              }
             </div>
-          }
-          {
-            percentData &&
-            <div className="pBox">
-              <div class="progress">
-                {
-                  percentData.map((i,k)=>{
-                    return(
-                      <span style={{width: `${i.p}%`, backgroundColor:`${i.color}`}}></span>
-                    )
-                  })
-                }
-              </div>
-              <div className="progresstip">
-                {
-                  percentData.map((i,k)=>{
-                    return(
-                      <span>
-                        <i class="zero" style={{backgroundColor: `${i.color}`}}></i><span>{i.name}</span>
-                        <span>{`${i.p}%`}</span>
-                      </span>
-                    )
-                  })
-                }
-              </div>
+            <div className="progresstip">
+              {
+                percentData.map((i,k)=>{
+                  return(
+                    <span>
+                      <i class="zero" style={{backgroundColor: `${i.color}`}}></i><span>{i.name}</span>
+                      <span>{`${i.p}%`}</span>
+                    </span>
+                  )
+                })
+              }
             </div>
-          }
-        </div>
+          </div>
+        }
       </div>
       <div className="boxes">
-        <FlexAJ style={{marginBottom:"15px"}}>
+        <FlexAJ>
           <span className="font-18">角色定位</span>
           <RangePicker 
             disabledDate={disabledDate} 
@@ -178,13 +173,10 @@ function Index(props) {
             format={dateFormat}
           />
         </FlexAJ>
-        <div className="echartBox">
-          <p>根据你在项目开发过程中的工作，对你在项目中扮演的角色进行定位，包括：创建者、管理者、开发者、测试者、文档工作者等。</p>
-          <Pie data={pieData}/>
-        </div>
+        <Pie data={pieData}/>
       </div>
       <div className="boxes">
-        <FlexAJ style={{marginBottom:"15px"}}>
+        <FlexAJ>
           <span className="font-18">专业定位</span>
           <RangePicker 
             disabledDate={disabledDate} 
@@ -192,10 +184,7 @@ function Index(props) {
             format={dateFormat}
           />
         </FlexAJ>
-        <div className="echartBox">
-          <p>展示你擅长、关注、感兴趣的专业范围，通过你参与项目、收藏项目、关注项目、复刻项目等数据来统计。</p>
-          <Cloud data={cloudData}/>
-        </div>
+        <Cloud data={cloudData}/>
       </div>
     </div>
   )

src/forge/users/Statistics/Index.scss

@@ -1,5 +1,5 @@
 .boxes{
-  padding:15px 0px;
+  padding:20px 30px;
   .roundBox{
     margin:20px auto;
     display: flex;