黄琪勇 11 months ago
parent
commit
5325b0053d

+ 1 - 1
src/views/attend-class/index.tsx

@@ -1267,7 +1267,7 @@ export default defineComponent({
     watch(columnPos, () => {
       for (let i = 0; i < data.itemList.length; i++) {
         const activeItem = data.itemList[i];
-        if (activeItem.type === 'RHYTHM') {
+        if (['RHYTHM', 'MUSIC'].includes(activeItem.type)) {
           activeItem.iframeRef?.contentWindow?.postMessage(
             { api: 'imagePos', data: columnPos.value },
             '*'

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

@@ -265,6 +265,51 @@ export default defineComponent({
         users.info.id
       );
     }
+    // 清空
+    let workClearBoxDragData: any;
+    let workClearBoxClass: string;
+    if (props.from === 'class') {
+      const users = useUserStore();
+      workClearBoxClass = 'workClearBoxClass_drag';
+      workClearBoxDragData = useDrag(
+        [
+          `${workClearBoxClass}>.n-card-header`,
+          `${workClearBoxClass} .bom_drag`
+        ],
+        workClearBoxClass,
+        toRef(forms, 'removeVisiable1'),
+        users.info.id
+      );
+    }
+    // 清空
+    let workSaveBoxDragData: any;
+    let workSaveBoxClass: string;
+    if (props.from === 'class') {
+      const users = useUserStore();
+      workSaveBoxClass = 'workSaveBoxClass_drag';
+      workSaveBoxDragData = useDrag(
+        [`${workSaveBoxClass}>.n-card-header`, `${workSaveBoxClass} .bom_drag`],
+        workSaveBoxClass,
+        toRef(forms, 'preSaveVisiable'),
+        users.info.id
+      );
+    }
+    // 立即布置
+    let workArrangeImmediatelyBoxDragData: any;
+    let workArrangeImmediatelyBoxClass: string;
+    if (props.from === 'class') {
+      const users = useUserStore();
+      workArrangeImmediatelyBoxClass = 'workArrangeImmediatelyBoxClass_drag';
+      workArrangeImmediatelyBoxDragData = useDrag(
+        [
+          `${workArrangeImmediatelyBoxClass}>.n-card-header`,
+          `${workArrangeImmediatelyBoxClass} .bom_drag`
+        ],
+        workArrangeImmediatelyBoxClass,
+        toRef(forms, 'assignHomeworkStatus'),
+        users.info.id
+      );
+    }
     return () => (
       <div class={styles.coursewareModal}>
         <div class={styles.btnGroup}>
@@ -522,10 +567,19 @@ export default defineComponent({
 
         {/* 添加自定义教材 */}
         <NModal
+          style={
+            props.from === 'class'
+              ? workArrangeImmediatelyBoxDragData.styleDrag.value
+              : {}
+          }
           v-model:show={forms.assignHomeworkStatus}
           preset="card"
           showIcon={false}
-          class={['modalTitle background', styles.assignHomework]}
+          class={[
+            'modalTitle background',
+            styles.assignHomework,
+            workArrangeImmediatelyBoxClass
+          ]}
           title={'布置作业'}
           blockScroll={false}>
           <AssignHomework
@@ -547,14 +601,18 @@ export default defineComponent({
               }
             }}
           />
+          {props.from === 'class' && <Dragbom class={styles.dragbom}></Dragbom>}
         </NModal>
 
         {/* {showGuide.value ? <Trainguide></Trainguide> : null} */}
 
         <NModal
+          style={
+            props.from === 'class' ? workClearBoxDragData.styleDrag.value : {}
+          }
           v-model:show={forms.removeVisiable1}
           preset="card"
-          class={['modalTitle', styles.removeVisiable1]}
+          class={['modalTitle', styles.removeVisiable1, workClearBoxClass]}
           title={'清空资源'}>
           <div class={styles.studentRemove}>
             <p>
@@ -581,12 +639,16 @@ export default defineComponent({
               </NButton>
             </NSpace>
           </div>
+          {props.from === 'class' && <Dragbom class={styles.dragbom}></Dragbom>}
         </NModal>
 
         <NModal
+          style={
+            props.from === 'class' ? workSaveBoxDragData.styleDrag.value : {}
+          }
           v-model:show={forms.preSaveVisiable}
           preset="card"
-          class={['modalTitle', styles.removeVisiable1]}
+          class={['modalTitle', styles.removeVisiable1, workSaveBoxClass]}
           title={'保存'}>
           <TheMessageDialog
             content="是否保存当前页面编辑内容?"
@@ -595,6 +657,7 @@ export default defineComponent({
             onClose={() => (forms.preSaveVisiable = false)}
             onConfirm={() => onPreSave()}
           />
+          {props.from === 'class' && <Dragbom class={styles.dragbom}></Dragbom>}
         </NModal>
       </div>
     );