feat:积攒多个任务提交

fanruan-edu-cas.code-workspace

@@ -0,0 +1,8 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	],
+	"settings": {}
+}

src/api/video.js

@@ -10,6 +10,24 @@ import request from "@/utils/request";
 
 import {requestGet} from "@/utils/newrequest";
 
+// 埋点每次进入和离开时间
+export function updateVideoCountLog(params) {
+  return request({
+    url: '/v1/edu/video/update/count/log/',
+    method: "post",
+    params
+  })
+}
+
+// 埋点完播统计
+export function updateVideoPlayEnd(params) {
+  return request({
+    url: '/v1/edu/video/update/play/end/',
+    method: "post",
+    params
+  })
+}
+
 // 渠道和设备埋点
 export function sourceDeviceLog(params) {
   return request({

src/components/Header.vue

@@ -61,7 +61,7 @@
           </template>
         </template>
 
-        <div class="app_qrcode_box">
+        <!-- <div class="app_qrcode_box">
           <el-dropdown trigger="hover">
             <div class="toptxt flex-1">
               <i class="el-dropdown-link iconfont icon-M-phone"></i>
@@ -84,7 +84,7 @@
               </el-dropdown-menu>
             </template>
           </el-dropdown>
-        </div>
+        </div> -->
 
 
         <div class="notice_box">
@@ -123,7 +123,7 @@
               </el-dropdown-item>
               <el-divider></el-divider>
               <el-dropdown>
-                <teacherApplyModal :uid="uid"/>
+                <teacherApplyModal :uid="uid" />
               </el-dropdown>
               <el-divider></el-divider>
               <el-dropdown-item v-for="(item, i) in avatarMenu.adminMenu" :key="i" :icon="item.icon">
@@ -139,7 +139,8 @@
           </template>
         </el-dropdown>
         <div v-else class="loginReg flex-1">
-          <a class="loginbtn" :href="com_id_url+'/cas/login?service='+com_edu_url+'/v1/user/cas/edu/login/?redirect='+$route.fullPath">登录</a>
+          <a class="loginbtn"
+            :href="com_id_url+'/cas/login?service='+com_edu_url+'/v1/user/cas/edu/login/?redirect='+$route.fullPath">登录</a>
         </div>
       </nav>
 
@@ -234,7 +235,7 @@
                 </el-dropdown-item>
                 <el-divider></el-divider>
                 <el-dropdown>
-                  <teacherApplyModal :uid="uid"/>
+                  <teacherApplyModal :uid="uid" />
                 </el-dropdown>
                 <el-divider></el-divider>
                 <el-dropdown-item v-for="(item, i) in avatarMenu.adminMenu" :key="i" :icon="item.icon">
@@ -253,8 +254,7 @@
           <div v-else class="loginReg flex-1">
             <a class="loginbtn" :href="com_id_url+'/login/signin/'+'?referrer='+wwwUrl"
               v-if="com_node_env==='dist'">登录</a>
-            <a class="loginbtn"
-              :href="com_id_url+'/signin/'+'?isfridapp=inapp&referrer='+wwwUrl" v-else>登录</a>
+            <a class="loginbtn" :href="com_id_url+'/signin/'+'?isfridapp=inapp&referrer='+wwwUrl" v-else>登录</a>
           </div>
 
         </div>
@@ -342,7 +342,7 @@
 
 </template>
 <script>
-  import { defineComponent, reactive, toRefs, ref,getCurrentInstance } from "vue";
+  import { defineComponent, reactive, toRefs, ref, getCurrentInstance } from "vue";
   import teacherApplyModal from '@/components/TeacherApply/TeacherApplyModal';
   import { getMenuList } from "@/api/nav";
   import { getNotice, avatarMenu } from "@/api/user";
@@ -377,9 +377,13 @@
 
       state.wwwUrl = window.location.href;
       onBeforeRouteUpdate((to) => {
-        state.wwwUrl = proxy.$root.com_edu_url+to.path;
+        state.wwwUrl = proxy.$root.com_edu_url + to.path;
       })
 
+      window.onresize = () => {
+        state.isPc = document.body.clientWidth > 1200;        
+      }
+
       const fetchMenuList = async () => {
         const res = await getMenuList();
         if (res.code === 1) {
@@ -771,7 +775,7 @@
   }
 
   .notice_box {
-    padding: 4px 0 0 24px;
+    padding: 4px 0 0 0px;
 
     .icon-icon_icon-66 {
       font-size: 26px;

src/router-not-302.js

@@ -0,0 +1,419 @@
+import { createRouter, createWebHistory } from 'vue-router';
+import Layout from '@/layout/index.vue';
+import store from '@/store';
+import { refreshToken, casLogin } from '@/api/auth';
+import '@/utils/fineClubSDK';
+import { getUid, getExpiresTime } from '@/utils/cookie';
+import { delUrlParams } from '@/utils/urlQuery';
+
+const routes = [
+  {
+    path: '/',
+    name: 'index',
+    component: Layout,
+    children: [
+      {
+        path: '/',
+        name: 'index',
+        component: () => import('@/views/index.vue'),
+        meta: {
+          title: '帆软学院-培养企业亟需的数据人才',
+          isMobile: 1,
+        },
+      },
+
+      {
+        path: '/cityclass',
+        name: 'cityclass',
+        component: () => import('@/views/cityclass.vue'),
+        meta: {
+          title: '城市课堂 - 帆软学院',
+          active: 'cityclass',
+        },
+      },
+
+      /**
+       * 视频课
+       */
+      {
+        path: '/video',
+        name: 'videoindex',
+        component: () => import('@/views/video/indexVideo.vue'),
+        meta: {
+          title: '视频课 - 帆软学院',
+          isMobile: 1,
+        },
+      },
+      {
+        path: '/video/:courseid',
+        name: 'video_course',
+        component: () => import('@/views/video/video_course.vue'),
+        meta: {
+          title: '视频课 - 帆软学院',
+          active: 'video',
+          isMobile: 1,
+        },
+      },
+      {
+        path: '/video/play/:playid',
+        name: 'video_course_play',
+        component: () => import('@/views/video/play.vue'),
+        meta: {
+          title: '播放课程 - 视频课',
+          active: 'video',
+          isMobile: 1,
+        },
+      },
+      /**
+       * 班级
+       */
+      {
+        path: '/class',
+        name: 'StudyClass',
+        component: () => import('@/views/class/indexClass.vue'),
+        meta: {
+          title: '学习班 - 帆软学院',
+        },
+      },
+
+      /**
+       * 进入班级教室
+       */
+      {
+        path: '/class/:classid',
+        name: 'layoutClass',
+        component: () => import('@/views/class/class.vue'),
+        meta: {
+          title: '课程章节 - 学习班',
+          active: 'class',
+        },
+        children: [
+          {
+            path: '/class/:classid',
+            name: 'class_lesson',
+            component: () => import('@/views/class/class_lesson.vue'),
+            meta: {
+              title: '课程章节 - 学习班',
+              active: 'class',
+              tab: 'class_lesson',
+            },
+          },
+          {
+            path: '/class/homework/:classid',
+            name: 'class_homework',
+            component: () => import('@/views/class/class_homework.vue'),
+            meta: {
+              title: '我的作业 - 学习班',
+              active: 'class',
+            },
+          },
+          {
+            path: '/class/forum/:classid',
+            name: 'class_forum',
+            component: () => import('@/views/class/class_forum.vue'),
+            meta: {
+              title: '班级论坛 - 学习班',
+              active: 'class',
+              tab: 'class_forum',
+            },
+          },
+          {
+            path: '/class/forum/:classid/:tid',
+            name: 'class_forum_thread',
+            component: () => import('@/views/class/class_forum_thread.vue'),
+            meta: {
+              title: '班级论坛 - 学习班',
+              active: 'class',
+              tab: 'class_forum',
+            },
+          },
+        ],
+      },
+      /**
+       * 老师后台管理
+       */
+      {
+        path: '/class/admin/:classid',
+        name: 'adminLayoutClass',
+        component: () => import('@/views/class/admin/index_admin_class.vue'),
+        meta: {
+          title: '学生管理 - 学习班',
+          active: 'class',
+        },
+        children: [
+          {
+            path: '/class/admin/student/:classid',
+            name: 'student_admin_class',
+            component: () =>
+              import('@/views/class/admin/student_admin_class.vue'),
+            meta: {
+              title: '学生管理 - 学习班',
+              active: 'class',
+            },
+          },
+          {
+            path: '/class/admin/homework/:classid',
+            name: 'homework_admin_class',
+            component: () =>
+              import('@/views/class/admin/homework_admin_class.vue'),
+            meta: {
+              title: '批改作业 - 学习班',
+              active: 'class',
+            },
+          },
+          {
+            path: '/class/admin/schedule/:classid',
+            name: 'schedule_admin_class',
+            component: () =>
+              import('@/views/class/admin/schedule_admin_class.vue'),
+            meta: {
+              title: '教学进度管理 - 学习班',
+              active: 'class',
+            },
+          },
+          {
+            path: '/class/admin/notice/:classid',
+            name: 'notice_admin_class',
+            component: () =>
+              import('@/views/class/admin/notice_admin_class.vue'),
+            meta: {
+              title: '公告栏管理 - 学习班',
+              active: 'class',
+            },
+          },
+        ],
+      },
+
+      /**
+       * 直播
+       */
+      {
+        path: '/live',
+        name: 'live',
+        component: () => import('@/views/live/live.vue'),
+        meta: {
+          title: '直播 - 帆软学院',
+        },
+      },
+
+      {
+        path: '/live/:liveid',
+        name: 'live_view',
+        component: () => import('@/views/live/live_view.vue'),
+        meta: {
+          title: '直播 - 帆软学院',
+          active: 'live',
+          isMobile: 1,
+        },
+      },
+      // 资源导航
+      {
+        path: '/more',
+        name: 'more',
+        component: () => import('@/views/more.vue'),
+        meta: {
+          title: '资源导航 - 帆软学院',
+          active: 'more',
+        },
+      },
+
+      // 新手入门-地图 finereport
+      {
+        path: '/guide/finereport',
+        name: 'guide_finereport',
+        component: () => import('@/views/video/guide/finereport.vue'),
+        meta: {
+          title: 'FineReport入门学习路径 - 帆软学院',
+          active: 'studypath',
+        },
+      },
+
+      // 新手入门-地图 finebi
+      {
+        path: '/guide/finebi',
+        name: 'guide_finebi',
+        component: () => import('@/views/video/guide/finebi.vue'),
+        meta: {
+          title: 'FineBI入门学习路径 - 帆软学院',
+          active: 'studypath',
+        },
+      },
+
+      // 新手入门-地图 jiandaoyun
+      {
+        path: '/guide/jiandaoyun',
+        name: 'guide_jiandaoyun',
+        component: () => import('@/views/video/guide/jiandaoyun.vue'),
+        meta: {
+          title: '简道云入门学习路径 - 帆软学院',
+          active: 'studypath',
+        },
+      },
+
+      // fr-学习路径首页
+      {
+        path: '/studypath/finereport',
+        name: 'studypathfr',
+        component: () => import('@/views/studypath/finereport.vue'),
+        meta: {
+          title: '报表开发工程师 - 学习路径 - 帆软学院',
+          active: 'studypath',
+          isMobile: 1,
+        },
+      },
+      // bi-学习路径首页
+      {
+        path: '/studypath/finebi',
+        name: 'studypathbi',
+        component: () => import('@/views/studypath/finebi.vue'),
+        meta: {
+          title: 'BI分析师 - 学习路径 - 帆软学院',
+          active: 'studypath',
+          isMobile: 1,
+        },
+      },
+      // bi-学习路径首页
+      {
+        path: '/studypath/finebiAdmin',
+        name: 'studypathbiAdmin',
+        component: () => import('@/views/studypath/finebiAdmin.vue'),
+        meta: {
+          title: 'FineBI管理员 - 学习路径 - 帆软学院',
+          active: 'studypath',
+          isMobile: 1,
+        },
+      },
+
+      // 简道云-学习路径首页
+      {
+        path: '/studypath/jiandaoyun',
+        name: 'studypath_page_jdy',
+        component: () => import('@/views/studypath/jiandaoyun.vue'),
+        meta: {
+          title: '零代码开发工程师 - 学习路径 - 帆软学院',
+          active: 'studypath',
+          isMobile: 1,
+        },
+      },
+    ],
+  },
+
+  {
+    path: '/class/play/:classid/:videoid',
+    name: 'classPlay',
+    component: () => import('@/views/class/play.vue'),
+    meta: {
+      title: '播放课程 - 学习班',
+      active: 'class',
+    },
+  },
+
+  {
+    path: '/live/play/:liveid',
+    name: 'live_play',
+    component: () => import('@/views/live/live_play.vue'),
+    meta: {
+      title: '进入直播 - 直播',
+      active: 'live',
+      isMobile: 1,
+    },
+  },
+
+  // 404
+  {
+    path: '/:catchAll(.*)',
+    name: '请求错误',
+    component: () => import('@/components/404.vue'),
+  },
+];
+
+const router = createRouter({
+  history: createWebHistory(),
+  routes,
+  linkActiveClass: 'active',
+  linkExactActiveClass: 'active',
+  scrollBehavior() {
+    return { top: 0 };
+  },
+});
+
+// 通过导航守卫 判断并刷新token
+let accessToken = store.getters.get_token;
+let expires = getExpiresTime();
+let getdate = parseInt(new Date().getTime() / 1000);
+
+router.beforeEach((to, from, next) => {
+  // const { title } = to.meta;
+  // document.title = getPageTitle(title);
+
+  const get_ticket = to.query.ticket || 0;
+  const get_type = to.query.type ? to.query.type : '0';
+
+    // ticket空执行删除
+  const is_ticket_null = new URL(window.location);
+  if(is_ticket_null.searchParams.has("ticket")){
+    if(get_ticket===0 || get_ticket=='null'){
+      console.log('ticket空');
+      parent.window.location.replace(process.env.VUE_APP_ID_URL+'/login/token/logout?referrer='+encodeURIComponent(process.env.VUE_APP_EDU_URL));
+    }
+  }
+
+  // fineClubSDK接入
+  let app = 'edu';
+  let isDev = process.env.VUE_APP_ENV == 'dist' ? false : true;
+  function getLoginUid() {
+    return getUid() || 0;
+  }
+  window.fineClub.config({ app, getLoginUid, debug: isDev, dev: isDev });
+  window.fineClub.autoReloadOnLoginChange({ loginUrl: process.env.VUE_APP_ID_URL + '/login/signin/?app=edu&protocol=cas&referrer=' + encodeURIComponent(window.location.href) });
+
+  if (to.meta.title) {
+    document.title = to.meta.title;
+  }
+
+  // 如果有token和过期时间，然后快过期了执行刷新token
+  if (!get_ticket && accessToken && expires && expires - getdate < 60 * 2) {
+    refreshToken().then((res) => {
+      if (res.code === 200 && res.message != -1) {
+        store.commit('set_token', res.data);
+      } else {
+        // 如果刷新失败，清空所有登录信息
+        console.log('router刷新token', 'del_token');
+        store.commit('del_token');
+      }
+    });
+    // 刷新完毕后，延时进度页面
+    setTimeout(function () {
+      next();
+    }, 500);
+  } else if (get_ticket) {
+    casLogin(get_ticket).then((res) => {      
+      if (res.code === 200 && res.status != -1) {
+        console.log('casLogin', res);
+        store.commit('set_token', res.data);
+        setTimeout(function () {
+          // parent.window.location.replace(process.env.VUE_APP_EDU_URL + to.path);
+          // parent.location.reload();
+          let jumpUrl = delUrlParams(location.href,['ticket','sid']);
+          console.log('jumpUrl',jumpUrl);
+          parent.window.location.replace(jumpUrl);
+        }, 250);
+      } else {
+        next();
+      }
+    });
+
+  } else if (get_type === 'logout') {
+    console.log('logout', 'del_token');
+    store.commit('del_token');
+    setTimeout(function () {
+      let jumpUrl = delUrlParams(location.href,['type']);
+      window.location.replace(jumpUrl);
+      // next();
+    }, 500);
+  } else {
+    next();
+  }
+});
+
+export default router;

src/views/class/indexClass.vue

@@ -45,12 +45,12 @@
                   <div class="left-content">
                     <h4 class="title">{{item.class_title}}</h4>
                     <div class="meta flex-1">
-                      <span class="one">已更新18节课(共192课时)</span>
+                      <span class="one">已更新{{item.class_update}}节课(共{{item.class_total}}课时)</span>
                       <span>
-                        <em>我的作业平均</em> <strong>99</strong>
+                        <em>我的作业平均</em> <strong>{{item.average}}</strong>
                       </span>
                       <span>
-                        <em>班级排名</em> <strong>12</strong>
+                        <em>班级排名</em> <strong>{{item.class_rank}}</strong>
                       </span>
                     </div>
                     <div class="study-progress">

src/views/more.vue

@@ -207,7 +207,7 @@
               {
                 icon: "iconfont icon-chuansongmen_shuben zi",
                 txt: "FineBI白皮书",
-                link: "https://src.fanruan.com/down/finebi-white-paper20200428.pdf",
+                link: "https://src.fanruan.com/down/pdf/finebi/finebi6.0.pdf",
               },
               {
                 icon: "iconfont icon-chuansongmen_bofang lan",

src/views/studypath/finebi.vue

@@ -70,7 +70,7 @@
             <a class="itemlk" href="https://help.fanruan.com/finebi/doc-view-335.html" target="_blank">移动端</a>
             <a class="itemlk" href="https://help.fanruan.com/finebi/doc-view-1585.html" target="_blank">部署集成</a>
             <a class="itemlk" href="https://help.fanruan.com/finebi/doc-view-920.html" target="_blank">性能优化</a>
-            <a class="itemlk" href="https://edu.fanruan.com/video/99" target="_blank">企业FineBI推广建设指南</a>
+            <a class="itemlk" href="https://edu.fanruan.com/video/400" target="_blank">企业FineBI推广建设指南</a>
           </ul>
         </div>
       </div>

src/views/studypath/jiandaoyun.vue

@@ -97,7 +97,7 @@
             <div class="infobox">
               <div class="til">了解简道云并完成注册或登录</div>
               <div class="flex-6" style="margin: 16px 0 28px;">
-                <a class="btn-jdy f14 newbtn3" href="https://edu.fanruan.com/video/play/1160" target="_blank">简道云介绍</a>
+                <a class="btn-jdy f14 newbtn3" href="/video/play/5206" target="_blank">简道云介绍</a>
                 <a class="btn-jdy f14 newbtn3" href="https://www.jiandaoyun.com/signin" target="_blank">简道云登录或注册</a>
               </div>
 

src/views/video/guide/finebi.vue

@@ -126,7 +126,8 @@
                 <div style="padding:30px 0 10px 0;"><img src="@/assets/guide/finebi/ico-FCBA.png" width="60"></div>
                 <div class="f14">帆软认证BI工程师（FCBA）考试</div>
                 <div style=" width: 250px; margin: 0 auto; padding-top: 24px" class="flex-6">
-                  <a class="btn-008 rzbtn" href="https://cert.fanruan.com/detail/53ace60eb55311ecbf5b00163e0210ff" target="_blank">前往认证</a>
+                  <a class="btn-008 rzbtn" href="https://cert.fanruan.com/detail/53ace60eb55311ecbf5b00163e0210ff"
+                    target="_blank">前往认证</a>
                   <a class="btn-fff rzbtn" href="https://cert.fanruan.com/verify" target="_blank">成绩查询</a>
                 </div>
               </div>
@@ -205,7 +206,7 @@
                   <span class="f12">《入门视频全套资料与PPT》</span>
                   <div class="xiazaiok">
                     <a class="f12 flex-1"
-                      href="https://fanruanbbs.obs.cn-east-2.myhuaweicloud.com/BI%E5%9C%88%E5%B1%82-%E7%94%A8%E6%88%B7%E8%BF%90%E8%90%A5/BI%E5%BD%95%E6%92%AD/%E6%96%B0%E6%89%8B%E5%85%A5%E9%97%A811%E6%9C%88%EF%BC%88%E8%A1%A5%EF%BC%89/FineBI%E5%85%A5%E9%97%A8%E5%AD%A6%E4%B9%A0%E8%B7%AF%E5%BE%84-%E8%B5%84%E6%96%99%E5%8C%85.zip">
+                      href="https://fanruanbbs.obs.cn-east-2.myhuaweicloud.com/BI%E5%9C%88%E5%B1%82-%E7%94%A8%E6%88%B7%E8%BF%90%E8%90%A5/BI%E5%BD%95%E6%92%AD/FineBI6.0%E9%9B%B6%E5%9F%BA%E7%A1%80%E5%85%A5%E9%97%A8/FineBI%E5%85%A5%E9%97%A8%E5%AD%A6%E4%B9%A0%E8%B7%AF%E5%BE%846.0.zip">
                       <img src="@/assets/class/zip.png" width="18"><span>立即下载</span></a>
                   </div>
                 </div>
@@ -250,7 +251,7 @@
                   <span class="f12">《入门视频全套资料与PPT》</span>
                   <div class="xiazaiok">
                     <a class="f12 flex-1"
-                      href="https://fanruanbbs.obs.cn-east-2.myhuaweicloud.com/BI%E5%9C%88%E5%B1%82-%E7%94%A8%E6%88%B7%E8%BF%90%E8%90%A5/BI%E5%BD%95%E6%92%AD/%E6%96%B0%E6%89%8B%E5%85%A5%E9%97%A811%E6%9C%88%EF%BC%88%E8%A1%A5%EF%BC%89/FineBI%E5%85%A5%E9%97%A8%E5%AD%A6%E4%B9%A0%E8%B7%AF%E5%BE%84-%E8%B5%84%E6%96%99%E5%8C%85.zip">
+                      href="https://fanruanbbs.obs.cn-east-2.myhuaweicloud.com/BI%E5%9C%88%E5%B1%82-%E7%94%A8%E6%88%B7%E8%BF%90%E8%90%A5/BI%E5%BD%95%E6%92%AD/FineBI6.0%E9%9B%B6%E5%9F%BA%E7%A1%80%E5%85%A5%E9%97%A8/FineBI%E5%85%A5%E9%97%A8%E5%AD%A6%E4%B9%A0%E8%B7%AF%E5%BE%846.0.zip">
                       <img src="@/assets/class/zip.png" width="18"><span>立即下载</span></a>
                   </div>
                 </div>
@@ -361,7 +362,7 @@
     name: 'guide_finebi',
 
     setup() {
-      const courseid = 168;//课程id写死
+      const courseid = 372;//课程id写死
       const route = useRoute()
       let get_from = route.query.from ? route.query.from : 0;
 
@@ -370,34 +371,35 @@
       const state = reactive({
         newplaytilArr: [
           {
-            name: "第一章 FineBI基本介绍",
-            info: '本章将带你了解FineBI 产品定位、产品优势、产品架构、产品功能，文档速览>><a class="col008" href="https://help.fanruan.com/finebi/doc-view-1316.html" target="_blank">《FineBI基本介绍》</a>',
+            name: "第一章 初识FineBI",
+            info: '本章将带你了解FineBI 产品定位、产品优势、产品架构、产品功能，文档速览>><a class="col008 fw600" href="https://help.fanruan.com/finebi/doc-view-1316.html" target="_blank">《FineBI基本介绍》</a>',
           },
           {
-            name: "第二章 连接到数据",
-            info: '本章将带你了解数据上传和数据更新的操作，通过案例演示掌握数据分析的第一步——数据准备，文档速览>><a class="col008"  href="https://help.fanruan.com/finebi/doc-view-1622.html" target="_blank">连接到数据</a>',
+            name: "第二章 创建分析主题并添加数据",
+            info: '本章将带你了解分析主题和如何添加分析数据，通过案例演示掌握数据分析的第一步，文档速览>><a class="col008 fw600"  href="https://help.fanruan.com/finebi6.0/doc-view-1977.html?source=0&from=studypath" target="_blank">《创建分析主题并添加数据》</a>',
           },
 
           {
-            name: "第三章 使用自助数据集做数据处理",
-            info: '本章将带你了解使用FineBI自助数据集来完成原始数据的预处理，以提升数据分析质量，文档速览>><a class="col008"  href="https://help.fanruan.com/finebi/doc-view-1633.html" target="_blank">使用自助数据集做数据处理</a>',
+            name: "第三章 在编辑数据中分析",
+            info: '本章将带你了解使用FineBI分析主题来完成原始数据的加工，以提升数据分析质量，文档速览>><a class="col008 fw600"  href="https://help.fanruan.com/finebi6.0/doc-view-1978.html?source=0&from=studypath" target="_blank">《在编辑数据中分析》</a>',
           },
 
           {
-            name: "第四章 创建组件并分析数据",
-            info: '本章将带你了解FineBI多维分析，通过对数据进行调整、处理，使其更满足数据呈现的需求，文档速览>><a class="col008"  href="https://help.fanruan.com/finebi/doc-view-1623.html" target="_blank">创建组件和分析数据</a>',
+            name: "第四章 在表格中分析",
+            info: '本章将带你了解FineBI多维分析，通过对数据进行调整、处理，使其更满足数据呈现的需求，文档速览>><a class="col008 fw600"  href="https://help.fanruan.com/finebi6.0/doc-view-1979.html?source=0&from=studypath" target="_blank">《在表格中分析》</a>',
           },
           {
-            name: "第五章 可视化组件",
-            info: '本章将通过图表的选择和制作带你掌握可视化分析技巧，文档速览>><a class="col008"  href="https://help.fanruan.com/finebi/doc-view-1626.html" target="_blank">可视化组件</a>',
+            name: "第五章 在图形中分析",
+            info: '本章将通过图表的选择和制作带你掌握可视化分析技巧，文档速览>><a class="col008 fw600"  href="https://help.fanruan.com/finebi6.0/doc-view-1980.html?source=0&from=studypath" target="_blank">《在图形中分析》</a>',
           },
           {
-            name: "第六章 添加交互效果",
-            info: '本章将带你了解FineBI交互效果，通过多组件协同以满足实际复杂业务场景的分析需求，文档速览>><a class="col008"  href="https://help.fanruan.com/finebi/doc-view-1629.html" target="_blank">添加交互效果</a>',
+            name: "第六章 添加组件交互",
+            info: '本章将带你了解FineBI交互效果，通过多组件协同以满足实际复杂业务场景的分析需求，文档速览>><a class="col008 fw600"  href="https://help.fanruan.com/finebi6.0/doc-view-1982.html?source=0&from=studypath" target="_blank">《添加组件交互》</a>',
           },
           {
-            name: "第七章 仪表板分享",
-            info: '本章将带你了解仪表板的整体布局和美化，以及仪表板分享的内容，文档速览>><a class="col008"  href="https://help.fanruan.com/finebi/doc-view-1632.html" target="_blank">仪表板制作和分享</a>',
+            name: "第七章 仪表板布局&案例分享",
+            info: '本章将带你了解仪表板的整体布局和美化，以及分析结果分享的内容，文档速览>><a class="col008 fw600" href="https://help.fanruan.com/finebi6.0/doc-view-1983.html?source=0&from=studypath" target="_blank">《仪表板布局美化》</a>'
+              +'、<a class="col008 fw600" href="https://help.fanruan.com/finebi6.0/doc-view-1984.html?source=0&from=studypath" target="_blank">《分享分析案例》</a>',
           },
 
         ],
@@ -406,13 +408,13 @@
         newplayNum: '',
         newplayCount: '',
         arrNewId: [
-          [1711, 2167, 2168,],
-          [1712, 1713,],
-          [2176, 2177],
-          [2169, 2170, 2171],
-          [1714, 1757, 1758],
-          [1759, 2172, 2173],
-          [1719, 2174, 2175],
+          [4635, 4637, 4226,],
+          [4227,],
+          [4228],
+          [4246],
+          [4230],
+          [4231],
+          [4232, 4233],
         ],
         newVideoList: [],
         //播放器相关
@@ -1466,7 +1468,7 @@
       width: 150px;
       height: 158px;
       left: 310px;
-      top: -6px;
+      top: -2px;
 
       &.yes {
         background-image: url("~@/assets/guide/finebi/two.png");
@@ -1486,10 +1488,10 @@
     }
 
     .ch_three {
-      width: 162px;
-      height: 170px;
+      width: 167px;
+      height: 175px;
       left: 460px;
-      top: 86px;
+      top: 76px;
 
       &.yes {
         background-image: url("~@/assets/guide/finebi/three.png");
@@ -1500,8 +1502,8 @@
       }
 
       &:hover {
-        width: 172px;
-        height: 180px;
+        width: 177px;
+        height: 185px;
         margin-top: -10px;
         margin-left: -3px;
         opacity: 1;
@@ -1509,10 +1511,10 @@
     }
 
     .ch_four {
-      width: 155px;
-      height: 174px;
+      width: 160px;
+      height: 179px;
       left: 295px;
-      top: 178px;
+      top: 188px;
 
       &.yes {
         background-image: url("~@/assets/guide/finebi/four.png");
@@ -1523,8 +1525,8 @@
       }
 
       &:hover {
-        width: 165px;
-        height: 184px;
+        width: 170px;
+        height: 189px;
         margin-top: -10px;
         margin-left: -5px;
         opacity: 1;
@@ -1532,7 +1534,7 @@
     }
 
     .ch_five {
-      width: 155px;
+      width: 160px;
       height: 180px;
       left: 464px;
       top: 290px;
@@ -1546,7 +1548,7 @@
       }
 
       &:hover {
-        width: 165px;
+        width: 170px;
         height: 190px;
         margin-top: -10px;
         margin-left: -5px;
@@ -1555,8 +1557,8 @@
     }
 
     .ch_six {
-      width: 172px;
-      height: 166px;
+      width: 168px;
+      height: 178px;
       left: 638px;
       top: 196px;
 
@@ -1569,8 +1571,8 @@
       }
 
       &:hover {
-        width: 182px;
-        height: 176px;
+        width: 178px;
+        height: 188px;
         margin-top: -10px;
         margin-left: -5px;
         opacity: 1;

src/views/video/play.vue

@@ -90,7 +90,15 @@
 
 <script>
   import { useRoute, useRouter } from 'vue-router'
-  import { getVideo, getPlayList, classlog, maLookVideoTracking, sourceDeviceLog } from "@/api/video";
+  import { 
+    getVideo, 
+    getPlayList, 
+    classlog, 
+    maLookVideoTracking, 
+    sourceDeviceLog,
+    updateVideoCountLog,
+    updateVideoPlayEnd
+   } from "@/api/video";
   import { toRefs, reactive, onMounted, ref, onUnmounted } from 'vue';
   import { isMobileValue } from "@/utils/isMobile";
 
@@ -102,6 +110,7 @@
       const videoid = route.params.playid;
 
       const state = reactive({
+        pointTimer:0,
         isAuth: true,
         msg: 0,
         empty: false,
@@ -140,35 +149,6 @@
         playThisId: route.params.playid
       })
 
-
-      // 获取视频 待删 MARKET-4168
-      // const resVideoData = async () => {
-      //   const res = await getVideo(videoid);
-      //   if (res.code === 200) {
-
-      //     if (res.data.playtime > 0) {
-      //       state.videoObject.seek = res.data.playtime;
-      //     }
-      //     state.msg = res.message;
-      //     if (res.status === -1) {
-      //       state.isAuth = false;
-      //       state.empty = true;
-      //     } else {
-      //       state.isAuth = true;
-      //     }
-
-      //     state.video = res.data;
-      //     state.play_title = res.data.it618_name;
-      //     state.videoObject.video = res.data.it618_videourl;
-      //     state.playcur = videoid;
-      //     state.logid = res.data.logid;
-      //     state.videoid = res.data.id;
-      //     state.videopid = res.data.it618_pid;
-      //   }
-      // };
-      // resVideoData();
-
-
       const goBack = (pid) => {
         router.push('/video/' + pid);
       }
@@ -227,8 +207,8 @@
 
       /**
         * 封装视频渲染
-        * @replay 1=重播
-        * @resOne 1=第一次进入页面播放
+        * @param replay 1=重播
+        * @param resOne 1=第一次进入页面播放
       **/
       const getvideoDom = async (id, replay = 0, resOne = 0) => {
 
@@ -296,6 +276,11 @@
           myCounter.stopCount();
           // funAutoPlay();
           state.showAutoBox = true;
+          // 完播埋点
+          let log2Param = {
+            id:state.video.logid2
+          }      
+          updateVideoPlayEnd(log2Param);
         }
 
 
@@ -316,6 +301,19 @@
               intervalId = null;
               //console.log('count',state.is_duration);
             }
+
+            // 发送埋点
+            state.pointTimer++;
+            console.log(state.pointTimer);
+            if(state.pointTimer == 5){
+              state.pointTimer = 0;
+              let log2Param = {
+                id:state.video.logid2
+              }
+              updateVideoCountLog(log2Param);
+              // console.log("发送埋点",state.video.logid2);
+            }
+            
           }
           function start() {
             if (intervalId == null) {

src/views/video/video_course.vue

@@ -328,28 +328,33 @@
         <div id="tab-menu2_box" class="btile flex-1 tab_cur_box">
           <h2>学习资料</h2>
         </div>
+
         <div class="datalist" v-if="countAtt">
           <div class="dlist" v-for="(item, i) in looplist" :key="i">
             <div v-for="(item, i) in item.video" :key="i">
+              <!-- <el-divider content-position="left" v-if="item.attachment.length>0" class="attachment_title">{{item.it618_name}}</el-divider> -->
+              <ul v-for="(item, i) in item.attachment" :key="i">
                 
-              <li class="item flex-1 flex-3" v-if="item.data_name">
-                <div class="til flex-1">
-                  <i class="zip"></i>
-                  <span class="f_title">{{item.data_name}}</span>
-                </div>
+                <li class="item flex-1 flex-3" v-if="item.it618_name">
+                  <div class="til flex-1">
+                    <i class="zip"></i>
+                    <span class="f_title">{{item.it618_name}}</span>
+                  </div>
 
-                <div v-if="basic.it618_saleprice > 0">
-                  <a class="el-btn" :href="item.it618_dataurl" target="_blank" v-if="isBuy===true">下载</a>
-                  <el-tooltip content="购买课程后可以下载" placement="left" v-if="isBuy===false">
-                    <a href="javascript:;" class="el-btn">购买后下载</a>
-                  </el-tooltip>
-                </div>
+                  <div v-if="basic.it618_saleprice > 0">
+                    <a class="el-btn" :href="item.it618_dataurl" target="_blank" v-if="isBuy===true">下载</a>
+                    <el-tooltip content="购买课程后可以下载" placement="left" v-if="isBuy===false">
+                      <a href="javascript:;" class="el-btn">购买后下载</a>
+                    </el-tooltip>
+                  </div>
 
-                <div v-else>
-                  <a class="el-btn" :href="item.it618_dataurl" target="_blank">下载</a>
-                </div>
+                  <div v-else>
+                    <a class="el-btn" :href="item.it618_dataurl" target="_blank">下载</a>
+                  </div>
+                </li>
+
+            </ul>
 
-              </li>
             </div>
           </div>
         </div>
@@ -1046,6 +1051,13 @@
 </script>
 
 <style lang="scss" scoped>
+
+  .attachment_title{
+    width: auto;
+    color: #617288;
+    margin-left: 24px;
+    margin-right: 24px;
+  }
   .rt-box {
     margin-top: 50px;
   }