Browse Source

Merge branch 'iteration-20240219' into jenkins-main

lex 1 năm trước cách đây
mục cha
commit
b00d0db3a9

BIN
src/school/train-report/images/icon-w.png


+ 14 - 11
src/school/train-report/month-report.tsx

@@ -305,18 +305,21 @@ export default defineComponent({
           reportDataNot={reportData.TEACHER_NOT_ATTENDANCE}
         />
 
-        <div class={[styles.trainClass, styles.teacherTrainClass]}>
-          <Image src={iconClass} class={styles.iconPhoto} />
-          <div>
-            <p class={styles.subjectTips}>课件使用未达标班级</p>
-            <p class={styles.subjectNames} style="color: #FF99A2">
-              {reportData.coursewareList.map(
-                (item: string, index: number) =>
-                  item + (reportData.coursewareList.length - 1 === index ? '' : '、')
-              )}
-            </p>
+        {reportData.coursewareList.length > 0 && (
+          <div class={[styles.trainClass, styles.teacherTrainClass]}>
+            <Image src={iconClass} class={styles.iconPhoto} />
+            <div>
+              <p class={styles.subjectTips}>课件使用未达标班级</p>
+              <p class={styles.subjectNames} style="color: #FF99A2">
+                {reportData.coursewareList.map(
+                  (item: string, index: number) =>
+                    item + (reportData.coursewareList.length - 1 === index ? '' : '、')
+                )}
+              </p>
+            </div>
           </div>
-        </div>
+        )}
+
         <TrainProgress type="month" reportData={reportData.KNOWLEDGE} />
 
         <Popup

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

@@ -169,13 +169,13 @@
 
   &::after {
     position: absolute;
-    right: -50px;
-    top: -50px;
+    right: -3px;
+    top: -3px;
     content: ' ';
-    background: url('./images/small-icon.png') no-repeat center;
+    background: url('./images/icon-w.png') no-repeat center;
     background-size: cover;
-    height: 100%;
-    width: 63px;
+    height: 49px;
+    width: 28px;
   }
 
   .iconPhoto {

+ 14 - 11
src/school/train-report/week-report.tsx

@@ -285,18 +285,21 @@ export default defineComponent({
           reportDataNot={reportData.TEACHER_NOT_ATTENDANCE}
         />
 
-        <div class={[styles.trainClass]}>
-          <Image src={iconClass} class={styles.iconPhoto} />
-          <div>
-            <p class={styles.subjectTips}>课件使用未达标班级</p>
-            <p class={styles.subjectNames}>
-              {reportData.coursewareList.map(
-                (item: string, index: number) =>
-                  item + (reportData.coursewareList.length - 1 === index ? '' : '、')
-              )}
-            </p>
+        {reportData.coursewareList.length > 0 && (
+          <div class={[styles.trainClass]}>
+            <Image src={iconClass} class={styles.iconPhoto} />
+            <div>
+              <p class={styles.subjectTips}>课件使用未达标班级</p>
+              <p class={styles.subjectNames}>
+                {reportData.coursewareList.map(
+                  (item: string, index: number) =>
+                    item + (reportData.coursewareList.length - 1 === index ? '' : '、')
+                )}
+              </p>
+            </div>
           </div>
-        </div>
+        )}
+
         <TrainProgress reportData={reportData.KNOWLEDGE} />
 
         <Popup