Merge branch 'feature/yuananting/20210801/task-center' into dev

src/modules/task-center/data-center/components/WholeData.jsx

@@ -2,7 +2,7 @@
  * @Author: yuananting
  * @Author: yuananting
  * @Date: 2021-08-05 11:26:25
  * @Date: 2021-08-05 11:26:25
  * @LastEditors: yuananting
  * @LastEditors: yuananting
- * @LastEditTime: 2021-08-13 19:17:49
+ * @LastEditTime: 2021-08-18 18:27:06
  * @Description: 个人学习详情-全部tab页
  * @Description: 个人学习详情-全部tab页
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
@@ -45,7 +45,7 @@ function WholeData(props) {
           {SortConvert[index]}、{item.stageName}
           {SortConvert[index]}、{item.stageName}
         </span>
         </span>
         <span className='extra-info'>
         <span className='extra-info'>
-          （{item.learnFinishNum}/{item.learnAllNum}）
+          （{item.learnFinishNum || 0}/{item.learnAllNum || item.contentVOList.length}）
         </span>
         </span>
       </div>
       </div>
     );
     );
@@ -78,10 +78,10 @@ function WholeData(props) {
                 '0%': '#38B7F3',
                 '0%': '#38B7F3',
                 '100%': '#1A80E2',
                 '100%': '#1A80E2',
               }}
               }}
-              percent={learnFinishPercentage}
+              percent={learnFinishPercentage || 0}
             />
             />
           )}
           )}
-          <span className='text'>{learnFinishPercentage === 100 ? '已完成' : `${learnFinishPercentage}%`}</span>
+          <span className='text'>{learnFinishPercentage === 100 ? '已完成' : `${learnFinishPercentage || 0}%`}</span>
         </div>
         </div>
       </div>
       </div>
     );
     );