lex před 1 rokem
rodič
revize
464bab0223

+ 2 - 2
src/components/TheSearch/index.module.less

@@ -32,8 +32,8 @@
 
   .active,
   .default {
-    width: max(18px, 16px);
-    height: max(18px, 16px);
+    width: max(16px, 14Px);
+    height: max(16px, 14Px);
   }
 
   &:global(.n-input--focus) {

+ 4 - 0
src/styles/index.less

@@ -372,6 +372,10 @@ body {
   padding: 0;
 }
 
+.n-breadcrumb .n-breadcrumb-item {
+  font-size: max(16px, 12Px) !important;
+}
+
 .n-base-selection,
 .n-input {
   --n-height: max(40px, 36Px) !important;

+ 10 - 10
src/views/home/components/practiceData.tsx

@@ -116,8 +116,6 @@ export default defineComponent({
           return item.practiceUserCount;
         });
 
-        console.log('trainingStatDetailList', payForm.timeList);
-
         setChart();
       } catch (e) {
         console.log(e);
@@ -243,12 +241,14 @@ export default defineComponent({
             <div class={styles.TrainDataTopLeft}>
               <div class={styles.TrainDataItem}>
                 <p class={styles.TrainDataItemTitle}>
-                  <span>
-                    <NNumberAnimation
-                      from={0}
-                      to={payForm.practiceUserCount}></NNumberAnimation>
-                  </span>
-                  人
+                  <div>
+                    <span>
+                      <NNumberAnimation
+                        from={0}
+                        to={payForm.practiceUserCount}></NNumberAnimation>
+                    </span>
+                    人
+                  </div>
                 </p>
                 <p class={styles.TrainDataItemsubTitle}>练习人数</p>
               </div>
@@ -262,7 +262,7 @@ export default defineComponent({
                           to={getMinutes(
                             payForm.practiceDurationAvg
                           )}></NNumberAnimation>
-                      </span>{' '}
+                      </span>
                     </div>
                   ) : null}
@@ -273,7 +273,7 @@ export default defineComponent({
                         to={getSecend(
                           payForm.practiceDurationAvg
                         )}></NNumberAnimation>
-                    </span>{' '}
+                    </span>
                   </div>
                 </p>

+ 56 - 41
src/views/home/components/trainData.tsx

@@ -406,74 +406,89 @@ export default defineComponent({
             <div class={styles.TrainDataTopLeft}>
               <div class={styles.TrainDataItem}>
                 <p class={styles.TrainDataItemTitle}>
-                  <span>
-                    <NNumberAnimation
-                      from={0}
-                      to={totalDateRef.value.trainingCount}></NNumberAnimation>
-                  </span>
-                  次
+                  <div>
+                    <span>
+                      <NNumberAnimation
+                        from={0}
+                        to={
+                          totalDateRef.value.trainingCount
+                        }></NNumberAnimation>
+                    </span>
+                    次
+                  </div>
                 </p>
                 <p class={styles.TrainDataItemsubTitle}>作业次数</p>
               </div>
               <div class={styles.TrainDataItem}>
                 <p class={styles.TrainDataItemTitle}>
-                  <span>
-                    <NNumberAnimation
-                      from={0}
-                      to={
-                        totalDateRef.value.totalStudentCount
-                      }></NNumberAnimation>
-                  </span>
-                  人次
+                  <div>
+                    <span>
+                      <NNumberAnimation
+                        from={0}
+                        to={
+                          totalDateRef.value.totalStudentCount
+                        }></NNumberAnimation>
+                    </span>
+                    人次
+                  </div>
                 </p>
                 <p class={styles.TrainDataItemsubTitle}>应交总人次</p>
               </div>
               <div class={styles.TrainDataItem}>
                 <p class={styles.TrainDataItemTitle}>
-                  <span>
-                    <NNumberAnimation
-                      from={0}
-                      to={
-                        totalDateRef.value.submitStudentCount
-                      }></NNumberAnimation>
-                  </span>
-                  人次
+                  <div>
+                    <span>
+                      <NNumberAnimation
+                        from={0}
+                        to={
+                          totalDateRef.value.submitStudentCount
+                        }></NNumberAnimation>
+                    </span>
+                    人次
+                  </div>
                 </p>
                 <p class={styles.TrainDataItemsubTitle}>提交总人次</p>
               </div>
               <div class={styles.TrainDataItem}>
                 <p class={styles.TrainDataItemTitle}>
-                  <span>
-                    {' '}
-                    <NNumberAnimation
-                      from={0}
-                      to={
-                        totalDateRef.value.qualifiedStudentCount
-                      }></NNumberAnimation>
-                  </span>
-                  人次
+                  <div>
+                    <span>
+                      <NNumberAnimation
+                        from={0}
+                        to={
+                          totalDateRef.value.qualifiedStudentCount
+                        }></NNumberAnimation>
+                    </span>
+                    人次
+                  </div>
                 </p>
                 <p class={styles.TrainDataItemsubTitle}>合格总人次</p>
               </div>
               <div class={styles.TrainDataItem}>
                 <p class={styles.TrainDataItemTitle}>
-                  <span>
-                    <NNumberAnimation
-                      from={0}
-                      to={totalDateRef.value.trainingRate}></NNumberAnimation>
+                  <div>
+                    <span>
+                      <NNumberAnimation
+                        from={0}
+                        to={totalDateRef.value.trainingRate}></NNumberAnimation>
+                    </span>
                     %
-                  </span>
+                  </div>
                 </p>
                 <p class={styles.TrainDataItemsubTitle}>作业提交率</p>
               </div>
               <div class={styles.TrainDataItem}>
                 <p class={styles.TrainDataItemTitle}>
-                  <span>
-                    <NNumberAnimation
-                      from={0}
-                      to={totalDateRef.value.qualifiedRate}></NNumberAnimation>
+                  <div>
+                    <span>
+                      <NNumberAnimation
+                        from={0}
+                        to={
+                          totalDateRef.value.qualifiedRate
+                        }></NNumberAnimation>
+                    </span>
                     %
-                  </span>
+                  </div>
                 </p>
                 <p class={styles.TrainDataItemsubTitle}>作业合格率</p>
               </div>

+ 5 - 6
src/views/home/index2.module.less

@@ -473,17 +473,16 @@
           display: flex;
           flex-direction: row;
           align-items: center;
-          text-align: center;
-          font-size: 13px;
+          font-size: max(13px, 11Px);
           font-weight: 400;
-          color: #777777;
+          color: #131415;
           line-height: 18px;
           width: 100%;
-          justify-content: center;
+          justify-content: flex-start;
 
           span {
             font-family: 'DINA';
-            font-size: 26px;
+            font-size: max(26px, 18Px);
             font-weight: 600;
             color: #131415;
             line-height: 28px;
@@ -493,7 +492,7 @@
         .TrainDataItemsubTitle {
           margin-top: 4px;
           text-align: center;
-          font-size: 13px;
+          font-size: max(14px, 11Px);
           font-family: PingFangSC-Regular, PingFang SC;
           font-weight: 400;
           color: #777777;

+ 24 - 4
src/views/xiaoku-music/index.module.less

@@ -9,6 +9,10 @@
   }
 
   :global {
+    .n-breadcrumb .n-breadcrumb-item {
+      font-size: max(16px, 12Px) !important;
+    }
+
     .n-breadcrumb>ul {
       display: flex;
       align-items: center;
@@ -87,6 +91,21 @@
       height: 100%;
       line-height: 100%;
     }
+
+
+    .n-button {
+      --n-height: 37px !important;
+      height: 37px;
+      padding: 0 24px;
+      font-size: max(18px, 13Px);
+
+      &.n-button--primary-type {
+        font-weight: bold !important;
+        color: #fff;
+      }
+    }
+
+
   }
 }
 
@@ -207,7 +226,7 @@
     height: 60px;
     border-radius: 8px;
     margin-right: 12px;
-    box-shadow: 0 0 10px 4px rgba(27, 35, 55, .1);
+    // box-shadow: 0 0 10px 4px rgba(27, 35, 55, .1);
     overflow: hidden;
     flex-shrink: 0;
 
@@ -238,7 +257,7 @@
     align-items: flex-start;
 
     .titleName {
-      font-size: 16px;
+      font-size: max(18px, 13Px);
       font-weight: 600;
       color: #131415;
       line-height: 28px;
@@ -246,7 +265,7 @@
     }
 
     .titleDes {
-      font-size: 14px;
+      font-size: max(14px, 11Px);
       font-weight: 400;
       color: #777777;
       line-height: 20px;
@@ -260,7 +279,7 @@
   .btn {
     margin-left: auto;
     width: 84px;
-    height: 40px;
+    height: 36px;
     background: linear-gradient(to right, #44CAFF, #259DFE);
     border: none;
     padding: 0;
@@ -268,6 +287,7 @@
     flex-shrink: 0;
     min-width: 62px;
     min-height: 30px;
+    font-size: max(18px, 12Px);
 
     :global {
       .n-button__content {

+ 1 - 0
src/views/xiaoku-music/index.tsx

@@ -290,6 +290,7 @@ export default defineComponent({
                         round
                         textColor={data.tagIndex === item.id ? '#fff' : '#000'}
                         color={data.tagIndex === item.id ? '#198CFE' : '#fff'}
+                        type={data.tagIndex === item.id ? 'primary' : 'default'}
                         onClick={() => {
                           data.tagIndex = item.id;
                           data.reshing = true;