首页 发现 帮助
登录
huangqiyong
/
classroom
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

Merge branch 'main' of http://git.dayaedu.com/huangqiyong/classroom into dev

黄琪勇 10 月之前
父节点
64bdb3b181 047a9b9c4d
当前提交
1cad01cbeb
共有 19 个文件被更改，包括 29 次插入 和 18 次删除
分列视图 显示文件统计
  1. 1 0
      dist/css/333.91642805.css
  2. 0 0
      dist/css/628.0f606cbf.css
  3. 0 0
      dist/css/651.e1fff932.css
  4. 1 0
      dist/css/654.16ddbf64.css
  5. 0 0
      dist/css/988.c5686f83.css
  6. 0 0
      dist/css/app.768c4a17.css
  7. 4 0
      dist/index.html
  8. 0 0
      dist/js/333.bebff96c.js
  9. 0 0
      dist/js/654.a981cab4.js
  10. 0 0
      dist/js/988.3199c311.js
  11. 0 0
      dist/js/app.7f8b272f.js
  12. 0 0
      dist/js/chunk-vendors.7e0df264.js
  13. 2 2
      src/plugin/modalFrame/modalFrame.scss
  14. 6 0
      src/views/coursewarePlay/coursewarePlay.vue
  15. 7 5
      src/views/coursewarePlay/videoPlay/videoPlay.vue
  16. 4 5
      src/views/curriculum/components/curriculumList/curriculumList_gyt.vue
  17. 0 1
      src/views/curriculum/curriculumDetail.vue
  18. 1 2
      src/views/curriculum/hooks/useStartClass.ts
  19. 3 3
      src/views/homePage/components/curriculum/curriculum_gyt.vue

文件差异内容过多而无法显示
+ 1 - 0
dist/css/333.91642805.css


文件差异内容过多而无法显示
+ 0 - 0
dist/css/628.0f606cbf.css


文件差异内容过多而无法显示
+ 0 - 0
dist/css/651.e1fff932.css


文件差异内容过多而无法显示
+ 1 - 0
dist/css/654.16ddbf64.css


文件差异内容过多而无法显示
+ 0 - 0
dist/css/988.c5686f83.css


文件差异内容过多而无法显示
+ 0 - 0
dist/css/app.768c4a17.css


+ 4 - 0
dist/index.html
查看文件 

@@ -1,6 +1,10 @@
 
 <!doctype html><html lang=""><head><meta charset="utf-8"/><meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="renderer" content="webkit"/><meta name="force-rendering" content="webkit"/><link rel="icon" href="/favicon.ico"/><title>乐教通</title><script>if (!!window.ActiveXObject || "ActiveXObject" in window) {
 
             window.location.href = "./ieIncompatible/index.html"
 
+<<<<<<< HEAD
 
          }</script><script defer="defer" src="/js/chunk-vendors.e59c97be.js"></script><script defer="defer" src="/js/app.5a6db336.js"></script><link href="/css/app.51969639.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but classroom doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"><style>.firstLoading {
 
+=======
 
+         }</script><script defer="defer" src="/js/chunk-vendors.7e0df264.js"></script><script defer="defer" src="/js/app.7f8b272f.js"></script><link href="/css/app.768c4a17.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but classroom doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"><style>.firstLoading {
 
+>>>>>>> 047a9b9c4dd5ec2b95bb34d8cbdeac5a207f8495
 
                position: fixed;
 
                left: 50%;
 
                top: 50%;

文件差异内容过多而无法显示
+ 0 - 0
dist/js/333.bebff96c.js


文件差异内容过多而无法显示
+ 0 - 0
dist/js/654.a981cab4.js


文件差异内容过多而无法显示
+ 0 - 0
dist/js/988.3199c311.js


文件差异内容过多而无法显示
+ 0 - 0
dist/js/app.7f8b272f.js


文件差异内容过多而无法显示
+ 0 - 0
dist/js/chunk-vendors.7e0df264.js


+ 2 - 2
src/plugin/modalFrame/modalFrame.scss
查看文件 

@@ -62,7 +62,7 @@
 
    left: 0;

    width: 100%;

    height: 100%;

-   z-index: 2000;

+   z-index: 1234567;

    background-color: $overlay-color-lighter;

 

    .animationBox {

@@ -124,4 +124,4 @@
 
          align-items: center;

       }

    }

-}
 
+}

+ 6 - 0
src/views/coursewarePlay/coursewarePlay.vue
查看文件 

@@ -10,6 +10,7 @@
 
             v-show="fileType === 'VIDEO'"
 
             ref="videoPlayDom"
 
             @ended="handleChangeCourseware(1)"
 
+            @playbackRate="showController"
 
             :disableEvents="true"
 
             :isShowController="isShowController"
 
          />
 
