feat:知识库改改改

src/common/less/icon-font.less

 @font-face {
   font-family: 'iconfont';  /* project id 2223403 */
-  src: url('//at.alicdn.com/t/font_2223403_3mmvxuy22i4.eot');
-  src: url('//at.alicdn.com/t/font_2223403_3mmvxuy22i4.eot?#iefix') format('embedded-opentype'),
-  url('//at.alicdn.com/t/font_2223403_3mmvxuy22i4.woff2') format('woff2'),
-  url('//at.alicdn.com/t/font_2223403_3mmvxuy22i4.woff') format('woff'),
-  url('//at.alicdn.com/t/font_2223403_3mmvxuy22i4.ttf') format('truetype'),
-  url('//at.alicdn.com/t/font_2223403_3mmvxuy22i4.svg#iconfont') format('svg');
+  src: url('//at.alicdn.com/t/font_2223403_7mf3fh1rzmo.eot');
+  src: url('//at.alicdn.com/t/font_2223403_7mf3fh1rzmo.eot?#iefix') format('embedded-opentype'),
+  url('//at.alicdn.com/t/font_2223403_7mf3fh1rzmo.woff2') format('woff2'),
+  url('//at.alicdn.com/t/font_2223403_7mf3fh1rzmo.woff') format('woff'),
+  url('//at.alicdn.com/t/font_2223403_7mf3fh1rzmo.ttf') format('truetype'),
+  url('//at.alicdn.com/t/font_2223403_7mf3fh1rzmo.svg#iconfont') format('svg');
 }
 .iconfont{
   font-family:"iconfont" !important;

src/data-source/knowledge/request-api.ts

@@ -3,7 +3,7 @@
  * @Author: zangsuyun
  * @Date: 2021-03-19 18:09:35
  * @LastEditors: zangsuyun
- * @LastEditTime: 2021-03-25 13:42:33
+ * @LastEditTime: 2021-03-27 15:42:54
  * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
  */
 import Service from "@/common/js/service";
@@ -65,6 +65,12 @@ class KnowledgeAPI {
   queryPageKnowledgeInclude = (params: object) => {
     return Service.Hades("anon/customerHades/queryPageKnowledgeInclude", params);
   }
+  // 分页云盘资料查看记录
+  queryPageKnowledgeFolderWatchInfo = (params: object) => {
+    return Service.Hades("public/hades/queryPageKnowledgeFolderWatchInfo", params);
+  }
+  
+
 
 }
 

src/modules/knowledge-base/ENUM.js

@@ -3,7 +3,7 @@
  * @Author: zangsuyun
  * @Date: 2021-03-22 18:24:53
  * @LastEditors: zangsuyun
- * @LastEditTime: 2021-03-24 10:10:45
+ * @LastEditTime: 2021-03-27 11:54:42
  * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
  */
 
@@ -35,7 +35,7 @@ const ENUM = {
     LIVE: "直播课",
     VOICE: "视频课",
     PICTURE: "图文课",
-    FOLDER: "图文资料",
+    FOLDER: "学习资料",
   },
 };
 

src/modules/knowledge-base/components/Classification.jsx

@@ -3,7 +3,7 @@
  * @Author: zangsuyun
  * @Date: 2021-03-19 18:05:23
  * @LastEditors: zangsuyun
- * @LastEditTime: 2021-03-26 11:30:26
+ * @LastEditTime: 2021-03-29 10:01:15
  * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
  */
 
