lex před 1 rokem
rodič
revize
035c5d6e09

+ 10 - 0
src/views/classList/components/classRecord.module.less

@@ -64,6 +64,16 @@
       color: #777777;
       line-height: 26px;
     }
+
+    .subjectName {
+      font-size: 14px;
+      font-weight: 400;
+      color: #FFFFFF;
+      background: #198CFE;
+      border-radius: 5px;
+      padding: 1px 8px;
+      margin-right: 4px;
+    }
   }
 
 }

+ 5 - 0
src/views/classList/components/classRecord.tsx

@@ -126,6 +126,11 @@ export default defineComponent({
                   <div class={styles.userInfo}>
                     <h2>{item.teacherName}</h2>
                     <p>
+                      {item.subjectName && (
+                        <span class={styles.subjectName}>
+                          {item.subjectName}
+                        </span>
+                      )}
                       {item.lessonCourseware.lessonCoursewareName} |{' '}
                       {item.lessonCourseware.lessonCoursewareDetailName}|{' '}
                       {

+ 11 - 1
src/views/home/index.module.less

@@ -753,9 +753,19 @@
 
       .teachGroupItemInfo {
         font-size: 13px;
-        line-height: 18px;
+        line-height: 26px;
         color: rgba(0, 0, 0, 0.5);
       }
+
+      .subjectName {
+        font-size: 14px;
+        font-weight: 400;
+        color: #FFFFFF;
+        background: #198CFE;
+        border-radius: 5px;
+        padding: 1px 8px;
+        margin-right: 4px;
+      }
     }
   }
 }

+ 6 - 6
src/views/home/index.tsx

@@ -155,18 +155,17 @@ export default defineComponent({
         //
       }
     };
-    const getLastClassRecode = async ()=>{
+    const getLastClassRecode = async () => {
       const { data } = await courseSchedulePage({
         page: 1,
         rows: 1,
         teacherId: userStore.getUserInfo.id
       });
-      if(data.rows.length >0 && data.rows[0]){
+      if (data.rows.length > 0 && data.rows[0]) {
         forms.classSelect.currentClass = data.rows[0].classGroupId;
         forms.classSelect.name = data.rows[0].classGroupName;
       }
-    }
-
+    };
 
     const getCourseSchedulePage = async () => {
       forms.classLoading = true;
@@ -199,7 +198,8 @@ export default defineComponent({
               lessonCourseware.lessonCoursewareDetailName +
               ' | ' +
               lessonCourseware.lessonCoursewareKnowledgeDetailName,
-            image: item.teacherAvatar
+            image: item.teacherAvatar,
+            subjectName: item.subjectName
           });
         });
 
@@ -214,7 +214,7 @@ export default defineComponent({
 
     onMounted(async () => {
       await getClassList();
-      await getLastClassRecode()
+      await getLastClassRecode();
       await catchStore.getSubjects();
 
       await getCourseSchedulePage();

+ 6 - 1
src/views/home/modals/teachItem.tsx

@@ -21,7 +21,12 @@ export default defineComponent({
               {props.item.teacherName} <span>{props.item.classGroup}</span>
             </p>
 
-            <p class={styles.teachGroupItemInfo}>{props.item.conent}</p>
+            <p class={styles.teachGroupItemInfo}>
+              {props.item.subjectName && (
+                <span class={styles.subjectName}>{props.item.subjectName}</span>
+              )}
+              {props.item.conent}
+            </p>
           </div>
         </div>
       </>