更新

public/roll-call/css/index.css

@@ -148,6 +148,7 @@ a {
   border: none;
   cursor: pointer;
   transition: opacity 0.2s ease;
+  margin: 0 20px;
 }
 #backBtn:hover {
   opacity: 0.9;

public/roll-call/index.html

@@ -27,7 +27,7 @@
 
   <div id="container" style="pointer-events: none;"></div>
   <div id="vueBoxs">
-    <div class="bss">
+    <div class="bss" @dblclick="start()">
       <div class="pageTitle"></div>
       <div v-if="platform!=='modal'"  class="iconBack" @click="onBack()"></div>
       <div id="menu" :class="[platform==='modal'?(imagePos==='right'?'menuRight':'menuLeft'):'']">

src/components/card-preview/index.module.less

@@ -23,6 +23,7 @@
     position: absolute;
     left: 0;
     bottom: 0;
+    z-index: 1;
     >div{
       background: url("@/views/attend-class/image/leftBom.png") no-repeat !important;
       background-size: 100% 100% !important;

src/components/card-preview/index.tsx

@@ -98,7 +98,7 @@ export default defineComponent({
             item.value.type === 'PPT' && styles.maxCard,
             props.size === 'large' && styles.cardLarge
           ]}
-          title={item.value.title}
+          title={item.value.type === 'MUSIC' ? '曲目预览' : item.value.title}
           blockScroll={false}>
           {item.value.type === 'VIDEO' && (
             <VideoModal

src/components/card-preview/music-modal/index.tsx

@@ -26,7 +26,7 @@ export default defineComponent({
     //   : location.origin;
     const src = `${vaildMusicScoreUrl()}/instrument?v=${+new Date()}&modelType=practise&id=${
       props.item.content
-    }&Authorization=${userStore.getToken}&platform=pc`;
+    }&Authorization=${userStore.getToken}&platform=pc&zoom=0.8`;
     return () => (
       <div class={styles.musicScore}>
         <iframe

src/components/layout/index.module.less

@@ -415,9 +415,9 @@
   box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.1);
   border-radius: 20px;
   display: flex;
-  flex-direction: column;
+  //flex-direction: column;
   // flex-direction: row;
-  // align-items: center;
+  align-items: center;
   padding: 16px 20px;
   justify-content: space-between;
 
@@ -425,7 +425,7 @@
     display: flex;
 
     &:last-child {
-      margin-top: 16px;
+      // margin-top: 16px;
     }
   }
 

src/components/layout/index.tsx

@@ -675,12 +675,12 @@ export default defineComponent({
                 <img src={beatIcon} alt="" />
                 节拍器
               </div>
-              <div
+              {/* <div
                 class={styles.booxToolItem}
                 onClick={() => startShowModal('toneIcon')}>
                 <img src={toneIcon} alt="" />
                 调音器
-              </div>
+              </div> */}
               <div
                 class={styles.booxToolItem}
                 onClick={() => startShowModal('setTimeIcon')}>

src/custom-plugins/guide-page/home-guide.tsx

@@ -142,7 +142,9 @@ export default defineComponent({
             bottom: '30px',
             left: px2vw(8)
           },
-          boxStyle: {},
+          boxStyle: {
+            borderRadius: '1.6rem'
+          },
           eleRectPadding: {
             left: 7,
             top: 9,

src/custom-plugins/guide-page/lessons-guide.tsx

@@ -48,7 +48,7 @@ export default defineComponent({
             left: 7,
             top: 7,
             width: 14,
-            height: 14
+            height: -18
           }
         }
       ],

src/hooks/useDrag/dragbom.jsx

@@ -36,6 +36,7 @@ export default defineComponent({
         </div>
         {guidanceShow.value && (
           <div
+            onClick={setGuidanceShow}
             class={[
               styles.guide,
               data.guidePos === 'top' && styles.guideTop,
@@ -43,7 +44,12 @@ export default defineComponent({
               'bom_guide'
             ]}>
             <div class={styles.guideBg}></div>
-            <div class={styles.guideDone} onClick={setGuidanceShow}></div>
+            <div
+              class={styles.guideDone}
+              onClick={e => {
+                e.stopPropagation();
+                setGuidanceShow();
+              }}></div>
           </div>
         )}
       </>

src/hooks/useDrag/index.ts

@@ -65,9 +65,18 @@ export default function useDrag(
     // 有缓存 用缓存的值，没有缓存用默认
     if (posCache) {
       pos.value = posCache;
+      nextTick(() => {
+        const _itme = setTimeout(() => {
+          clearTimeout(_itme);
+          refreshPos();
+        }, 300);
+      });
     }
   }
   function refreshPos() {
+    if (pos.value.left === -1 && pos.value.top === -1) {
+      return;
+    }
     const boxClassDom = document.querySelector(`.${boxClass}`) as HTMLElement;
     if (!boxClassDom) return;
     const parentElementRect = boxClassDom.getBoundingClientRect();

src/views/attend-class/component/tools/pen.module.less

@@ -92,6 +92,7 @@
       position: absolute;
       bottom: 0;
       left: 0;
+      z-index: 1;
     }
     .n-card-header {
       font-size: max(22px, 16Px);

src/views/attend-class/component/tools/pen.tsx

@@ -53,7 +53,7 @@ export default defineComponent({
     let src = `${origin}/classroom-whiteboard?t=${+new Date()}`;
 
     if (props.type === 'call') {
-      src = `${origin}/roll-call/index.html?t=${+new Date()}&platform=modal&imagePos=${
+      src = `http://localhost:5002/roll-call/index.html?t=${+new Date()}&platform=modal&imagePos=${
         props.imagePos
       }`;
     }
@@ -90,7 +90,7 @@ export default defineComponent({
             if (props.type === 'call') {
               const iframeRef: any = document.getElementById(penIframeRefId);
               if (iframeRef && iframeRef.contentWindow.renderData) {
-                iframeRef.contentWindow.renderData(props.callStudents);
+                iframeRef.contentWindow.renderData([...props.callStudents,...props.callStudents]);
               }
             }
             iframeDislableKeyboard(val.target);

src/views/attend-class/index.module.less

@@ -276,6 +276,7 @@
         position: absolute;
         bottom: 0;
         left: 0;
+        z-index: 1;
       }
     }
   }
@@ -536,6 +537,7 @@
       position: absolute;
       bottom: 0;
       left: 0;
+      z-index: 1;
     }
     .n-card-header {
       font-size: max(22px, 16Px);
@@ -789,6 +791,7 @@
       position: absolute;
       bottom: 0;
       left: 0;
+      z-index: 1;
     }
   }
 }
