feat:培训计划学习进度接口联调

7b88a534 · yuananting · 5ca73a22 · 7b88a534 · 7b88a534 · 7b88a534
Commit 7b88a534 authored Jul 06, 2021 by yuananting
4 changed files
--- a/src/data-source/plan/request-apis.ts
+++ b/src/data-source/plan/request-apis.ts
 /*
 * @Author: zhangleyuan
 * @Date: 2021-02-21 16:08:38
- * @LastEditors: zhangleyuan
+ * @LastEditors: yuananting
- * @LastEditTime: 2021-03-09 12:54:31
+ * @LastEditTime: 2021-07-06 11:26:27
 * @Description: 描述一下
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
-import Service from "@/common/js/service";
+import Service from '@/common/js/service';
 export function getTrainingPlanPage(params: object) {
-  return Service.Hades("public/hades/getTrainingPlanPage", params);
+  return Service.Hades('public/hades/getTrainingPlanPage', params);
 }
 export function createTrainingPlan(params: object) {
-  return Service.Hades("public/hades/createTrainingPlan", params);
+  return Service.Hades('public/hades/createTrainingPlan', params);
 }
 export function updateStateTrainingPlan(params: object) {
-  return Service.Hades("public/hades/updateStateTrainingPlan", params);
+  return Service.Hades('public/hades/updateStateTrainingPlan', params);
 }
 export function getTrainingPlanDetail(params: object) {
-  return Service.Hades("public/hades/getTrainingPlanDetail", params);
+  return Service.Hades('public/hades/getTrainingPlanDetail', params);
 }
 export function updateTrainingPlan(params: object) {
-  return Service.Hades("public/hades/updateTrainingPlan", params);
+  return Service.Hades('public/hades/updateTrainingPlan', params);
 }
 export function deleteTrainingPlan(params: object) {
-  return Service.Hades("public/hades/deleteTrainingPlan", params);
+  return Service.Hades('public/hades/deleteTrainingPlan', params);
 }
 export function getPlanUserRecordPage(params: object) {
-  return Service.Hades("public/hades/getPlanUserRecordPage", params);
+  return Service.Hades('public/hades/getPlanUserRecordPage', params);
 }
 export function getPlanCustomerRecordPage(params: object) {
-  return Service.Hades("public/hades/getPlanCustomerRecordPage", params);
+  return Service.Hades('public/hades/getPlanCustomerRecordPage', params);
 }
 export function getPlanCustomerDetail(params: object) {
-  return Service.Hades("public/hades/getPlanCustomerDetail", params);
+  return Service.Hades('public/customerHades/getPlanCustomerDetail', params);
 }
 export function getPlanCustomerAboutUser(params: object) {
-  return Service.Hades("public/hades/getPlanCustomerAboutUser", params);
+  return Service.Hades('public/hades/getPlanCustomerAboutUser', params);
 }
 export function removePlanCustomer(params: object) {
-  return Service.Hades("public/hades/removePlanCustomer", params);
+  return Service.Hades('public/hades/removePlanCustomer', params);
 }
 export function getStorePlanAll(params: object) {
-  return Service.Hades("public/hades/getStorePlanAll", params);
+  return Service.Hades('public/hades/getStorePlanAll', params);
 }
 export function getTrainingCourseAutoCancel(params: object) {
-  return Service.Hades("public/hades/getTrainingCourseAutoCancel", params);
+  return Service.Hades('public/hades/getTrainingCourseAutoCancel', params);
 }
--- a/src/modules/plan-manage/components/UserLearningDataFilter.jsx
+++ b/src/modules/plan-manage/components/UserLearningDataFilter.jsx
--- a/src/modules/plan-manage/modal/UserLearnDetailModal.jsx
+++ b/src/modules/plan-manage/modal/UserLearnDetailModal.jsx
@@ -2,7 +2,7 @@
 * @Author: yuananting
 * @Date: 2021-07-05 10:50:30
 * @LastEditors: yuananting
- * @LastEditTime: 2021-07-05 11:05:31
+ * @LastEditTime: 2021-07-06 13:53:12
 * @Description: 描述一下咯
 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
@@ -80,27 +80,6 @@ class UserLearnDetailModal extends React.Component {
        learnFinishPercentage,
        coverUrl: coverUrl || defaultCover,
      };
-      taskCustomerVOList.map((item) => {
-        let videoClass =
-          item.courseVOList &&
-          item.courseVOList.filter((childItem, childIndex) => {
-            return (childItem.courseType = 'VOICE');
-          });
-        videoClass.map((chapterItem, chapterIndex) => {
-          chapterItem.chapterList = [
-            {
-              chapterName: '第一节1',
-              percentage: '80%',
-            },
-            {
-              chapterName: '第一节2',
-              percentage: '10%',
-            },
-          ];
-          return chapterItem;
-        });
-        return item;
-      });
      this.setState({
        storeCustomerName,
        storeCustomerPhone,
@@ -207,14 +186,28 @@ class UserLearnDetailModal extends React.Component {
    const columns = [
      {
        title: '课节名称',
-        key: 'chapterName',
+        key: 'name',
-        dataIndex: 'chapterName',
+        dataIndex: 'name',
        width: '80%',
+        render: (val, record, index) => {
+          return (
+            <div className='chapter-record'>
+              <span>
+                {chapterIndex + 1}.{index + 1}&nbsp;
+              </span>
+              <img className='chapter-img' src='https://image.xiaomaiketang.com/xm/TKwbQGYDBR.png' />
+              <span>{record.name}</span>
+            </div>
+          );
+        },
      },
      {
        title: '学习进度',
-        key: 'percentage',
+        key: 'watchProgress',
-        dataIndex: 'percentage',
+        dataIndex: 'watchProgress',
+        render: (val, record) => {
+          return <span>{val}%</span>;
+        },
      },
    ];
    return columns;
@@ -252,41 +245,37 @@ class UserLearnDetailModal extends React.Component {
            dataSource={taskDataSource}
            columns={this.parseTaskColumns()}
            pagination={false}
-            expandedRowRender={(record, index) => {
+            expandable={{
-              if (!record.courseVOList) {
+              expandedRowRender: (record, index) => {
-                return;
-              }
-              if (record.courseVOList.length !== 0) {
                return (
                  <div>
                    <Table
                      showHeader={false}
-                      pagination={false}
+                      className='child-table'
+                      rowKey={(record) => record.courseId}
                      dataSource={record.courseVOList}
                      columns={this.parseCourseColumns(index)}
-                      className='child-table'
+                      pagination={false}
-                      expandedRowRender={(chapterRecord, chapterIndex) => {
+                      expandable={{
-                        if (!chapterRecord.chapterList) {
+                        expandedRowRender: (chapterRecord, chapterIndex) => {
-                          return;
-                        }
-                        if (chapterRecord.chapterList.length !== 0) {
                          return (
                            <div>
                              <Table
                                showHeader={false}
-                                pagination={false}
+                                dataSource={chapterRecord.courseChapterList}
-                                dataSource={chapterRecord.chapterList}
                                columns={this.parseChapterColumns(chapterIndex)}
-                                className='chapter-table'
+                                pagination={false}
                              />
                            </div>
                          );
-                        }
+                        },
+                        rowExpandable: (record) => record.courseChapterList && record.courseChapterList.length !== 0,
                      }}
                    />
                  </div>
                );
-              }
+              },
+              rowExpandable: (record) => record.courseVOList && record.courseVOList.length !== 0,
            }}
            rowClassName={(record, index) => {
              if (index % 2 === 0) {

--- a/src/modules/plan-manage/modal/UserLearnDetailModal.less
+++ b/src/modules/plan-manage/modal/UserLearnDetailModal.less
@@ -57,6 +57,15 @@
        }
      }
    }
+    .chapter-record {
+      display: flex;
+      align-items: center;
+      .chapter-img {
+        width: 18px;
+        height: 18px;
+        margin: 0 10px;
+      }
+    }
    .record-name {
      display: flex;
      .img-con {