Merge branch 'hqyDev' of http://git.dayaedu.com/huangqiyong/pptList into test-online

src/queryParams/index.ts

@@ -1,5 +1,4 @@
 import { reactive } from "vue"
-import router from "@/router"
 
 /** 维护其他系统过来的特殊字段  这里用来记录，以免其他系统传过来的参数混乱 不好维护 */
 export type queryParamsType = {
@@ -7,12 +6,14 @@ export type queryParamsType = {
   fromType: "PLATFORM" | "TEACHER" | "CLASS"
   instrumentId: string
   lessonCoursewareKnowledgeId: string
+  pptResourcesType: "PLATFORM" | "TEACHER" | "CLASS"
 }
 const queryParams = reactive<queryParamsType>({
   hideFullScreen: false, // 隐藏预览时候的全屏按钮
   fromType: "TEACHER", // 用于区分老师端 平台，或者学生端
   lessonCoursewareKnowledgeId: "", // 课件id 老师端带过来查相关课件
-  instrumentId: "" // 传过来的乐器值，用于ppt里面云教练带什么乐器
+  instrumentId: "", // 传过来的乐器值，用于ppt里面云教练带什么乐器
+  pptResourcesType: "TEACHER" // ppt查看资源类型 用来查询ppt数据  学生端有多种场景资源数据
 })
 
 export function initQueryParams() {
@@ -20,10 +21,12 @@ export function initQueryParams() {
   if (paramsFromUrl) {
     const hideFullScreen = !!paramsFromUrl.get("hideFullScreen")
     const fromType = paramsFromUrl.get("fromType")
+    const pptResourcesType = paramsFromUrl.get("pptResourcesType")
     const lessonCoursewareKnowledgeId = paramsFromUrl.get("lessonCoursewareKnowledgeId")
     const instrumentId = paramsFromUrl.get("instrumentId")
     queryParams.hideFullScreen = hideFullScreen
     fromType && (queryParams.fromType = fromType as any)
+    pptResourcesType && (queryParams.pptResourcesType = pptResourcesType as any)
     lessonCoursewareKnowledgeId && (queryParams.lessonCoursewareKnowledgeId = lessonCoursewareKnowledgeId as any)
     instrumentId && (queryParams.instrumentId = instrumentId as any)
   }

src/store/pptWork.ts

@@ -29,7 +29,7 @@ const useStore = defineStore("pptWork", {
     async initPPTData() {
       if (this.id) {
         LoadingBar.loading(true, "资源加载中,请稍等...")
-        const res = await httpAjaxErrMsg(getTeacherChapterKnowledgeMaterial, this.id, queryParams.fromType)
+        const res = await httpAjaxErrMsg(getTeacherChapterKnowledgeMaterial, this.id, queryParams.pptResourcesType)
         if (res.code === 200) {
           const { dataJson, chapterLessonCoursewareName } = res.data || {}
           const { coverImg, jsonUrl } = JSON.parse(dataJson)

src/views/components/element/cloudCoachElement/cloudCoachList/cloudCoachList.vue

@@ -605,14 +605,17 @@ const highlightedText = (text: string, query: string) => {
                 height: 4px;
                 margin-left: 6px;
               }
-              &.active,
               &:hover {
-                background: #d2ecff;
-                color: rgba(0, 0, 0, 1);
+                background: #e8e9ed;
+                color: #5d5d5e;
                 > img {
                   transform: rotate(180deg);
                 }
               }
+              &.active {
+                background: #d2ecff;
+                color: rgba(0, 0, 0, 1);
+              }
               &.hoverActive {
                 background: #d2ecff;
                 color: rgba(0, 0, 0, 1);

src/views/components/element/enjoyElement/enjoyPlayer.vue

@@ -425,7 +425,7 @@ const handleMousedownPlayBar = () => {
             bottom: 0;
             background: rgba(255, 255, 255, 0.4);
             height: 10px;
-            transition: all 0.5s ease;
+            //transition: all 0.5s ease; //这个和ppt动画效果冲突，见禅道12278
             will-change: width;
             border-radius: 6px;
           }

src/views/components/element/enjoyElement/resourcesList/resourcesList.vue

@@ -30,7 +30,7 @@
             v-for="item in resourcesTypeOption"
             :key="item.value"
             @click="handleTypeChange(item.value)"
-            :class="['queryTip tabQueryTip', queryData.type === item.value && 'active']"
+            :class="['queryTip', queryData.type === item.value && 'active']"
           >
             {{ item.text }}
           </div>
@@ -472,20 +472,13 @@ const highlightedText = (text: string, query: string) => {
           background: #f5f6fa;
           border-radius: 16px;
           cursor: pointer;
-          &.active,
           &:hover {
-            background: #d2ecff;
-            color: rgba(0, 0, 0, 1);
+            background: #e8e9ed;
+            color: #5d5d5e;
           }
-          &.tabQueryTip {
-            &:hover {
-              background: #e8e9ed;
-              color: #5d5d5e;
-            }
-            &.active {
-              background: #198cfe;
-              color: #ffffff;
-            }
+          &.active {
+            background: #198cfe;
+            color: #ffffff;
           }
         }
       }
@@ -578,14 +571,17 @@ const highlightedText = (text: string, query: string) => {
                 height: 4px;
                 margin-left: 6px;
               }
-              &.active,
               &:hover {
-                background: #d2ecff;
-                color: rgba(0, 0, 0, 1);
+                background: #e8e9ed;
+                color: #5d5d5e;
                 > img {
                   transform: rotate(180deg);
                 }
               }
+              &.active {
+                background: #d2ecff;
+                color: rgba(0, 0, 0, 1);
+              }
               &.hoverActive {
                 background: #d2ecff;
                 color: rgba(0, 0, 0, 1);