Merge branch 'iteration-20240219' into jenkins-main

src/school/train-report/month-report.tsx

@@ -310,7 +310,10 @@ export default defineComponent({
           <div>
             <p class={styles.subjectTips}>课件使用未达标班级</p>
             <p class={styles.subjectNames} style="color: #FF99A2">
-              {reportData.coursewareList.map((item: string) => item + ' ')}
+              {reportData.coursewareList.map(
+                (item: string, index: number) =>
+                  item + (reportData.coursewareList.length - 1 === index ? '' : '、')
+              )}
             </p>
           </div>
         </div>

src/school/train-report/report.module.less

@@ -156,21 +156,21 @@
   font-size: 14px;
   font-weight: 600;
   color: #ffffff;
-  padding: 0 15px;
+  padding: 12px 15px;
   margin: 0 13px 10px;
   display: flex;
-  align-items: center;
+  align-items: flex-start;
   min-height: 76px;
   background: rgba(66, 109, 255, 0.97) linear-gradient(276deg, #0a53d4 0%, #1133c0 100%);
   box-shadow: inset 6px 6px 0px 0px rgba(15, 57, 204, 0.41);
-  border-radius: 16px 100px 100px 18px;
+  border-radius: 18px;
   border: 3px solid #99ffdd;
   overflow: hidden;
 
   &::after {
     position: absolute;
-    right: -40px;
-    top: -30px;
+    right: -50px;
+    top: -50px;
     content: ' ';
     background: url('./images/small-icon.png') no-repeat center;
     background-size: cover;
@@ -179,9 +179,10 @@
   }
 
   .iconPhoto {
-    width: 38px;
-    height: 42px;
+    width: 48px;
+    height: 41px;
     margin-right: 5px;
+    flex-shrink: 0;
   }
 
   span {

src/school/train-report/week-report.tsx

@@ -290,7 +290,10 @@ export default defineComponent({
           <div>
             <p class={styles.subjectTips}>课件使用未达标班级</p>
             <p class={styles.subjectNames}>
-              {reportData.coursewareList.map((item: string) => item + ' ')}
+              {reportData.coursewareList.map(
+                (item: string, index: number) =>
+                  item + (reportData.coursewareList.length - 1 === index ? '' : '、')
+              )}
             </p>
           </div>
         </div>