Merge branch 'master' of http://git.dayaedu.com/lex/classroom-instruments

src/components/layout/layoutTop.tsx

@@ -92,13 +92,13 @@ export default defineComponent({
                   <div
                     class={styles.optons}
                     onClick={() => (showSuggestionViseble.value = true)}>
-                    <NImage src={opinionIcon} previewDisabled></NImage>
+                    <img src={opinionIcon}></img>
                   </div>
                 ),
                 default: '意见反馈'
               }}
             </NTooltip>
-            {/* </div> */}
+
             <div onClick={() => (showImGroup.value = true)}>
               <NBadge
                 value={noReadCount.value}

src/components/layout/modals/suggestion-option.module.less

@@ -11,7 +11,6 @@
 }
 
 .updatePassword {
-  background-color: transparent;
   padding: 40px;
 }
 

src/views/attend-class/index.tsx

@@ -109,10 +109,6 @@ export default defineComponent({
     classId: {
       type: String,
       defaault: ''
-    },
-    preStudentNum: {
-      type: [String, Number],
-      default: ''
     }
   },
   emits: ['close'],
@@ -154,7 +150,6 @@ export default defineComponent({
       detailId: '' as any, // 编号 - 课程编号
       classGroupId: '' as any, // 上课时需要 班级编号
       classId: '' as any, // 上课编号
-      preStudentNum: '' as any, // 班上学生
       // detail: null,
       knowledgePointList: [] as any,
       itemList: [] as any,
@@ -274,7 +269,6 @@ export default defineComponent({
     onMounted(() => {
       // initMoveable();
       const query = route.query;
-      console.log(query, props.preStudentNum, '学生人数');
       // 先取参数，
       data.type = props.type || (query.type as any);
       data.subjectId = props.subjectId || query.subjectId;
@@ -282,7 +276,6 @@ export default defineComponent({
       data.lessonCourseId = props.lessonCourseId || query.lessonCourseId;
       data.classGroupId = props.classGroupId || query.classGroupId;
       data.classId = props.classId || query.classId;
-      data.preStudentNum = props.preStudentNum || query.preStudentNum;
 
       window.addEventListener('message', iframeHandle);
       getDetail();
@@ -1209,13 +1202,8 @@ export default defineComponent({
             </div>
             {data.type !== 'preview' && (
               <div
-                class={[
-                  styles.btnItem,
-                  data.preStudentNum <= 0 ? styles.btnsDisabled : ''
-                ]}
+                class={styles.btnItem}
                 onClick={async () => {
-                  // 学生人数必须大于0，才可以布置作业
-                  if (data.preStudentNum <= 0) return;
                   const res = await lessonPreTrainingPage({
                     coursewareKnowledgeDetailId: data.detailId,
                     subjectId: data.subjectId,

src/views/attend-class/model/train-update/index.tsx

@@ -39,7 +39,6 @@ export default defineComponent({
       baseMaxScore: 99,
       type: 'PRACTICE',
       musicId: '',
-      musicName: '',
       coursewareKnowledgeDetailId: '', // 章节编号
       minScore: null as any,
       maxScore: null as any,
@@ -63,7 +62,6 @@ export default defineComponent({
           const params = {
             trainingType: forms.type,
             musicId: forms.musicId,
-            musicName: forms.musicName,
             coursewareKnowledgeDetailId: forms.coursewareKnowledgeDetailId,
             subjectId: forms.subjectId,
             id: forms.id,
@@ -123,7 +121,6 @@ export default defineComponent({
       }
       forms.baseMaxScore = item.practiceChapterMax || 99;
       forms.musicId = item.id;
-      forms.musicName = item.musicName;
       forms.coursewareKnowledgeDetailId = item.coursewareKnowledgeDetailId;
       forms.subjectId = item.subjectId;
       forms.coverImg = item.coverImg;

src/views/classList/index.tsx

@@ -301,14 +301,12 @@ export default defineComponent({
         // 判断是否有声部
         if (row.subjectId) {
           //
-          // 声部先取上次上课的声部，如果没有则取班级上面的声部
           router.push({
             path: '/prepare-lessons',
             query: {
               lastUseCoursewareId: row.lessonCoursewareId,
               unit: row.lessonCoursewareKnowledgeDetailId,
               subjectId: row.subjectId,
-              courseScheduleSubjectId: row.courseScheduleSubjectId,
               name: row.name, // 班级名称
               classGroupId: row.id // 班级编号
             }

src/views/classList/modals/Gotoclass.tsx

@@ -58,8 +58,7 @@ export default defineComponent({
         if (data.rows && data.rows.length > 0) {
           const res = await courseScheduleStart({
             lessonCoursewareKnowledgeDetailId: forms.chapter,
-            classGroupId: props.activeRow.id,
-            subjectId: forms.subjectId
+            classGroupId: props.activeRow.id
           });
 
           emit('close');

src/views/home/modals/chioseModal.tsx

@@ -55,8 +55,7 @@ export default defineComponent({
         if (data.rows && data.rows.length > 0) {
           const res = await courseScheduleStart({
             lessonCoursewareKnowledgeDetailId: forms.chapter,
-            classGroupId: forms.currentClass,
-            subjectId: forms.subjectId
+            classGroupId: forms.currentClass
           });
           emit('close');
           emit('preview', {

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

@@ -49,8 +49,6 @@ export default defineComponent({
     const forms = reactive({
       className: route.query.name as any,
       classGroupId: route.query.classGroupId,
-      preStudentNum: route.query.preStudentNum,
-      courseScheduleSubjectId: route.query.courseScheduleSubjectId,
       // 选取参数带的，后取缓存
       subjectId: route.query.subjectId
         ? Number(route.query.subjectId)
@@ -249,12 +247,11 @@ export default defineComponent({
       }
     };
     const fscreen = () => {
-      const el: any = document.documentElement;
-      const documentDom: any = document;
+      const el = document.documentElement;
       const isFullscreen =
-        documentDom.fullScreen ||
-        documentDom.mozFullScreen ||
-        documentDom.webkitIsFullScreen;
+        document.fullScreen ||
+        document.mozFullScreen ||
+        document.webkitIsFullScreen;
       if (!isFullscreen) {
         //进入全屏
         (el.requestFullscreen && el.requestFullscreen()) ||
@@ -299,16 +296,9 @@ export default defineComponent({
         const localStorageSubjectId = localStorage.getItem(
           'prepareLessonSubjectId'
         );
-        // 先取 上次上课声部，在取班级声部 最后取缓存
         const subjectId =
-          forms.courseScheduleSubjectId ||
-          forms.subjectId ||
-          localStorageSubjectId
-            ? Number(
-                forms.courseScheduleSubjectId ||
-                  forms.subjectId ||
-                  localStorageSubjectId
-              )
+          forms.subjectId || localStorageSubjectId
+            ? Number(forms.subjectId || localStorageSubjectId)
             : null;
         // 判断浏览器上面是否有
         const index = subjectList.findIndex(
@@ -335,7 +325,6 @@ export default defineComponent({
       async () => {
         forms.className = route.query.name as any;
         forms.classGroupId = route.query.classGroupId as any;
-        forms.preStudentNum = route.query.preStudentNum as any;
         forms.subjectId = route.query.subjectId
           ? Number(route.query.subjectId)
           : null;
@@ -653,8 +642,7 @@ export default defineComponent({
                     // 开始上课
                     const res = await courseScheduleStart({
                       lessonCoursewareKnowledgeDetailId: prepareStore.selectKey,
-                      classGroupId: forms.classGroupId,
-                      subjectId: prepareStore.getSubjectId
+                      classGroupId: forms.classGroupId
                     });
                     if (
                       window.matchMedia('(display-mode: standalone)').matches
@@ -670,8 +658,7 @@ export default defineComponent({
                         subjectId: prepareStore.getSubjectId,
                         detailId: prepareStore.getSelectKey,
                         classId: res.data,
-                        lessonCourseId: prepareStore.getBaseCourseware.id,
-                        preStudentNum: forms.preStudentNum
+                        lessonCourseId: prepareStore.getBaseCourseware.id
                       };
                     } else {
                       const { href } = router.resolve({
@@ -682,8 +669,7 @@ export default defineComponent({
                           subjectId: prepareStore.getSubjectId,
                           detailId: prepareStore.getSelectKey,
                           classId: res.data,
-                          lessonCourseId: prepareStore.getBaseCourseware.id,
-                          preStudentNum: forms.preStudentNum
+                          lessonCourseId: prepareStore.getBaseCourseware.id
                         }
                       });
                       window.open(href, +new Date() + '');
@@ -734,13 +720,11 @@ export default defineComponent({
               if (forms.classGroupId) {
                 forms.className = item.name;
                 forms.classGroupId = item.classGroupId;
-                forms.preStudentNum = item.preStudentNum;
                 forms.subjectId = item.subjectId;
-                forms.courseScheduleSubjectId = item.courseScheduleSubjectId;
                 forms.showAttendClass = false;
 
                 prepareStore.setClassGroupId(item.classGroupId);
-                console.log(forms, 'forms', item);
+
                 checkSubjectIds();
                 // 声部切换时
                 eventGlobal.emit('onChangeClass', {
@@ -750,8 +734,7 @@ export default defineComponent({
               } else {
                 const res = await courseScheduleStart({
                   lessonCoursewareKnowledgeDetailId: prepareStore.selectKey,
-                  classGroupId: item.classGroupId,
-                  subjectId: prepareStore.getSubjectId
+                  classGroupId: item.classGroupId
                 });
                 forms.showAttendClass = false;
                 if (window.matchMedia('(display-mode: standalone)').matches) {
@@ -763,7 +746,6 @@ export default defineComponent({
                     type: 'class',
                     classId: res.data, // 上课编号
                     classGroupId: item.classGroupId,
-                    preStudentNum: item.preStudentNum,
                     subjectId: prepareStore.getSubjectId,
                     detailId: prepareStore.getSelectKey,
                     lessonCourseId: prepareStore.getBaseCourseware.id
@@ -778,7 +760,6 @@ export default defineComponent({
                       type: 'class',
                       classId: res.data, // 上课编号
                       classGroupId: item.classGroupId,
-                      preStudentNum: item.preStudentNum,
                       subjectId: prepareStore.getSubjectId,
                       detailId: prepareStore.getSelectKey,
                       lessonCourseId: prepareStore.getBaseCourseware.id

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

@@ -24,7 +24,6 @@ import { evaluateDifficult } from '/src/utils/contants';
 import TrainUpdate from '/src/views/attend-class/model/train-update';
 import AssignHomework from './assign-homework';
 import Trainguide from '@/custom-plugins/guide-page/train-guide';
-import { eventGlobal } from '/src/utils';
 export default defineComponent({
   name: 'courseware-modal',
   setup() {
@@ -69,7 +68,6 @@ export default defineComponent({
         prepareStore.setIsEditTrain(false);
         // 重置临时删除编号
         forms.removeIds = [];
-        await getList();
       } catch {
         //
       }
@@ -187,15 +185,38 @@ export default defineComponent({
       }
     };
 
+    // const checkSubjectIds = () => {
+    //   const subjectList = prepareStore.getSubjectList;
+
+    //   // 并且没有声部时才会更新
+    //   if (subjectList.length > 0) {
+    //     // 判断浏览器上面是否有
+    //     const index = subjectList.findIndex(
+    //       (subject: any) => subject.id == forms.subjectId
+    //     );
+
+    //     // 并且声部在列表中
+    //     if (forms.subjectId && index >= 0) {
+    //       prepareStore.setSubjectId(forms.subjectId);
+    //     } else {
+    //       // 判断是否有缓存
+    //       prepareStore.setSubjectId(subjectList[0].id);
+    //     }
+    //   }
+    // };
+
     onMounted(async () => {
-      await getList();
+      // 获取教材分类列表
+      // await catchStore.getSubjects();
 
-      // 动态添加数据
-      eventGlobal.on('onTrainAddItem', (item: any) => {
-        forms.drag = true;
-        forms.trainList.push(item);
-        prepareStore.setTrainList(forms.trainList);
-      });
+      // const subjectList = catchStore.getSubjectList;
+      // if (subjectList.length > 0 && !prepareStore.getSubjectId) {
+      //   prepareStore.setSubjectId(subjectList[0].id);
+      // }
+      // 获取教材分类列表
+      // checkSubjectIds();
+
+      await getList();
     });
     return () => (
       <div class={styles.coursewareModal}>
@@ -299,22 +320,7 @@ export default defineComponent({
                 !forms.loadingStatus && prepareStore.getTrainList.length <= 0
                   ? styles.emptySection
                   : ''
-              ]}
-              onDragenter={(e: any) => {
-                e.preventDefault();
-              }}
-              onDragover={(e: any) => {
-                e.preventDefault();
-              }}
-              onDrop={(e: any) => {
-                console.log(e, 'e');
-                let dropItem = e.dataTransfer.getData('text');
-                dropItem = dropItem ? JSON.parse(dropItem) : {};
-                // 判断是否有数据
-                if (dropItem.id) {
-                  eventGlobal.emit('onTrainDragItem', dropItem);
-                }
-              }}>
+              ]}>
               {forms.trainList.length > 0 && (
                 <>
                   {forms.drag ? (
@@ -334,9 +340,7 @@ export default defineComponent({
                         item: (element: any) => {
                           const item = element.element;
                           return (
-                            <div
-                              data-id={item.musicId}
-                              class={styles.itemBlock}>
+                            <div data-id={item.id} class={styles.itemBlock}>
                               <TrainType
                                 item={item}
                                 isDelete

src/views/prepare-lessons/components/resource-main/components/select-music/index.tsx

@@ -10,8 +10,6 @@ import { musicSheetPage } from '/src/views/prepare-lessons/api';
 import TrainUpdate from '/src/views/attend-class/model/train-update';
 import requestOrigin from 'umi-request';
 import CardPreview from '/src/components/card-preview';
-import { evaluateDifficult } from '/src/utils/contants';
-import { eventGlobal } from '/src/utils';
 export default defineComponent({
   name: 'share-resources',
   setup() {
@@ -50,11 +48,7 @@ export default defineComponent({
         state.loading = false;
         const tempRows = data.rows || [];
         const temp: any = [];
-
         tempRows.forEach((row: any) => {
-          const index = prepareStore.getTrainList.findIndex(
-            (course: any) => course.musicId === row.id
-          );
           temp.push({
             id: row.id,
             coverImg: row.musicSvg,
@@ -63,8 +57,7 @@ export default defineComponent({
             isCollect: false,
             isSelected: true,
             content: row.id,
-            xmlFileUrl: row.xmlFileUrl,
-            exist: index !== -1 ? true : false // 是否存在
+            xmlFileUrl: row.xmlFileUrl
           });
         });
         state.tableList.push(...temp);
@@ -88,21 +81,6 @@ export default defineComponent({
         onSearch(state.searchGroup);
       }
     );
-    watch(
-      () => prepareStore.trainList,
-      () => {
-        state.tableList.forEach((item: any) => {
-          const index = prepareStore.getTrainList.findIndex(
-            (course: any) => course.musicId === item.id
-          );
-          item.exist = index !== -1 ? true : false; // 是否存在
-        });
-      },
-      {
-        deep: true,
-        immediate: true
-      }
-    );
 
     const throttledFn = useThrottleFn(() => {
       state.pagination.page = state.pagination.page + 1;
@@ -140,32 +118,8 @@ export default defineComponent({
       state.editStatus = true;
     };
 
-    const typeFormat = (trainingType: string, configJson: any) => {
-      let tList: string[] = [];
-
-      if (trainingType === 'EVALUATION') {
-        tList = [
-          `${evaluateDifficult[configJson.evaluateDifficult]}`,
-          '全部小节',
-          // `速度${configJson.evaluateSpeed}`,
-          `${configJson.trainingTimes}分合格`
-        ];
-      } else {
-        tList = [
-          `${configJson.practiceChapterBegin}-${configJson.practiceChapterEnd}小节`,
-          `速度${configJson.practiceSpeed}`,
-          `${configJson.trainingTimes}分钟`
-        ];
-      }
-      return tList;
-    };
-
     onMounted(() => {
       getList();
-
-      eventGlobal.on('onTrainDragItem', (item: any) => {
-        onAdd(item);
-      });
     });
     return () => (
       <div>
@@ -200,8 +154,7 @@ export default defineComponent({
                       isShowAdd
                       isShowCollect={false}
                       item={item}
-                      draggable
-                      // isShowAddDisabled={!prepareStore.getIsEditTrain}
+                      isShowAddDisabled={!prepareStore.getIsEditTrain}
                       disabledMouseHover={false}
                       onClick={() => {
                         if (item.type === 'IMG') return;
@@ -228,26 +181,10 @@ export default defineComponent({
           title="作业设置">
           <TrainUpdate
             item={state.editItem}
-            type="homework"
             onClose={() => (state.editStatus = false)}
-            onConfirm={(item: any) => {
-              // state.editItem = {};
-              // prepareStore.setIsAddTrain(true);
-
-              const tList = typeFormat(
-                item.trainingType,
-                item.trainingConfigJson
-              );
-              //
-              const train = {
-                ...item,
-                id: null,
-                musicName: state.editItem.title,
-                typeList: tList
-              };
-
-              console.log(train, '1212');
-              eventGlobal.emit('onTrainAddItem', train);
+            onConfirm={() => {
+              state.editItem = {};
+              prepareStore.setIsAddTrain(true);
             }}
           />
         </NModal>

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

@@ -40,7 +40,6 @@ export default defineComponent({
     const loading = ref(false);
     // 开始上课
     const onAttendClass = async (item: any) => {
-      // console.log(item, 'onAttendClass');
       try {
         // 判断是否是切换班级
         if (props.type == 'change') {
@@ -49,10 +48,8 @@ export default defineComponent({
               lastUseCoursewareId: item.lessonCoursewareId,
               unit: item.lessonCoursewareKnowledgeDetailId,
               subjectId: item.subjectId,
-              courseScheduleSubjectId: item.courseScheduleSubjectId,
               name: item.name, // 班级名称
-              classGroupId: item.id, // 班级编号
-              preStudentNum: item.preStudentNum
+              classGroupId: item.id // 班级编号
             });
           } else {
             forms.showSubjectClass = true;
@@ -63,8 +60,7 @@ export default defineComponent({
 
         const res = await courseScheduleStart({
           lessonCoursewareKnowledgeDetailId: prepareStore.selectKey,
-          classGroupId: item.id,
-          subjectId: prepareStore.getSubjectId
+          classGroupId: item.id
         });
 
         emit('close');
@@ -74,8 +70,7 @@ export default defineComponent({
           classGroupId: item.id,
           subjectId: prepareStore.getSubjectId,
           detailId: prepareStore.getSelectKey,
-          lessonCourseId: prepareStore.getBaseCourseware.id,
-          preStudentNum: item.preStudentNum
+          lessonCourseId: prepareStore.getBaseCourseware.id
         });
         if (window.matchMedia('(display-mode: standalone)').matches) {
           state.application = window.matchMedia(
@@ -90,12 +85,11 @@ export default defineComponent({
       }
     };
     const fscreen = () => {
-      const el: any = document.documentElement;
-      const documentDom: any = document;
+      const el = document.documentElement;
       const isFullscreen =
-        documentDom.fullScreen ||
-        documentDom.mozFullScreen ||
-        documentDom.webkitIsFullScreen;
+        document.fullScreen ||
+        document.mozFullScreen ||
+        document.webkitIsFullScreen;
       if (!isFullscreen) {
         //进入全屏
         (el.requestFullscreen && el.requestFullscreen()) ||
@@ -104,12 +98,12 @@ export default defineComponent({
           (el.msRequestFullscreen && el.msRequestFullscreen());
       } else {
         //退出全屏
-        documentDom.exitFullscreen
-          ? documentDom.exitFullscreen()
-          : documentDom.mozCancelFullScreen
-          ? documentDom.mozCancelFullScreen()
-          : documentDom.webkitExitFullscreen
-          ? documentDom.webkitExitFullscreen()
+        document.exitFullscreen
+          ? document.exitFullscreen()
+          : document.mozCancelFullScreen
+          ? document.mozCancelFullScreen()
+          : document.webkitExitFullscreen
+          ? document.webkitExitFullscreen()
           : '';
       }
     };
@@ -126,9 +120,9 @@ export default defineComponent({
         const temp: any = [];
         result.forEach((item: any) => {
           // 判断班级里面有学生的
-          // if (item.preStudentNum > 0) {
-          temp.push(item);
-          // }
+          if (item.preStudentNum > 0) {
+            temp.push(item);
+          }
         });
         list.value = temp;
       } catch {

src/views/prepare-lessons/model/select-music/index.tsx

@@ -137,7 +137,7 @@ export default defineComponent({
                           isShowAdd
                           isShowCollect={false}
                           item={item}
-                          // isShowAddDisabled={state.isShowAddDisabled}
+                          isShowAddDisabled={state.isShowAddDisabled}
                           onAdd={() => emit('add', item)}
                           disabledMouseHover={false}
                           onClick={() => {

src/views/preview-window/index.tsx

@@ -63,7 +63,6 @@ export default defineComponent({
                   classGroupId={params.value.classGroupId || ''}
                   lessonCourseId={params.value.lessonCourseId || ''}
                   classId={params.value.classId || ''}
-                  preStudentNum={params.value.preStudentNum}
                   onClose={() => emit('update:show', false)}
                 />
               ) : type.value == 'notation' ? (