修改显示

dev-dist/sw.js

@@ -82,7 +82,7 @@ define(['./workbox-88bf3160'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.l07eibm7mu"
+    "revision": "0.p99gqg6pck"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {

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

@@ -1,7 +1,7 @@
 .musicScore {
   width: 100%;
   height: 518px;
-  background-color: #213793;
+  background-color: #234892;
 
   iframe {
     width: inherit;

src/views/attend-class/component/audio-pay.tsx

@@ -32,6 +32,10 @@ export default defineComponent({
       type: Boolean,
       default: false
     },
+    showModel: {
+      type: Boolean,
+      default: false
+    },
     imagePos: {
       type: String,
       default: 'left'
@@ -48,6 +52,7 @@ export default defineComponent({
       durationNum: 0,
       duration: '00:00',
       showBar: true,
+      showAction: true,
       afterMa3: true,
       count: 0,
       previousBytesLoaded: 0,
@@ -154,6 +159,14 @@ export default defineComponent({
       }
     );
 
+    watch(
+      () => props.showModel,
+      () => {
+        // console.log(props.showModel, 'props.showModel')
+        audioForms.showAction = props.showModel;
+      }
+    );
+
     const calculateSpeed = (element: any) => {
       let previousBytesLoaded = 0;
       let timer: any = null;
@@ -504,14 +517,14 @@ export default defineComponent({
         <div
           class={[
             styles.controls,
-            audioForms.showBar ? '' : styles.sectionAnimate
+            audioForms.showAction ? '' : styles.sectionAnimate
           ]}
           onClick={(e: MouseEvent) => {
             e.stopPropagation();
             emit('reset');
           }}>
           <div class={styles.slider}>
-            <div class={styles.time}>
+          {props.imagePos !== 'right' &&  <div class={styles.time}>
               <div
                 class="plyr__time plyr__time--current"
                 aria-label="Current time">
@@ -523,7 +536,7 @@ export default defineComponent({
                 aria-label="Duration">
                 {audioForms.duration}
               </div>
-            </div>
+            </div>}
 
             <NSlider
               value={audioForms.currentTimeNum}
@@ -536,6 +549,19 @@ export default defineComponent({
                 audioForms.currentTime = timeFormat(Math.round(val || 0));
               }}
             />
+            {props.imagePos === 'right' &&  <div class={[styles.time, styles.rightTime]}>
+              <div
+                class="plyr__time plyr__time--current"
+                aria-label="Current time">
+                {audioForms.currentTime}
+              </div>
+              <span class={styles.line}>/</span>
+              <div
+                class="plyr__time plyr__time--duration"
+                aria-label="Duration">
+                {audioForms.duration}
+              </div>
+            </div>}
           </div>
           <div class={styles.tools}>
             {props.imagePos === 'right' ? (

src/views/attend-class/component/audio.module.less

@@ -78,13 +78,17 @@
     font-weight: 600;
     line-height: 33px;
 
+    &.rightTime {
+      padding: 4px 0 4px 20px;
+    }
+
     & > div {
       font-size: 20px !important;
       color: rgba(255, 255, 255);
     }
 
     .line {
-      font-size: 12px;
+      font-size: 20px;
     }
 
     :global {

src/views/attend-class/component/video-play.tsx

@@ -582,19 +582,19 @@ export default defineComponent({
             emit('reset');
           }}>
           <div class={styles.slider}>
-            <div class={styles.time}>
-                      <div
-                        class="plyr__time plyr__time--current"
-                        aria-label="Current time">
-                        {videoFroms.currentTime}
-                      </div>
-                      <span class={styles.line}>/</span>
-                      <div
-                        class="plyr__time plyr__time--duration"
-                        aria-label="Duration">
-                        {videoFroms.duration}
-                      </div>
-                    </div>
+            {props.imagePos !== 'right' && <div class={styles.time}>
+              <div
+                class="plyr__time plyr__time--current"
+                aria-label="Current time">
+                {videoFroms.currentTime}
+              </div>
+              <span class={styles.line}>/</span>
+              <div
+                class="plyr__time plyr__time--duration"
+                aria-label="Duration">
+                {videoFroms.duration}
+              </div>
+            </div>}
             <NSlider
               value={videoFroms.currentTimeNum}
               step={0.01}
@@ -607,6 +607,19 @@ export default defineComponent({
                 videoFroms.currentTime = timeFormat(Math.round(val || 0));
               }}
             />
+            {props.imagePos === 'right' && <div class={[styles.time, styles.rightTime]}>
+                      <div
+                        class="plyr__time plyr__time--current"
+                        aria-label="Current time">
+                        {videoFroms.currentTime}
+                      </div>
+                      <span class={styles.line}>/</span>
+                      <div
+                        class="plyr__time plyr__time--duration"
+                        aria-label="Duration">
+                        {videoFroms.duration}
+                      </div>
+                    </div>}
           </div>
           <div class={styles.tools}>
             {props.imagePos === 'right' ? (

src/views/attend-class/component/video.module.less

@@ -48,6 +48,9 @@
       font-size: 24px;
       font-weight: 600;
       line-height: 33px;
+      &.rightTime {
+        padding: 4px 0 4px 20px;
+      }
 
       &>div {
         font-size: 20px !important;

src/views/attend-class/index.tsx

@@ -1834,6 +1834,7 @@ export default defineComponent({
                         <AudioPay
                           imagePos={columnPos.value}
                           item={m}
+                          showModel={activeData.model}
                           activeStatus={popupData.activeIndex === mIndex}
                           ref={(v: any) => (data.audioRefs[mIndex] = v)}
                           onLoadedmetadata={(audioItem: any) => {

src/views/prepare-lessons/components/directory-main/select-lessonware/index.module.less

@@ -88,7 +88,7 @@
   max-height: 70vh;
 
   .content {
-    min-height: 60vh;
+    // min-height: 60vh;
     padding: 22px 40px;
   }
 
@@ -315,13 +315,13 @@
   background: #fff;
   border-radius: 8px;
   padding: 4px 20px;
-  font-size: max(17px, 12px);
+  font-size: max(17px, 13Px);
   color: rgba(0, 0, 0, 0.6);
   cursor: pointer;
   display: flex;
   align-items: center;
   font-weight: 500;
-  line-height: 24px;
+  line-height: max(24px, 20Px);
 
   .iconArrow {
     display: inline-block;

src/views/studentList/components/evaluationRecords.tsx

@@ -320,6 +320,9 @@ export default defineComponent({
               type="daterange"
               startPlaceholder="生成开始时间"
               endPlaceholder="生成结束时间"
+              {...({
+                clearable: true
+              } as any)}
               timerValue={state.searchForm.musicStartTime}></CDatePicker>
           </NFormItem>
 

src/views/studentList/index.module.less

@@ -15,7 +15,7 @@
 .datePicker {
   :global {
     .n-input {
-      width: 290px !important;
+      width: 320px !important;
     }
   }
 }

src/views/xiaoku-music/index.module.less

@@ -530,7 +530,7 @@
   .previewIframe {
     width: 100%;
     height: 85vh;
-    background-color: #213793;
+    background-color: #234892;
     border-radius: 16px;
   }
 }