Merge branch 'iteration_video' into online

src/views/home/component/Practice.tsx

@@ -51,7 +51,7 @@ export default defineComponent({
             shrink
             v-model:active={tab.value}
             onChange={value => {
-              console.log(value)
+              console.log(value);
               emit('change', value);
             }}>
             <Tab name="week" title="本周"></Tab>
@@ -65,11 +65,13 @@ export default defineComponent({
               {{
                 icon: () => (
                   <div>
-                    <span class={styles.tagNum}>{data.value.commitRate || 0}</span>
+                    <span class={styles.tagNum}>
+                      {data.value.commitRate || 0}
+                    </span>
                     <span class={[styles.tagNum, styles.fenHao]}>%</span>
                   </div>
                 ),
-                text: () => <div>提交率</div>
+                text: () => <div>练习率</div>
               }}
             </GridItem>
             <Image class={styles.iconline} src={iconLine} fit="contain" />
@@ -77,7 +79,9 @@ export default defineComponent({
               {{
                 icon: () => (
                   <div>
-                    <span class={styles.tagNum}>{data.value.passRate || 0}</span>
+                    <span class={styles.tagNum}>
+                      {data.value.passRate || 0}
+                    </span>
                     <span class={[styles.tagNum, styles.fenHao]}>%</span>
                   </div>
                 ),
@@ -94,7 +98,9 @@ export default defineComponent({
               color="linear-gradient(to right, #9AC6FF, #5C91FF)"></Progress>
             <div>
               应提交{' '}
-              <span style={{ color: '#5C91FF' }} class={[styles.tagNum, styles.numDes]}>
+              <span
+                style={{ color: '#5C91FF' }}
+                class={[styles.tagNum, styles.numDes]}>
                 {data.value.expectNum || 0}
               </span>
               人
@@ -109,7 +115,9 @@ export default defineComponent({
               color="linear-gradient(to right, #91F4DA, #01C1B5)"></Progress>
             <div>
               实际提交{' '}
-              <span style={{ color: '#01C1B5' }} class={[styles.tagNum, styles.numDes]}>
+              <span
+                style={{ color: '#01C1B5' }}
+                class={[styles.tagNum, styles.numDes]}>
                 {data.value.actualNum || 0}
               </span>
               人
@@ -124,7 +132,9 @@ export default defineComponent({
               color="linear-gradient(to right, #FFDCAC, #FFA724)"></Progress>
             <div>
               合格提交{' '}
-              <span style={{ color: '#FFA724' }} class={[styles.tagNum, styles.numDes]}>
+              <span
+                style={{ color: '#FFA724' }}
+                class={[styles.tagNum, styles.numDes]}>
                 {data.value.passNum || 0}
               </span>
               人

src/views/student-manage/component/Attendance.tsx

@@ -14,8 +14,8 @@ export default defineComponent({
     const item = props.item;
     return () => (
       <div class={styles.attendance}>
-        <div class={styles.attendanceTitle}>
-          <span>本学期作业</span>
+        <div class={[styles.attendanceTitle, styles.titleMore]}>
+          <span>本学期课后练习</span>
         </div>
         <div class={styles.items}>
           <div class={styles.item}>
@@ -32,7 +32,7 @@ export default defineComponent({
               /{item.shouldSubmitCount}
               <span class={styles.ci}></span>
             </div>
-            <div class={styles.label}>作业情况</div>
+            <div class={styles.label}>课后练习情况</div>
           </div>
 
           <div class={styles.item}>

src/views/student-manage/index.module.less

@@ -1,120 +1,134 @@
 .container {
-    :global{
-        .van-dropdown-item__option--active .van-cell__title{
-            color: var(--van-primary-color);
-        }
+  :global {
+    .van-dropdown-item__option--active .van-cell__title {
+      color: var(--van-primary-color);
     }
+  }
 }
 
-.list{
-    padding: 12px 13px;
-    min-height: calc(100vh - var(--header-height));
-    :global{
-        .van-empty{
-            height: calc(80vh - var(--header-height));
-        }
+.list {
+  padding: 12px 13px;
+  min-height: calc(100vh - var(--header-height));
+
+  :global {
+    .van-empty {
+      height: calc(80vh - var(--header-height));
     }
+  }
 }
 
 .student {
-    background-color: #fff;
-    border-radius: 10px;
-    margin-bottom: 12px;
+  background-color: #fff;
+  border-radius: 10px;
+  margin-bottom: 12px;
 }
 
-.statistics{
+.statistics {
+  display: flex;
+  padding: 20px 0;
+  background-color: #fff;
+  border-radius: 10px;
+  margin-bottom: 12px;
+  width: 100%;
+
+  .statisticsItem {
+    flex: 1;
     display: flex;
-    padding: 20px 0;
-    background-color: #fff;
-    border-radius: 10px;
-    margin-bottom: 12px;
-    width: 100%;
-    .statisticsItem{
-        flex: 1;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: 0 30px;
-        &:first-child{
-            border-right: 1px solid #F2F2F2;
-        }
-    }
-    .iconstatistics{
-        width: 40px;
-        height: 40px;
-    }
-    .statisticsDes{
-        text-align: center;
-        color: #777;
-        font-size: 13px;
-        line-height: 18px;
-    }
-    .statisticsNum{
-        font-size: 22px;
-        font-weight: bold;
-        font-family: DINAlternate-Bold, DINAlternate;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 30px;
+
+    &:first-child {
+      border-right: 1px solid #F2F2F2;
     }
+  }
+
+  .iconstatistics {
+    width: 40px;
+    height: 40px;
+  }
+
+  .statisticsDes {
+    text-align: center;
+    color: #777;
+    font-size: 13px;
+    line-height: 18px;
+  }
+
+  .statisticsNum {
+    font-size: 22px;
+    font-weight: bold;
+    font-family: DINAlternate-Bold, DINAlternate;
+  }
 }
 
 .attendance {
-    padding: 15px 12px 15px;
-    .attendanceTitle {
-        position: relative;
-        font-size: 14px;
-        line-height: 20px;
-        font-weight: bold;
-        color: #333;
-        margin-bottom: 12px;
-        & > span{
-            position: relative;
-            z-index: 1;
-        }
-        &::before {
-            content: '';
-            position: absolute;
-            left: 0;
-            bottom: 0;
-            width: 70px;
-            height: 8px;
-            background: #A1EDCB;
-        }
+  padding: 15px 12px 15px;
+
+  .attendanceTitle {
+    position: relative;
+    font-size: 14px;
+    line-height: 20px;
+    font-weight: bold;
+    color: #333;
+    margin-bottom: 12px;
+
+    &>span {
+      position: relative;
+      z-index: 1;
     }
-    .assignmentTitle{
-        &::before {
-            background: #B4E8FF;
-        }
+
+    &::before {
+      content: '';
+      position: absolute;
+      left: 0;
+      bottom: 0;
+      width: 70px;
+      height: 8px;
+      background: #A1EDCB;
     }
 
-    .items {
-        display: flex;
-        margin: 0 -11px;
-
-        .item {
-            width: calc(100% / 5);
-            text-align: center;
-            line-height: 24px;
-            font-size: 20px;
-            font-weight: bold;
-            font-family: DINAlternate-Bold, DINAlternate;
-
-            .label {
-                line-height: 16px;
-                font-size: 12px;
-                color: #777;
-                font-weight: 400;
-                margin-top: 5px;
-                white-space: nowrap;
-            }
-
-            .ci {
-                font-size: 12px;
-                margin-left: 2px;
-                vertical-align: middle;
-            }
-        }
+    &.titleMore::before {
+      width: 96px;
     }
-}
+  }
 
-.dropdownItem{
-    margin-top: -2Px;
+  .assignmentTitle {
+    &::before {
+      background: #B4E8FF;
+    }
+  }
+
+  .items {
+    display: flex;
+    margin: 0 -11px;
+
+    .item {
+      width: calc(100% / 5);
+      text-align: center;
+      line-height: 24px;
+      font-size: 20px;
+      font-weight: bold;
+      font-family: DINAlternate-Bold, DINAlternate;
+
+      .label {
+        line-height: 16px;
+        font-size: 12px;
+        color: #777;
+        font-weight: 400;
+        margin-top: 5px;
+        white-space: nowrap;
+      }
+
+      .ci {
+        font-size: 12px;
+        margin-left: 2px;
+        vertical-align: middle;
+      }
+    }
+  }
 }
+
+.dropdownItem {
+  margin-top: -2Px;
+}