@@ -195,7 +195,7 @@ class Classification extends Component {
           <Button
             onClick={() => {
               window.RCHistory.push({
-                pathname: "/course-catalog",
+                pathname: "/question-category-manage?from=knowledge",
               });
             }}
           >

src/modules/knowledge-base/components/PlayBackData.jsx

@@ -4,7 +4,7 @@ import { Table,  Button, Modal, message } from 'antd';
 import dealTimeDuration from "../../course-manage/utils/dealTimeDuration";
 import { PageControl } from "@/components";
 // import './DataList.less';
-import CourseService from "@/domains/course-domain/CourseService";
+import KnowledgeAPL from "@/data-source/knowledge/request-api";
 import User from '@/common/js/user';
 
 const liveTypeMap = {
@@ -23,7 +23,7 @@ class PlaybackData extends React.Component {
       current: 1,
       size: 10,
       total: 0,
-      liveCourseId: courseId,
+      id: courseId,
       storeId: User.getStoreId()
     }
   }
@@ -33,14 +33,14 @@ class PlaybackData extends React.Component {
   }
 
   fetchPlaybackList = (page = 1) => {
-    const { size, liveCourseId } = this.state
+    const { size, id } = this.state
     const params = {
-      liveCourseId,
+      id,
       current: page,
       size
     }
 
-    CourseService.fetchPlaybackList(params).then((res) => {
+    KnowledgeAPL.queryPageKnowledgeReplayRecordPage(params).then((res) => {
       if (res.result) {
         const { records = [], current, size, total } = res.result;
         this.setState({

src/modules/knowledge-base/components/WatchDataModal.jsx

@@ -3,7 +3,7 @@
  * @Author: zangsuyun
  * @Date: 2021-03-16 10:18:31
  * @LastEditors: zangsuyun
- * @LastEditTime: 2021-03-25 10:57:14
+ * @LastEditTime: 2021-03-27 15:50:18
  * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
  */
 
@@ -45,14 +45,26 @@ class WatchDataModal extends React.Component {
       id,
       storeId: User.getStoreId(),
     };
-    KnowledgeAPI.queryPageKnowledgeMediaCourseWatchInfo(params).then((res) => {
-      const { result = {} } = res;
-      const { records = [], total = 0 } = result;
-      this.setState({
-        dataSource: records,
-        totalCount: Number(total),
-      });
-    });
+    const { type } = this.props;
+    type === "FOLDER"
+      ? KnowledgeAPI.queryPageKnowledgeFolderWatchInfo(params).then((res) => {
+          const { result = {} } = res;
+          const { records = [], total = 0 } = result;
+          this.setState({
+            dataSource: records,
+            totalCount: Number(total),
+          });
+        })
+      : KnowledgeAPI.queryPageKnowledgeMediaCourseWatchInfo(params).then(
+          (res) => {
+            const { result = {} } = res;
+            const { records = [], total = 0 } = result;
+            this.setState({
+              dataSource: records,
+              totalCount: Number(total),
+            });
+          }
+        );
   };
 
   handleChangNickname = (value) => {
@@ -88,7 +100,6 @@ class WatchDataModal extends React.Component {
   // 请求表头
   parseColumns = () => {
     const { type } = this.props;
-    console.log(type);
     const columns = [
       {
         title: "观看用户",
@@ -114,7 +125,7 @@ class WatchDataModal extends React.Component {
         },
       },
     ];
-    if (type === "VOICE" || type === 'PICTURE') {
+    if (type === "VOICE" || type === "PICTURE") {
       columns.push({
         title: "观看时长",
         key: "watchDuration",
@@ -124,13 +135,13 @@ class WatchDataModal extends React.Component {
         },
       });
     }
-    if(type === 'PICTURE'){
+    if (type === "PICTURE") {
       columns.push({
         title: "学习进度",
-        key: "watchDuration",
-        dataIndex: "watchDuration",
+        key: "progress",
+        dataIndex: "progress",
         render: (val) => {
-          return <span>{val}</span>;
+          return val === 100 ? "已完成" : <span>{val + "%"}</span>;
         },
       });
     }

src/modules/teach-tool/QuestionCategoryManage.jsx

 /*
  * @Author: yuananting
  * @Date: 2021-02-23 18:28:50
- * @LastEditors: yuananting
- * @LastEditTime: 2021-03-24 17:18:20
+ * @LastEditors: zangsuyun
+ * @LastEditTime: 2021-03-29 10:10:49
  * @Description: 助学工具-题库-主页面分类管理
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
@@ -582,13 +582,11 @@ class QuestionCategoryManage extends Component {
     } = this.state;
     return (
       <div className="page question-category-manage">
-        {getParameterByName("from") === "aid" ? (
+        {getParameterByName("from") ? (
           <Breadcrumbs
             navList="课程分类"
             goBack={() =>
-              window.RCHistory.push({
-                pathname: "/question-bank-index",
-              })
+              window.history.back(-1)
             }
           />
         ) : (

src/routes/config/mainRoutes.tsx

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Date: 2020-04-29 10:26:32
  * @LastEditors: zangsuyun
- * @LastEditTime: 2021-03-27 10:23:26
+ * @LastEditTime: 2021-03-29 09:57:08
  * @Description: 内容线路由配置
  */
 import Home from "@/modules/home/Home";
@@ -56,11 +56,11 @@ const mainRoutes = [
     component: StoreDecorationPage,
     name: "店铺装修",
   },
-  {
-    path: "/course-catalog",
-    component: CourseCatalogPage,
-    name: "课程分类",
-  },
+  // {
+  //   path: "/course-catalog",
+  //   component: CourseCatalogPage,
+  //   name: "课程分类",
+  // },
   {
     path: "/live-course",
     component: LiveCoursePage,

src/routes/config/menuList.tsx

@@ -2,7 +2,7 @@
  * @Author: yuananting
  * @Date: 2021-02-21 15:53:31
  * @LastEditors: zangsuyun
- * @LastEditTime: 2021-03-27 10:23:09
+ * @LastEditTime: 2021-03-27 10:32:29
  * @Description: 描述一下咯
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
@@ -37,8 +37,8 @@ export const menuList: any = [
   },
   {
     groupName: "知识库",
-    groupCode: "CloudDisk",
-    icon: '',
+    groupCode: "CloudKnowledge",
+    icon: '',
     link: '/knowledge-base'
   },
   {