@@ -274,11 +275,16 @@ function handlePlayVideo({ src, name }: { src: string; name: string }) {
 
 /* 按键事件相关 */
 
 onMounted(() => {
 
    document.addEventListener("keydown", handleKeydown)
 
+   document.addEventListener("contextmenu", preventDefaultContextmenu)
 
    showController()
 
 })
 
 onUnmounted(() => {
 
    document.removeEventListener("keydown", handleKeydown)
 
+   document.removeEventListener("contextmenu", preventDefaultContextmenu)
 
 })
 
+function preventDefaultContextmenu(event: MouseEvent) {
 
+   event.preventDefault()
 
+}
 
 function handleKeydown(e: KeyboardEvent) {
 
    const key = e.key
 
    if (key === " ") {

+ 7 - 5
src/views/coursewarePlay/videoPlay/videoPlay.vue
查看文件 

@@ -89,6 +89,7 @@ const props = defineProps<{
 
 const emits = defineEmits<{
 
    (e: "ready"): void //播放器初始化完成
 
    (e: "ended"): void //播放结束
 
+   (e: "playbackRate"): void //播放速度改动时候
 
 }>()
 
 const videoId = "video" + UUID()
 
 let playerVm: Record<string, any>
 
@@ -250,6 +251,7 @@ function handleLoop() {
 
 function handlePalySpeedChange(value: number) {
 
    playController.palySpeed = value
 
    playerVm.playbackRate(value)
 
+   emits("playbackRate")
 
 }
 
 function handlePalySpeed(value: number) {
 
    const palySpeed = parseFloat((playController.palySpeed + value).toFixed(1))
 
@@ -329,11 +331,11 @@ defineExpose({
 
       background: linear-gradient(0deg, rgba(0, 0, 0, 0.5), transparent);
 
       color: #fff;
 
       transition: all 0.5s;
 
-      &:hover {
 
-         cursor: initial;
 
-         opacity: initial !important;
 
-         transform: initial !important;
 
-      }
 
+      // &:hover {   //取消鼠标移入不隐藏
 
+      //    cursor: initial;
 
+      //    opacity: initial !important;
 
+      //    transform: initial !important;
 
+      // }
 
       .timeController {
 
          font-weight: 500;
 
          font-size: 20px;

+ 4 - 5
src/views/curriculum/components/curriculumList/curriculumList_gyt.vue
查看文件 

@@ -4,7 +4,7 @@
 
 * @Date:2024-03-29 15:29:06

 -->

 <template>

-   <div class="curriculumList_gyt" v-for="item in props.curriculumData" :key="item.id" @click="handleClickDetail(item.id, item.applyStatus)">

+   <div class="curriculumList_gyt" v-for="item in props.curriculumData" :key="item.id" @click="handleClickDetail(item.id, item)">

       <div class="head">

          <div class="timeBox">

             <img class="timeImg" src="@/img/curriculum/sj.png" />

@@ -41,7 +41,7 @@
 
             <div><ellipsisScroll :title="item.orchestraName" /></div>

          </div>

          <div class="btnGoClass" v-if="item.status === 'ING'" @click.stop="handleStartClass(item.id)">开始上课</div>

-         <div class="btnDetail" v-else @click.stop="handleClickDetail(item.id, item.applyStatus)">

+         <div class="btnDetail" v-else @click.stop="handleClickDetail(item.id, item)">

             <div>查看详情</div>

             <img class="jtImg" src="@/img/curriculum/jt.png" />

          </div>

@@ -54,7 +54,6 @@ import useDialogConfirm from "@/hooks/useDialogConfirm"
 
 import { format } from "@/libs/tools"

 import { useCurriculumDetail, useSetUpCourseware } from "@/views/curriculum"

 import { handleStartClass_gyt } from "@/views/curriculum/hooks/useStartClass"

-import { ElMessage } from "element-plus"

 

 const emits = defineEmits<{

    (e: "update"): void

@@ -67,8 +66,8 @@ function handleStartClass(id: string) {
 
    handleStartClass_gyt(id)

 }

 //查看详情

-function handleClickDetail(id: string, applyStatus: boolean) {

-   if (!applyStatus) {

+function handleClickDetail(id: string, item: any) {

+   if (!item.applyStatus && item.status !== "ING") {

       useDialogConfirm({

          headImg: require("@/img/curriculum/ts4.png"),

          text: `该资源已失效`,

+ 0 - 1
src/views/curriculum/curriculumDetail.vue
查看文件 

@@ -62,7 +62,6 @@
 
 </template>

 

 <script setup lang="ts">

-import { ElMessage } from "element-plus"

 import courseCollapse from "./components/courseCollapse"

 import { useSetUpCourseware } from "./index"

 import {

+ 1 - 2
src/views/curriculum/hooks/useStartClass.ts
查看文件 

@@ -4,7 +4,6 @@ import { httpAjaxLoadingErrMsg } from "@/plugin/httpAjax"
 
 import useDialogConfirm from "@/hooks/useDialogConfirm"

 import { format } from "@/libs/tools"

 import router from "@/router"

-import { ElMessage } from "element-plus"

 

 /* 管乐迷 开始上课 */

 export function handleStartClass_gym(id: string) {

@@ -106,7 +105,7 @@ export function handleStartClass_gyt(id: string) {
 
             return

          }

 

-         if (!applyStatus) {

+         if (!applyStatus && status !== "ING") {

             useDialogConfirm({

                headImg: require("@/img/curriculum/ts4.png"),

                text: `该资源已失效`,

+ 3 - 3
src/views/homePage/components/curriculum/curriculum_gyt.vue
查看文件 

@@ -46,7 +46,7 @@
 
          </div>

       </div>

       <div class="btnCon">

-         <div class="btnDetail" @click="handleClickDetail(classData.id, classData.applyStatus)">查看详情</div>

+         <div class="btnDetail" @click="handleClickDetail(classData.id, classData)">查看详情</div>

          <div class="btnGoClass" v-if="classData.status === 'ING'" @click="handleStartClass(classData.id)">开始上课</div>

       </div>

    </div>

@@ -69,8 +69,8 @@ function handleStartClass(id: string) {
 
    handleStartClass_gyt(id)

 }

 //查看详情

-function handleClickDetail(id: string, applyStatus: boolean) {

-   if (!applyStatus) {

+function handleClickDetail(id: string, classData: any) {

+   if (!classData.applyStatus && classData.status !== "ING") {

       useDialogConfirm({

          headImg: require("@/img/curriculum/ts4.png"),

          text: `该资源已失效`,

部分文件因为文件数量过多而无法显示