Merge branch 'hqyDev' of http://git.dayaedu.com/lex/classroom-instruments into jenkins

dev-dist/sw.js

@@ -83,10 +83,14 @@ define(['./workbox-88bf3160'], (function (workbox) { 'use strict';
   }, {
     "url": "index.html",
 <<<<<<< HEAD
+<<<<<<< HEAD
     "revision": "0.3rkub68fa8"
 =======
     "revision": "0.15ep1dnlqh"
 >>>>>>> d3a0451dfca4987c04f7dd71674fa3dfaebcb710
+=======
+    "revision": "0.4v8s4holqi"
+>>>>>>> 31c8ce6834d9dbe55da3ef83bbe3bf6d61486328
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {

public/version.json

@@ -1 +1,5 @@
-{"version":1734685835376}
+<<<<<<< HEAD
+{"version":1734685835376}
+=======
+{"version":1734921568773}
+>>>>>>> 31c8ce6834d9dbe55da3ef83bbe3bf6d61486328

src/views/attend-class/component/pptList.tsx

@@ -9,6 +9,10 @@ export default defineComponent({
     pptData: {
       type: Object,
       default: () => ({})
+    },
+    fromType: {
+      type: String, // 'PLATFORM' | 'TEACHER' | 'CLASS'
+      default: 'TEACHER'
     }
   },
   emits: ['initPPT', 'changeSlideIndex'],
@@ -17,7 +21,9 @@ export default defineComponent({
     const iframeRef = ref<HTMLIFrameElement>();
     const src = `${vaildPPTUrl()}/#/pptScreen?id=${
       props.pptData.id
-    }&Authorization=${userStore.getToken}&hideFullScreen=true`;
+    }&Authorization=${userStore.getToken}&hideFullScreen=true&fromType=${
+      props.fromType
+    }`;
     // 上一页下一页
     function handleChangeSlide(type: 'prev' | 'next') {
       iframeRef.value?.contentWindow?.postMessage(

src/views/attend-class/index.tsx

@@ -1998,7 +1998,13 @@ export default defineComponent({
               : styles.rightColumnHide
           ]}>
           {rightList.map((item: any) => (
-            <div class={styles.columnItemBox}>
+            <div
+              class={[
+                styles.columnItemBox,
+                item.id === 14 && data.coursewareType === 'PPT'
+                  ? styles.hideBtn
+                  : ''
+              ]}>
               <div
                 class={[
                   styles.columnItem,
@@ -2007,9 +2013,6 @@ export default defineComponent({
                   (item.id === 11 && !isUpArrow.value) ||
                   (item.id === 12 && !isDownArrow.value)
                     ? styles.itemDisabled
-                    : '',
-                  item.id === 14 && data.coursewareType === 'PPT'
-                    ? styles.hideBtn
                     : ''
                 ]}
                 onClick={() => operateRightBtn(item.id)}>
@@ -2076,7 +2079,13 @@ export default defineComponent({
               : styles.leftColumnHide
           ]}>
           {rightList.map((item: any) => (
-            <div class={styles.columnItemBox}>
+            <div
+              class={[
+                styles.columnItemBox,
+                item.id === 14 && data.coursewareType === 'PPT'
+                  ? styles.hideBtn
+                  : ''
+              ]}>
               <div
                 class={[
                   styles.columnItem,
@@ -2085,9 +2094,6 @@ export default defineComponent({
                   (item.id === 11 && !isUpArrow.value) ||
                   (item.id === 12 && !isDownArrow.value)
                     ? styles.itemDisabled
-                    : '',
-                  item.id === 14 && data.coursewareType === 'PPT'
-                    ? styles.hideBtn
                     : ''
                 ]}
                 onClick={() => operateRightBtn(item.id)}>

src/views/attend-class/model/select-class/index.tsx

@@ -58,7 +58,8 @@ export default defineComponent({
             fromChapterLessonCoursewareId: item.fromChapterLessonCoursewareId,
             name: item.name,
             coverImg: firstItem?.bizInfo.coverImg,
-            type: firstItem?.bizInfo.type
+            type: firstItem?.bizInfo.type,
+            coursewareType: item.coursewareType
           });
         });
         forms.tableList = tempList;

src/views/prepare-lessons/components/lesson-main/courseware-presets/index.tsx

@@ -1118,7 +1118,7 @@ export default defineComponent({
               rule={[
                 {
                   required: true,
-                  message: '请输入适用乐器',
+                  message: '请选择适用乐器',
                   trigger: ['blur', 'change'],
                   type: 'array'
                 }

src/views/prepare-lessons/model/courseware-type/index.tsx

@@ -74,14 +74,15 @@ export default defineComponent({
             props.isShowAdd && styles.isShowAdd
           ]}
           onClick={() => emit('click')}>
-          {props.isShowOpenFlag && (
-            <div class={styles.statusCon}>
-              <div class={styles.status}>
-                {props.item.coursewareType === 'PPT' ? 'PPT' : '传统课件'}
-              </div>
-              {props.item.openFlag && <div class={styles.status}>公开</div>}
+          <div class={styles.statusCon}>
+            <div class={styles.status}>
+              {props.item.coursewareType === 'PPT' ? 'PPT' : '传统课件'}
             </div>
-          )}
+            {props.isShowOpenFlag && props.item.openFlag && (
+              <div class={styles.status}>公开</div>
+            )}
+          </div>
+
           <NImage
             objectFit="cover"
             previewDisabled

src/views/prepare-lessons/model/related-class/index.tsx

@@ -71,7 +71,8 @@ export default defineComponent({
             coverImg: firstItem?.bizInfo.coverImg,
             type: firstItem?.bizInfo.type,
             isAdd: item.addFlag,
-            isNotWork: item.lessonPreTrainingNum <= 0 ? true : false // 是否布置作业
+            isNotWork: item.lessonPreTrainingNum <= 0 ? true : false, // 是否布置作业
+            coursewareType: item.coursewareType
           });
         });