Merge branch 'master' into online

dev-dist/sw.js

@@ -82,7 +82,7 @@ define(['./workbox-5357ef54'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.47gcrkadlb"
+    "revision": "0.ibpgg9upns"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {

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

@@ -296,7 +296,7 @@ export default defineComponent({
                   </NButton>
                 </NSpace>
               </NFormItem>
-              <NFormItem
+              {/* <NFormItem
                 label="评测速度"
                 path="evaluationSpeed"
                 rule={[
@@ -316,7 +316,7 @@ export default defineComponent({
                   placeholder="评测速度范围60~270"
                   clearable
                 />
-              </NFormItem>
+              </NFormItem> */}
               <NFormItem
                 label="合格分数"
                 path="evaluationScore"

src/views/data-module/index.module.less

@@ -1,7 +1,7 @@
 @img: '../setting/images';
 
 .listWrap {
-  min-height: 805px;
+  min-height: 100%;
   padding: 32px;
   background-color: #fff;
   border-radius: 20px;

src/views/data-module/index.tsx

@@ -67,70 +67,68 @@ export default defineComponent({
       }, 500);
     });
     return () => (
-      <div>
-        <div class={styles.listWrap}>
-          <NTabs
-            onUpdate:value={(val: any) => setTabs(val)}
-            class={styles.customTabs}
-            v-model:value={activeTab.value}
-            size="large"
-            animated
-            pane-wrapper-style="margin: 0 -4px"
-            pane-style="padding-left: 4px; padding-right: 4px; box-sizing: border-box;"
-            v-Slots={{
-              suffix: () => (
-                <>
-                  <div class={styles.homeStudyInfoDate}>
-                    <NSpace>
-                      <CDatePicker
-                        {...{ clearable: false }}
-                        v-model:value={timer.value}
-                        separator={'-'}
-                        type="daterange"
-                        timerValue={timer.value}></CDatePicker>
-                      <NButton
-                        type="primary"
-                        class={styles.searchBtn}
-                        onClick={() => onSearch()}>
-                        搜索
-                      </NButton>
-                      <NButton
-                        type="primary"
-                        onClick={() => onReset()}
-                        ghost
-                        class={styles.resetBtn}>
-                        重置
-                      </NButton>
-                    </NSpace>
-                  </div>
-                </>
-              )
-            }}>
-            <NTabPane
-              name="training"
-              tab="训练统计"
-              v-slots={{ tab: () => <span id="data-0">训练统计</span> }}>
-              <TrainData ref={TrainDataRef} timer={timer.value}></TrainData>
-            </NTabPane>
-            <NTabPane
-              name="practice"
-              tab="练习数据"
-              v-slots={{ tab: () => <span id="data-1">练习数据</span> }}>
-              <PracticeData
-                ref={PracticeDataRef}
-                timer={timer.value}></PracticeData>
-            </NTabPane>
-            <NTabPane
-              name="ranking"
-              tab="练习排行"
-              v-slots={{ tab: () => <span id="data-2">练习排行</span> }}>
-              <PracticeRanking
-                ref={PracticeRankingRef}
-                timer={timer.value}></PracticeRanking>
-            </NTabPane>
-          </NTabs>
-          {showGuide.value ? <DataGuide></DataGuide> : null}
-        </div>
+      <div class={styles.listWrap}>
+        <NTabs
+          onUpdate:value={(val: any) => setTabs(val)}
+          class={styles.customTabs}
+          v-model:value={activeTab.value}
+          size="large"
+          animated
+          pane-wrapper-style="margin: 0 -4px"
+          pane-style="padding-left: 4px; padding-right: 4px; box-sizing: border-box;"
+          v-Slots={{
+            suffix: () => (
+              <>
+                <div class={styles.homeStudyInfoDate}>
+                  <NSpace>
+                    <CDatePicker
+                      {...{ clearable: false }}
+                      v-model:value={timer.value}
+                      separator={'-'}
+                      type="daterange"
+                      timerValue={timer.value}></CDatePicker>
+                    <NButton
+                      type="primary"
+                      class={styles.searchBtn}
+                      onClick={() => onSearch()}>
+                      搜索
+                    </NButton>
+                    <NButton
+                      type="primary"
+                      onClick={() => onReset()}
+                      ghost
+                      class={styles.resetBtn}>
+                      重置
+                    </NButton>
+                  </NSpace>
+                </div>
+              </>
+            )
+          }}>
+          <NTabPane
+            name="training"
+            tab="训练统计"
+            v-slots={{ tab: () => <span id="data-0">训练统计</span> }}>
+            <TrainData ref={TrainDataRef} timer={timer.value}></TrainData>
+          </NTabPane>
+          <NTabPane
+            name="practice"
+            tab="练习数据"
+            v-slots={{ tab: () => <span id="data-1">练习数据</span> }}>
+            <PracticeData
+              ref={PracticeDataRef}
+              timer={timer.value}></PracticeData>
+          </NTabPane>
+          <NTabPane
+            name="ranking"
+            tab="练习排行"
+            v-slots={{ tab: () => <span id="data-2">练习排行</span> }}>
+            <PracticeRanking
+              ref={PracticeRankingRef}
+              timer={timer.value}></PracticeRanking>
+          </NTabPane>
+        </NTabs>
+        {showGuide.value ? <DataGuide></DataGuide> : null}
       </div>
     );
   }

src/views/home/index.module.less

@@ -4,6 +4,7 @@
   // align-items: center;
   // justify-content: space-between;
   align-content: stretch;
+  // min-height: 100%;
 }
 
 .homeInfoLeft {

src/views/home/index.tsx

@@ -258,7 +258,7 @@ export default defineComponent({
         const { data } = await courseSchedulePage({
           classGroupId: forms.classSelect.currentClass,
           page: 1,
-          rows: 6,
+          rows: 4,
           teacherId: userStore.getUserInfo.id
         });
 
@@ -663,7 +663,7 @@ export default defineComponent({
                       list={teachList.value[key]}
                       keys={key}></TeachGroup>
                   ))}
-                  {forms.total > 6 && (
+                  {forms.total > 4 && (
                     <div class={styles.teachListWrapWall}>
                       <span
                         onClick={() => {

src/views/natural-resources/index.module.less

@@ -2,6 +2,7 @@
   padding: 32px 20px;
   background-color: #fff;
   border-radius: 20px;
+  min-height: 100%;
   // min-height: calc(100% - 104px);
 
   :global {

src/views/prepare-lessons/index.module.less

@@ -2,7 +2,7 @@
   display: flex;
   // padding: 32px;
   // padding-bottom: 32px;
-  height: calc(100vh - 128px);
+  min-height: 100%;
 
 
   .directoryMain,

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

@@ -3,6 +3,7 @@
   flex-direction: column;
   background: #FFFFFF;
   border-radius: 20px;
+  min-height: 100%;
 }
 
 .tools {
@@ -160,4 +161,4 @@
     color: #333;
     text-align: center;
   }
-}
+}

src/views/xiaoku-music/component/play-item/index.tsx

@@ -82,6 +82,7 @@ export default defineComponent({
         }
       }
     );
+
     return () => (
       <div class={[styles.container, props.show ? styles.show : styles.hidden]}>
         <div class={[styles.item]}>
@@ -90,7 +91,10 @@ export default defineComponent({
               lazy
               objectFit="cover"
               previewDisabled={true}
-              src={props.item.titleImg}
+              src={
+                props.item.titleImg ||
+                'https://gyt.ks3-cn-beijing.ksyuncs.com/07/1690789356356.png'
+              }
               onLoad={e => {
                 (e.target as any).dataset.loaded = 'true';
               }}

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

@@ -179,14 +179,16 @@
 
     :global {
       .n-image {
-        width: 100%;
-        height: 100%;
+        width: 60px;
+        height: 60px;
       }
     }
 
     img {
       transition: opacity .3s;
       opacity: 0;
+      height: 100%;
+      width: 100%;
     }
 
     img[data-loaded="true"] {