1

1

src/components/layout/layoutTop.tsx

@@ -17,6 +17,18 @@ export default defineComponent({
     const router = useRouter();
     const showHeadFlag = ref(false);
     const users = useUserStore();
+    const info = users.getUserInfo;
+    const gotoPerson = () => {
+      router.push({ path: '/setting' });
+    };
+    const gotoSchool = () => {
+      router.push({ path: '/setting' });
+      console.log('gotoSchool');
+    };
+
+    const resetPwd = () => {
+      console.log('resetPwd');
+    };
     return () => (
       <>
         <div class={styles.layoutTop}>
@@ -25,7 +37,9 @@ export default defineComponent({
               src={schoolIcon}
               class={styles.schoolIcon}
               previewDisabled></NImage>
-            <p>武汉市武昌区教育局 | 武汉小学</p>
+            <p>
+              {info.schoolInfos[0].tenantName} | {info.schoolInfos[0].name}
+            </p>
           </div>
           <div class={styles.layoutRight}>
             <NBadge
@@ -54,7 +68,7 @@ export default defineComponent({
                     <NImage
                       preview-disabled
                       class={styles.teacherIcon}
-                      src={teacherIcon}></NImage>
+                      src={info.avatar ? info.avatar : teacherIcon}></NImage>
                     <NIcon
                       class={
                         showHeadFlag.value
@@ -76,12 +90,12 @@ export default defineComponent({
                 <div class={styles.teacherInfo}>
                   <NImage
                     class={styles.teacherIcon}
-                    src={teacherIcon}
+                    src={info.avatar ? info.avatar : teacherIcon}
                     previewDisabled></NImage>
-                  <p class={styles.teacherName}>张晚意</p>
+                  <p class={styles.teacherName}>{info.nickname}</p>
                 </div>
                 <div class={styles.propWrapList}>
-                  <div class={styles.propWrapItem}>
+                  <div class={styles.propWrapItem} onClick={() => gotoPerson()}>
                     {' '}
                     <NImage
                       class={styles.smallIcon}
@@ -89,15 +103,22 @@ export default defineComponent({
                       previewDisabled></NImage>
                     <p class={styles.smallTitle}>个人信息</p>
                   </div>
-                  <div class={styles.propWrapItem}>
-                    {' '}
-                    <NImage
-                      class={styles.smallIcon}
-                      src={schoolDot}
-                      previewDisabled></NImage>
-                    <p class={styles.smallTitle}>学校信息</p>
-                  </div>
-                  <div class={styles.propWrapItem}>
+                  {info.isSuperAdmin ? (
+                    <div
+                      class={styles.propWrapItem}
+                      onClick={() => {
+                        gotoSchool();
+                      }}>
+                      {' '}
+                      <NImage
+                        class={styles.smallIcon}
+                        src={schoolDot}
+                        previewDisabled></NImage>
+                      <p class={styles.smallTitle}>学校信息</p>
+                    </div>
+                  ) : null}
+
+                  <div class={styles.propWrapItem} onClick={() => resetPwd()}>
                     {' '}
                     <NImage
                       class={styles.smallIcon}

src/views/classList/components/classStudent.tsx

@@ -72,9 +72,17 @@ export default defineComponent({
         },
         {
           title: '性别',
-          key: 'sex',
+          key: 'gender',
           render(row: any) {
-            return <>{row.sex == '0' ? '女' : '男'}</>;
+            return (
+              <>
+                {row.gender + '' != 'null'
+                  ? row.gender == '0'
+                    ? '女'
+                    : '男'
+                  : '--'}
+              </>
+            );
           }
         },