@@ -798,6 +801,7 @@
       position: absolute;
       bottom: 0;
       left: 0;
+      z-index: 1;
     }
   }
 }
@@ -836,7 +840,7 @@
       text-align: left;
       position: relative;
       font-weight: 600;
-      font-size: 18px;
+      font-size: 22px;
       color: #131415;
       padding-left: 30px;
       &::before{

src/views/attend-class/index.tsx

@@ -1877,18 +1877,25 @@ export default defineComponent({
             </div>
           ))}
         </div>
-        <div
-          class={[
-            styles.rightHideIcon,
-            !(columnShow.value && columnPos.value === 'right')
-              ? styles.rightIconShow
-              : ''
-          ]}
-          onClick={() => {
-            columnPos.value = 'right';
-            columnShow.value = true;
+        <NTooltip showArrow={false} placement="left">
+          {{
+            trigger: () => (
+              <div
+                class={[
+                  styles.rightHideIcon,
+                  !(columnShow.value && columnPos.value === 'right')
+                    ? styles.rightIconShow
+                    : ''
+                ]}
+                onClick={() => {
+                  columnPos.value = 'right';
+                  columnShow.value = true;
+                }}
+              />
+            ),
+            default: () => '按钮镜像'
           }}
-        />
+        </NTooltip>
         {/* 左边操作栏 */}
         <div
           class={[
@@ -1937,18 +1944,25 @@ export default defineComponent({
             </div>
           ))}
         </div>
-        <div
-          class={[
-            styles.leftHideIcon,
-            !(columnShow.value && columnPos.value === 'left')
-              ? styles.leftIconShow
-              : ''
-          ]}
-          onClick={() => {
-            columnPos.value = 'left';
-            columnShow.value = true;
+        <NTooltip showArrow={false} placement="right">
+          {{
+            trigger: () => (
+              <div
+                class={[
+                  styles.leftHideIcon,
+                  !(columnShow.value && columnPos.value === 'left')
+                    ? styles.leftIconShow
+                    : ''
+                ]}
+                onClick={() => {
+                  columnPos.value = 'left';
+                  columnShow.value = true;
+                }}
+              />
+            ),
+            default: () => '按钮镜像'
           }}
-        />
+        </NTooltip>
 
         {/* 显示列表 */}
         {/* <NDrawer

src/views/attend-class/model/chapter/index.module.less

@@ -26,7 +26,6 @@
     padding-top: 10px;
     width: 60%;
     height: 100%;
-    box-shadow: 0px 12px 18px 0px rgba(217,221,223,0.45);
   }
 }
 .treeParentSelect {
@@ -43,9 +42,18 @@
   border-radius: 10px;
   cursor: pointer;
   border-radius: 10px;
-  font-size: max(18px, 12Px);
+  font-size: max(20px, 12Px);
   font-weight: 600;
-
+  margin-bottom: 10px;
+  &:hover{
+    .dir {
+      background: url('./images/icon-d-active.png') no-repeat center !important;
+      background-size: contain !important;
+    }
+    .name{
+      color: #198CFE;
+    }
+  }
   &.childItem:hover {
     // background: #E8F4FF;
     .titleName {
@@ -87,7 +95,8 @@
   }
 
   &.childItem {
-    font-size: max(16px, 12Px);
+    margin-bottom: 0;
+    font-size: max(18px, 12Px);
     .titleName {
       width: 100%;
       overflow: hidden;

src/views/attend-class/model/select-class/index.module.less

@@ -3,8 +3,8 @@
 }
 
 .selectClassScroll {
-  min-height: 46vh;
-  max-height: 46vh;
+  min-height: 40vh;
+  max-height: 40vh;
 
 }
 
@@ -24,7 +24,7 @@
   &.listEmpty {
     display: flex;
     align-items: center;
-    min-height: 46vh;
+    min-height: 40vh;
   }
 
 

src/views/attend-class/model/source-list/index.module.less

@@ -79,6 +79,7 @@
       width: 33.33%;
       height: 112px;
       padding: 0 6px;
+      margin-bottom: 10px;
       :global{
         .card-section-container{
           width: 100% !important;

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

@@ -70,6 +70,7 @@
       position: absolute;
       left: 0;
       bottom: 0;
+      z-index: 1;
     }
   }
 }

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

@@ -45,5 +45,6 @@
     position: absolute;
     left: 0;
     bottom: 0;
+    z-index: 1;
   }
 }

src/views/prepare-lessons/components/resource-main/index.module.less

@@ -84,6 +84,7 @@
       position: absolute;
       left: 0;
       bottom: 0;
+      z-index: 1;
     }
   }
 }