diff --git a/src/App.vue b/src/App.vue
index 3550ab3..ee80e87 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -35,6 +35,15 @@ export default {
   width: 100%;
 }
 
+p {
+  margin-top: 0 !important;
+  margin-bottom: 0 !important;
+}
+
+.el-select__wrapper {
+  padding: 0 14px !important;
+}
+
 .el-alert--error.is-light {
   border: 1px solid #ffe0e0;
 }
diff --git a/src/assets/font/font.css b/src/assets/font/font.css
index 3a717d0..0e2b832 100644
--- a/src/assets/font/font.css
+++ b/src/assets/font/font.css
@@ -14,7 +14,7 @@
 
 @font-face {
   font-family: "PingFangSC";
-  src: url('PingFang Bold.ttf');
+  src: url('myfont.ttf');
   font-weight: normal;
   font-style: normal;
 }
diff --git a/src/assets/font/myfont.ttf b/src/assets/font/myfont.ttf
new file mode 100644
index 0000000..b9fadd5
Binary files /dev/null and b/src/assets/font/myfont.ttf differ
diff --git a/src/assets/imgs/error-img.png b/src/assets/imgs/error-img.png
index 4708406..3a14ed9 100644
Binary files a/src/assets/imgs/error-img.png and b/src/assets/imgs/error-img.png differ
diff --git a/src/assets/imgs/error.png b/src/assets/imgs/error.png
index 4708406..3a14ed9 100644
Binary files a/src/assets/imgs/error.png and b/src/assets/imgs/error.png differ
diff --git a/src/assets/imgs/logo.png b/src/assets/imgs/logo.png
index 4708406..3a14ed9 100644
Binary files a/src/assets/imgs/logo.png and b/src/assets/imgs/logo.png differ
diff --git a/src/assets/logo.png b/src/assets/logo.png
index 4708406..3a14ed9 100644
Binary files a/src/assets/logo.png and b/src/assets/logo.png differ
diff --git a/src/components/commonManage/index.vue b/src/components/commonManage/index.vue
index 6ca9b9e..bb0753f 100644
--- a/src/components/commonManage/index.vue
+++ b/src/components/commonManage/index.vue
@@ -8,11 +8,12 @@
 </script>
 <style lang="less" scoped>
 .commonManage{
-    width: calc(100% - 24px);
-    height: auto;
+    width: calc(100% - 34px);
+    height: calc(100vh - 130px) !important;
     background-color: #fff;
     border-radius: 8px;
-    margin: 12px;
+    margin: 16px;
+    box-sizing: border-box;
 }
 
 </style>
\ No newline at end of file
diff --git a/src/components/commonTable/index.vue b/src/components/commonTable/index.vue
index 7f4e48c..06f8d75 100644
--- a/src/components/commonTable/index.vue
+++ b/src/components/commonTable/index.vue
@@ -1,7 +1,7 @@
-<template>
+<template>
     <div class="commonTable">
         <el-table :data="propsChannel" highlight-current-row
-            style="width: calc(100% - 40px) ;height: 80vh; margin:0 20px ;" fit="true"
+            style="width: calc(100% - 40px) ;height: calc(100vh - 250px); margin:0 20px ;" fit="true"
             @selection-change="handleSelectionChange"
             :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', 'color': '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }"
             :cell-style="getCellStyles" :row-style="{ height: '0px' }">
@@ -123,7 +123,7 @@ function goUp(row) {
 
 :deep(.el-pagination) {
     height: 20px;
-    margin-top: 5px;
+    margin-top: 15px;
     margin-left: 20px;
 }
 
diff --git a/src/views/Aitest/index1.vue b/src/views/Aitest/index1.vue
index 5063b41..fe37f35 100644
--- a/src/views/Aitest/index1.vue
+++ b/src/views/Aitest/index1.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
     <commonManage>
         <div class="head">
             <div class="left">
@@ -14,7 +14,7 @@
             </div>
         </div>
         <div class="cont">
-            <el-table :data="tableData" style="width: calc(100% - 40px) ;height: 80vh; margin:0 20px ;" fit="true"
+            <el-table :data="tableData" style="width: calc(100% - 40px) ;height: calc(100vh - 210px); margin:0 20px ;" fit="true"
                 :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', 'color': '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }"
                 :cell-style="getCellStyles" :row-style="{ height: '0px' }">
                 <el-table-column fixed prop="ind" label="序号" />
diff --git a/src/views/aIArena/eventRelease/index.vue b/src/views/aIArena/eventRelease/index.vue
index dcd6748..fae7d3b 100644
--- a/src/views/aIArena/eventRelease/index.vue
+++ b/src/views/aIArena/eventRelease/index.vue
@@ -1,4 +1,4 @@
-<!-- 赛事发布 -->
+<!-- 赛事发布 -->
 <template>
    <div class="eventRelease">
       <div class="right">
@@ -211,7 +211,7 @@ const data = ref({
          pageIndex: 1,
          pageSize: 10,
          total: 0,
-         height: '75vh',
+         height: 'calc(100vh - 210px)',
          tdHeight: '56px',
          tableLabel: [
             {
diff --git a/src/views/aIArena/eventStatistics/index.vue b/src/views/aIArena/eventStatistics/index.vue
index f266ab5..dc9a344 100644
--- a/src/views/aIArena/eventStatistics/index.vue
+++ b/src/views/aIArena/eventStatistics/index.vue
@@ -1,4 +1,4 @@
-<!-- 赛事统计 -->
+<!-- 赛事统计 -->
 <template>
     <commonManage>
         <div class="eventStatistics">
@@ -71,7 +71,7 @@ const data = ref({
         pageIndex: 1,
         pageSize: 10,
         total: 0,
-        height: '75vh',
+        height: 'calc(100vh - 210px)',
         tdHeight: '56px',
         tableLabel: [
             {
diff --git a/src/views/articleManage/index.vue b/src/views/articleManage/index.vue
index 3d7dc0c..15bf9f6 100644
--- a/src/views/articleManage/index.vue
+++ b/src/views/articleManage/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
     <commonManage>
         <div class="head">
             <div class="left">
@@ -12,7 +12,7 @@
             </div>
         </div>
         <div class="cont">
-            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: 80vh; margin:0 20px ;" fit="true"
+            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: calc(100vh - 210px); margin:0 20px ;" fit="true"
                 :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', 'color': '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }"
                 :cell-style="getCellStyles" :row-style="{ height: '0px' }">
                 <el-table-column fixed prop="ind" label="序号" width="80" />
diff --git a/src/views/bigScreen/newScreen/index.vue b/src/views/bigScreen/newScreen/index.vue
index 22178fb..04daa45 100644
--- a/src/views/bigScreen/newScreen/index.vue
+++ b/src/views/bigScreen/newScreen/index.vue
@@ -142,7 +142,7 @@
 
 <style scoped lang="scss">
   .p-5 {
-    padding: 10px;
+    padding: 16px;
   }
 
   .bigScreen {
diff --git a/src/views/bodySideData/index.vue b/src/views/bodySideData/index.vue
index a98fa72..26d42cd 100644
--- a/src/views/bodySideData/index.vue
+++ b/src/views/bodySideData/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
     <commonManage>
         <div class="head">
             <div class="left">
@@ -51,7 +51,7 @@
                 {{ item.chinName }}</p>
         </div>
         <div class="cont">
-            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: 80vh; margin:0 20px ;"
+            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: calc(100vh - 210px); margin:0 20px ;"
                 fit="true"
                 :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', 'color': '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }"
                 :cell-style="getCellStyles" :row-style="{ height: '0px' }" @select="select" @select-all="select">
diff --git a/src/views/classManage/index.vue b/src/views/classManage/index.vue
index e37688e..969e89c 100644
--- a/src/views/classManage/index.vue
+++ b/src/views/classManage/index.vue
@@ -22,7 +22,7 @@
       </div>
     </div>
     <div class="cont">
-      <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px); height: 80vh; margin: 0 20px" fit="true" :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', color: '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }" :cell-style="getCellStyles" :row-style="{ height: '0px' }">
+      <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px); margin: 0 20px" fit="true" :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', color: '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }" :cell-style="getCellStyles" :row-style="{ height: '0px' }">
         <el-table-column fixed prop="ind" label="序号" />
         <el-table-column prop="gradeName" label="年级名称" />
         <el-table-column prop="className" label="班级名称" />
@@ -680,8 +680,8 @@
       .batchAdd,
       .Export {
         margin-right: 20px;
-        width: 98px;
-        height: 40px;
+        width: 88px;
+        height: 33px;
         background: #4188fe;
         border-radius: 4px;
         text-align: center;
@@ -697,8 +697,8 @@
       }
 
       .Audit {
-        width: 95px;
-        height: 40px;
+        width: 80px;
+        height: 33px;
         background: #fafafa;
         border-radius: 4px;
         border: 1px solid rgba(0, 0, 0, 0.15);
@@ -707,15 +707,15 @@
         font-size: 14px;
         color: rgba(0, 0, 0, 0.65);
         text-align: center;
-        line-height: 40px;
+        line-height: 33px;
         margin-right: 20px;
         cursor: pointer;
         user-select: none;
       }
 
       .Search {
-        width: 95px;
-        height: 40px;
+        width: 80px;
+        height: 33px;
         background: #4188fe;
         border-radius: 4px;
         border: 1px solid rgba(0, 0, 0, 0.15);
@@ -724,31 +724,31 @@
         font-size: 14px;
         color: #fff;
         text-align: center;
-        line-height: 40px;
+        line-height: 33px;
         cursor: pointer;
         user-select: none;
         margin-right: 20px;
       }
 
-      .creatClass::before {
-        content: "";
-        background: url("@/assets/images/allImg/add.png") no-repeat;
-        background-size: cover;
-        width: 14px;
-        height: 14px;
-        font-size: 12px;
-        margin-right: 5px;
-      }
+      // .creatClass::before {
+      //   content: "";
+      //   background: url("@/assets/images/allImg/add.png") no-repeat;
+      //   background-size: cover;
+      //   width: 14px;
+      //   height: 14px;
+      //   font-size: 12px;
+      //   margin-right: 5px;
+      // }
 
-      .batchAdd::before {
-        content: "";
-        background: url("@/assets/images/allImg/add.png") no-repeat;
-        background-size: cover;
-        width: 14px;
-        height: 14px;
-        font-size: 12px;
-        margin-right: 5px;
-      }
+      // .batchAdd::before {
+      //   content: "";
+      //   background: url("@/assets/images/allImg/add.png") no-repeat;
+      //   background-size: cover;
+      //   width: 14px;
+      //   height: 14px;
+      //   font-size: 12px;
+      //   margin-right: 5px;
+      // }
 
       .Search::before {
         content: "";
@@ -771,6 +771,7 @@
 
   .pagination {
     margin-left: 20px;
+    margin-top: 20px;
   }
 
   .edit {
diff --git a/src/views/classroomReport/index.vue b/src/views/classroomReport/index.vue
index a0a6ded..b6816d1 100644
--- a/src/views/classroomReport/index.vue
+++ b/src/views/classroomReport/index.vue
@@ -1,4 +1,4 @@
-<!-- 作业列表 -->
+<!-- 作业列表 -->
 <template>
     <div class="eventRelease">
         <div class="right">
@@ -90,7 +90,7 @@ const data = ref({
             pageIndex: 1,
             pageSize: 10,
             total: 0,
-            height: '75vh',
+            height: 'calc(100vh - 210px)',
             tdHeight: '56px',
             tableLabel: [
                 {
diff --git a/src/views/classroomReportDetail/index.vue b/src/views/classroomReportDetail/index.vue
index bb33621..2ee12e0 100644
--- a/src/views/classroomReportDetail/index.vue
+++ b/src/views/classroomReportDetail/index.vue
@@ -452,7 +452,7 @@ const sexList = ['男','女']
 }
 
 .card {
-    margin: 10px 25px 30px;
+    margin: 16px;
     box-sizing: border-box;
     border-radius: 10px;
     overflow: hidden;
diff --git a/src/views/curricularManage/index.vue b/src/views/curricularManage/index.vue
index 67a23b3..b030288 100644
--- a/src/views/curricularManage/index.vue
+++ b/src/views/curricularManage/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <commonManage>
     <div class="head">
       <div class="left">
@@ -24,7 +24,7 @@
       </div>
     </div>
     <div class="cont">
-      <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px); height: 80vh; margin: 0 20px" fit="true" :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', color: '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }" :cell-style="getCellStyles" :row-style="{ height: '0px' }">
+      <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px); height: calc(100vh - 210px); margin: 0 20px" fit="true" :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', color: '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }" :cell-style="getCellStyles" :row-style="{ height: '0px' }">
         <el-table-column fixed prop="ind" label="序号" />
         <el-table-column prop="taxonomyName" label="课程分类" />
         <el-table-column prop="curricularName" label="课程名称" />
diff --git a/src/views/curricularTaxonomy/index.vue b/src/views/curricularTaxonomy/index.vue
index bc0dcfe..d671edf 100644
--- a/src/views/curricularTaxonomy/index.vue
+++ b/src/views/curricularTaxonomy/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <commonManage>
       <div class="head">
           <div class="left">
@@ -10,7 +10,7 @@
           </div>
       </div>
       <div class="cont">
-          <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: 80vh; margin:0 20px ;"
+          <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: calc(100vh - 210px); margin:0 20px ;"
               fit="true" v-if="data.tableNeed.tableData.length > 0"
               :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', 'color': '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }"
               :cell-style="getCellStyles" :row-style="{ height: '0px' }">
diff --git a/src/views/enterHigh/index.vue b/src/views/enterHigh/index.vue
index f2b43c4..c169152 100644
--- a/src/views/enterHigh/index.vue
+++ b/src/views/enterHigh/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
     <commonManage>
         <div class="head">
             <div class="left">
@@ -10,7 +10,7 @@
             </div>
         </div>
         <div class="cont">
-            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: 80vh; margin:0 20px ;"
+            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: calc(100vh - 210px); margin:0 20px ;"
                 fit="true" v-if="data.tableNeed.tableData.length > 0"
                 :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', 'color': '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }"
                 :cell-style="{ 'text-align': 'center', padding: '3px', height: '50px' }" :row-style="{ height: '36.55px' }">
diff --git a/src/views/eventDetail/index.vue b/src/views/eventDetail/index.vue
index 20af96e..0f42ae5 100644
--- a/src/views/eventDetail/index.vue
+++ b/src/views/eventDetail/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
     <commonManage>
         <div class="head">
             <div class="left">
@@ -10,7 +10,7 @@
             </div> -->
         </div>
         <div class="cont">
-            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: 80vh; margin:0 20px ;"
+            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: calc(100vh - 210px); margin:0 20px ;"
                 fit="true" v-if="data.tableNeed.tableData.length > 0"
                 :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', 'color': '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }"
                 :cell-style="{ 'text-align': 'center', padding: '3px', height: '50px' }"
diff --git a/src/views/eventRegistration/index.vue b/src/views/eventRegistration/index.vue
index 2c3b159..05a6908 100644
--- a/src/views/eventRegistration/index.vue
+++ b/src/views/eventRegistration/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
     <commonManage>
         <div class="head">
             <div class="left">
@@ -31,7 +31,7 @@
             </div>
         </div>
         <div class="cont">
-            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: 80vh; margin:0 20px ;"
+            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: calc(100vh - 210px); margin:0 20px ;"
                 fit="true"
                 :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', 'color': '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }"
                 :cell-style="{ 'text-align': 'center', padding: '3px', height: '71.2px' }"
diff --git a/src/views/gameManagement/index.vue b/src/views/gameManagement/index.vue
index a5ba068..ee857dd 100644
--- a/src/views/gameManagement/index.vue
+++ b/src/views/gameManagement/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
     <commonManage>
         <div class="head">
             <div class="left">
@@ -27,7 +27,7 @@
             </div>
         </div>
         <div class="cont">
-            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: 80vh; margin:0 20px ;"
+            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: calc(100vh - 210px); margin:0 20px ;"
                 fit="true"
                 :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', 'color': '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }"
                 :cell-style="getCellStyles" :row-style="{ height: '0px' }" @select="select" @select-all="select">
diff --git a/src/views/gradeManage/index.vue b/src/views/gradeManage/index.vue
index fbae303..a7b233d 100644
--- a/src/views/gradeManage/index.vue
+++ b/src/views/gradeManage/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
     <commonManage>
         <div class="head">
             <div class="left">
@@ -10,7 +10,7 @@
             </div>
         </div>
         <div class="cont">
-            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: 80vh; margin:0 20px ;"
+            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;max-height: calc(100vh - 210px); margin:0 20px ;"
                 fit="true" v-if="data.tableNeed.tableData.length > 0"
                 :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', 'color': '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }"
                 :cell-style="getCellStyles" :row-style="{ height: '0px' }">
diff --git a/src/views/homeWork/index.vue b/src/views/homeWork/index.vue
index 2a67a9a..e8a8403 100644
--- a/src/views/homeWork/index.vue
+++ b/src/views/homeWork/index.vue
@@ -1,4 +1,4 @@
-<!-- 作业列表 -->
+<!-- 作业列表 -->
 <template>
     <div class="eventRelease">
         <div class="right">
@@ -161,7 +161,7 @@ const data = ref({
             pageIndex: 1,
             pageSize: 10,
             total: 0,
-            height: '75vh',
+            height: 'calc(100vh - 210px)',
             tdHeight: '56px',
             tableLabel: [
                 {
diff --git a/src/views/index.vue b/src/views/index.vue
index bcf79a1..468649e 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -2,34 +2,18 @@
   <div id="vol-container" :class="['vol-theme-' + theme]">
     <!-- 顶部一级导航栏 -->
     <div class="vol-top-header">
-      <!-- 测量容器（不可见，用于计算每个菜单项宽度） -->
-      <div class="top-nav-measure" ref="navMeasureRef" aria-hidden="true">
-        <span v-for="item in topLevelMenus" :key="'ms-' + item.id" class="top-nav-item">{{ item.name }}</span>
-      </div>
       <div class="top-logo">
         <img v-bind:src="logo" />
         <span>跃动智慧体育平台</span>
       </div>
       <div class="top-nav-menus" ref="topNavMenusRef">
         <span
-          v-for="(item, idx) in topLevelMenus"
-          v-show="idx < visibleMenuCount"
+          v-for="item in topLevelMenus"
           :key="item.id"
           :class="['top-nav-item', { 'is-active': activeTopMenuId == item.id }]"
           @click="selectTopMenu(item)"
         >{{ item.name }}</span>
       </div>
-      <!-- 溢出「···」按钮（放在 top-nav-menus 外，避免被 overflow:hidden 裁剪） -->
-      <div
-        v-if="overflowMenus.length > 0"
-        class="top-nav-more-wrapper"
-        ref="moreWrapperRef"
-      >
-        <span
-          :class="['top-nav-item', 'top-nav-more-btn', { 'is-active': overflowMenus.some(m => m.id == activeTopMenuId) }]"
-          @click.stop="toggleMoreMenu"
-        >···</span>
-      </div>
       <div class="header-info">
         <div class="h-link">
           <a href="javascript:void(0)" @click="to(item)" v-for="(item, index) in links.filter((c) => { return c.icon; })" :key="index">
@@ -111,24 +95,7 @@
         </el-scrollbar>
       </div>
     </div>
-    <!-- 溢出菜单下拉面板：Teleport 到 body，避免被任何父层 overflow/z-index 裁剪 -->
-    <Teleport to="body">
-      <transition name="top-nav-more-fade">
-        <div
-          v-if="moreMenuVisible && overflowMenus.length > 0"
-          class="top-nav-overflow-panel"
-          :style="overflowPanelStyle"
-          @click.stop
-        >
-          <div
-            v-for="item in overflowMenus"
-            :key="item.id"
-            :class="['top-nav-overflow-item', { 'is-active': activeTopMenuId == item.id }]"
-            @click="selectTopMenuFromMore(item)"
-          >{{ item.name }}</div>
-        </div>
-      </transition>
-    </Teleport>
+    <!-- 溢出菜单已改为水平滚动，Teleport 面板保留备用 -->
 
     <el-drawer title="选择主题" v-model="drawer_model" direction="rtl" destroy-on-close>
       <div class="theme-selector">
@@ -291,76 +258,14 @@ export default defineComponent({
     };
     const selectTopMenu = (item) => {
       activeTopMenuId.value = item.id;
-    };
-    // ====== 溢出菜单逻辑 ======
-    const navMeasureRef = ref(null);
-    const visibleMenuCount = ref(999);
-    const moreMenuVisible = ref(false);
-    const moreWrapperRef = ref(null);
-    const overflowMenus = computed(() => topLevelMenus.value.slice(visibleMenuCount.value));
-    const overflowPanelStyle = ref({});
-    const toggleMoreMenu = () => {
-      if (moreMenuVisible.value) {
-        moreMenuVisible.value = false;
-        return;
+      // 没有二级子菜单时直接跳转到该菜单对应的页面
+      const hasChildren = menuOptions.value.some(x => x.parentId == item.id);
+      if (!hasChildren && item.path) {
+        open(item , true);
+        router.push({ path: item.path});
       }
-      // 计算按钮位置，用 fixed 定位
-      const rect = moreWrapperRef.value?.getBoundingClientRect();
-      if (rect) {
-        overflowPanelStyle.value = {
-          position: 'fixed',
-          top: (rect.bottom + 6) + 'px',
-          right: (window.innerWidth - rect.right) + 'px',
-          zIndex: 9999,
-        };
-      }
-      moreMenuVisible.value = true;
-      // 延迟添加外点关闭监听，避免当前点击事件被捕获
-      setTimeout(() => {
-        document.addEventListener('click', () => { moreMenuVisible.value = false; }, { once: true });
-      }, 0);
     };
-    const recalcMenuVisibility = () => {
-      nextTick(() => {
-        const container = topNavMenusRef.value;
-        const measure = navMeasureRef.value;
-        if (!container || !measure) return;
-        const containerWidth = container.clientWidth;
-        const items = Array.from(measure.children);
-        const total = items.length;
-        if (total === 0) return;
-        const GAP = 6;
-        const MORE_BTN_WIDTH = 58;
-        // 计算所有菜单项总宽度
-        const totalWidth = items.reduce((sum, el) => sum + el.offsetWidth + GAP, 0);
-        if (totalWidth <= containerWidth) {
-          visibleMenuCount.value = total;
-          return;
-        }
-        // 找出能与「···」按钮共同放入容器的最大菜单项数
-        let accumulated = 0;
-        let count = 0;
-        for (let i = 0; i < total; i++) {
-          const itemWidth = items[i].offsetWidth + GAP;
-          if (accumulated + itemWidth + MORE_BTN_WIDTH > containerWidth) {
-            count = i;
-            break;
-          }
-          accumulated += itemWidth;
-          if (i === total - 1) count = total;
-        }
-        visibleMenuCount.value = Math.max(1, count);
-      });
-    };
-    const selectTopMenuFromMore = (item) => {
-      moreMenuVisible.value = false;
-      selectTopMenu(item);
-    };
-    // 菜单项变化时重新计算
-    watch(topLevelMenus, () => {
-      recalcMenuVisibility();
-    });
-    // ====== 溢出菜单逻辑 END ======
+    // ====== 溢出菜单逻辑已移除（改为水平滚动）======
     const routerList = ref(JSON.parse(localStorage.getItem("routerList")))
     const permissionInited = ref(false);
     const messageList = reactive([]);
@@ -910,15 +815,6 @@ export default defineComponent({
       menuWidth,
       isCollapse,
       topNavMenusRef,
-      navMeasureRef,
-      visibleMenuCount,
-      moreMenuVisible,
-      moreWrapperRef,
-      overflowMenus,
-      overflowPanelStyle,
-      toggleMoreMenu,
-      recalcMenuVisibility,
-      selectTopMenuFromMore,
       activeTopMenuId,
       activeTopMenuHasChildren,
       topLevelMenus,
@@ -959,19 +855,19 @@ export default defineComponent({
    */
   mounted() {
     let _date = showTime();
-
-    // 初始计算溢出菜单
-    this.recalcMenuVisibility();
-
-    // 监听顶部导航容器宽度变化
-    if (this.topNavMenusRef) {
-      this._navResizeObserver = new ResizeObserver(() => {
-        this.recalcMenuVisibility();
-      });
-      this._navResizeObserver.observe(this.topNavMenusRef);
-    }
-
     this.bindRightClickMenu(true);
+
+    // 顶部导航栏：将鼠标竖向滚轮转换为横向滚动
+    const nav = this.topNavMenusRef;
+    if (nav) {
+      this._navWheelHandler = (e) => {
+        if (e.deltaY !== 0) {
+          e.preventDefault();
+          nav.scrollLeft += e.deltaY;
+        }
+      };
+      nav.addEventListener('wheel', this._navWheelHandler, { passive: false });
+    }
   },
 
   methods: {
@@ -1002,7 +898,9 @@ export default defineComponent({
   destroyed() {
     $this = null;
     clearInterval($interval);
-    if (this._navResizeObserver) this._navResizeObserver.disconnect();
+    if (this._navWheelHandler && this.topNavMenusRef) {
+      this.topNavMenusRef.removeEventListener('wheel', this._navWheelHandler);
+    }
   },
 });
 const week = new Array(
@@ -1045,6 +943,7 @@ function showTime() {
 <style lang="less" scoped>
 .vol-container .vol-path ::v-deep(.el-tabs__content) {
   padding: 0;
+  // border-bottom: 1px solid #e4e4e7;
 }
 
 .contextMenu {
@@ -1136,6 +1035,15 @@ function showTime() {
   transform: translateY(-8px);
 }
 
+.header-navigation.el-tabs--border-card > .el-tabs__header .el-tabs__item .is-icon-close{
+  margin-left: 8px;
+  color: #000;
+}
+
+.header-navigation.el-tabs--border-card > .el-tabs__header .el-tabs__item .is-icon-close:hover{
+  color: #fff;
+}
+
 /* ── 标签栏 Chrome 风格激活色（全局高优先级，压过 EP border-card 内置样式） ── */
 .header-navigation.el-tabs--border-card > .el-tabs__header .el-tabs__item {
   color: #5f6368;
@@ -1145,14 +1053,15 @@ function showTime() {
   overflow: visible !important;
 }
 .header-navigation.el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
-  color: #2563eb !important;
+  color: #2d8cf0 !important;
   background: linear-gradient(90deg, #dbeeff 0%, #f0f8ff 100%) !important;
-  font-weight: 600;
+  font-weight: normal;
   border: none !important;
 }
 .header-navigation.el-tabs--border-card > .el-tabs__header .el-tabs__item:not(.is-active):hover {
-  color: #2563eb !important;
+  color: #2d8cf0 !important;
   background: #ebf4ff !important;
+  border-radius: 8px !important;
 }
 .header-navigation.el-tabs--border-card > .el-tabs__header {
   background: #fff;
diff --git a/src/views/index/index.less b/src/views/index/index.less
index 0e74c88..196a224 100644
--- a/src/views/index/index.less
+++ b/src/views/index/index.less
@@ -4,6 +4,7 @@
   overflow: hidden;
   top: 54px;
   bottom: 0;
+      border-right: 1px solid #e4e4e7;
 }
 .vol-menu{
   border: 0 !important;
@@ -25,11 +26,11 @@
 .top-logo {
   display: flex;
   align-items: center;
-  padding: 0 20px;
-  min-width: 215px;
+  padding: 0 10px;
+  min-width: 200px;
   height: 100%;
   flex-shrink: 0;
-  border-right: 1px solid rgba(255, 255, 255, 0.2);
+  // border-right: 1px solid rgba(255, 255, 255, 0.2);
   img {
     height: 30px;
     margin-right: 10px;
@@ -51,8 +52,15 @@
   height: 100%;
   padding: 0 8px 0 16px;
   gap: 6px;
-  overflow: hidden;
+  overflow-x: auto;
+  overflow-y: hidden;
   min-width: 0;
+  // 隐藏滚动条但保留滚动功能
+  scrollbar-width: none;
+  -ms-overflow-style: none;
+  &::-webkit-scrollbar {
+    display: none;
+  }
 }
 
 // 测量容器（全部菜单项不可见渲染，用于获取宽度）
@@ -100,6 +108,7 @@
 .top-nav-item {
   display: inline-flex;
   align-items: center;
+  flex-shrink: 0;
   height: 32px;
   padding: 0 16px;
   color: rgba(255, 255, 255, 0.88);
@@ -200,11 +209,11 @@
 .vol-aside ::v-deep(.el-menu-item) {
   height: 40px;
   line-height: 40px;
-  margin: 1px 8px 1px 0;
+  margin: 2px 8px 2px 0;
   border-radius: 0 20px 20px 0;
   transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);
   font-size: 13.5px;
-  color: #4a5568;
+  // color: #4a5568;
   overflow: hidden;
 }
 .vol-aside ::v-deep(.el-sub-menu__title) {
@@ -212,7 +221,7 @@
   line-height: 40px;
   font-size: 13.5px;
   color: #1a202c;
-  font-weight: 600;
+  // font-weight: 600;
   transition: background 0.2s;
   letter-spacing: 0.3px;
 }
@@ -225,8 +234,8 @@
 }
 .vol-aside ::v-deep(.el-menu-item.is-active) {
   background: linear-gradient(90deg, #dbeeff 0%, #f0f8ff 100%) !important;
-  color: #2563eb !important;
-  font-weight: 600;
+  color: #2d8cf0 !important;
+  // font-weight: 600;
   box-shadow: inset 3px 0 0 #2d8cf0;
 }
 // ====== 侧边栏菜单美化 END ======
@@ -278,7 +287,7 @@
   position: absolute;
   margin: 0;
   box-sizing: border-box;
-  top: 54px;
+  top: 60px;
   bottom: 0;
 }
 
@@ -310,6 +319,7 @@
   top: 38px;
   margin: 0;
   overflow: hidden;
+  // padding: 4px;
 }
 
 .header {
@@ -386,7 +396,7 @@
   height: 38px;
   display: block;
   margin: 0;
-  padding: 6px 8px 0;
+  padding: 0px 8px 0;
   outline: 0;
   list-style: none;
   position: relative;
@@ -396,6 +406,7 @@
 }
 .el-tabs--border-card {
   border: none;
+  border-bottom: 1px solid #e4e4e7;
 }
 .header-navigation ::v-deep(.el-tabs__nav-wrap) {
   margin-bottom: 0;
@@ -413,11 +424,11 @@
   overflow: visible;
 }
 .header-navigation ::v-deep(.el-tabs__item) {
-  height: 30px;
-  font-size: 13px;
+  height: 37px;
+  font-size: 14px;
   line-height: 30px;
   padding: 0 14px !important;
-  color: #5f6368 !important;
+  color: #000 !important;
   position: relative;
   margin: 0 1px;
   border: none !important;
@@ -427,9 +438,10 @@
   box-shadow: none;
   overflow: visible !important;
   z-index: 1;
+  margin-right: 3px;
 }
 .header-navigation ::v-deep(.el-tabs__item.is-active) {
-  color: #2563eb !important;
+  color: #2d8cf0 !important;
   background: linear-gradient(90deg, #dbeeff 0%, #f0f8ff 100%) !important;
   font-weight: 600;
   box-shadow: none;
@@ -458,9 +470,9 @@
   box-shadow: -3px 0 0 0 #f0f8ff;
 }
 .header-navigation ::v-deep(.el-tabs__item:not(.is-active):hover) {
-  color: #2563eb !important;
+  color: #2d8cf0 !important;
   background: #ebf4ff !important;
-  border-radius: 8px 8px 0 0 !important;
+  border-radius: 8px !important;
 }
 .header-navigation ::v-deep(.el-tabs__nav-prev),
 .header-navigation ::v-deep(.el-tabs__nav-next) {
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index 9ce6619..ed3b0ca 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -27,7 +27,7 @@
                     <!-- <div class="card-icon">🎉</div> -->
                     <h2 class="card-title">欢迎使用</h2>
 
-                    <p class="card-subtitle">智慧运动平台</p>
+                    <div class="card-subtitle">智慧运动平台</div>
                     <el-form ref="ruleFormRef" :model="loginAllData.loginData.ruleForm"
                         :rules="loginAllData.loginData.rules" class="login-form">
                         <el-form-item prop="userName">
@@ -827,16 +827,17 @@ async function ModifyPwdApi(val) {
             }
 
             .card-subtitle {
-                font-size: 30px;
+                font-size: 33px;
                 font-family: zhuiguang;
                 font-weight: 400;
                 color: #4188FE;
-                line-height: 20px;
+                // line-height: 20px;
                 // letter-spacing: 6px;
                 text-shadow: 0px 2px 4px rgba(58, 136, 221, 0.32);
                 // margin-left: 40px;
                 text-align: left;
-                margin-bottom: 50px;
+                margin-bottom: 25px;
+                margin-top: 13px;
             }
 
             .login-form {
diff --git a/src/views/physicalManagement/index.vue b/src/views/physicalManagement/index.vue
index c395d3b..9ded6f2 100644
--- a/src/views/physicalManagement/index.vue
+++ b/src/views/physicalManagement/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
     <commonManage>
         <div class="head">
             <div class="left">
@@ -16,7 +16,7 @@
         </div>
         <div class="cont">
             <el-table :data="data.tableNeed.tableData" highlight-current-row
-                style="width: calc(100% - 40px) ;height: 80vh; margin:0 20px ;" fit="true"
+                style="width: calc(100% - 40px) ;height: calc(100vh - 210px); margin:0 20px ;" fit="true"
                 @selection-change="handleSelectionChange"
                 :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', 'color': '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }"
                 :cell-style="getCellStyles" :row-style="{ height: '0px' }">
diff --git a/src/views/physicalMeasurement/index.vue b/src/views/physicalMeasurement/index.vue
index 014cb60..d44cd27 100644
--- a/src/views/physicalMeasurement/index.vue
+++ b/src/views/physicalMeasurement/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
     <commonManage>
         <div class="head">
             <div class="left">
@@ -10,7 +10,7 @@
             </div>
         </div>
         <div class="cont">
-            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: 80vh; margin:0 20px ;"
+            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: calc(100vh - 210px); margin:0 20px ;"
                 fit="true" v-if="data.tableNeed.tableData.length > 0"
                 :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', 'color': '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }"
                 :cell-style="{ 'text-align': 'center', padding: '3px', height: '50px' }" :row-style="{ height: '36.55px' }">
diff --git a/src/views/popularCurricular/index.vue b/src/views/popularCurricular/index.vue
index 0f69dcc..648dc71 100644
--- a/src/views/popularCurricular/index.vue
+++ b/src/views/popularCurricular/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <commonManage>
     <div class="head">
       <div class="left">
@@ -28,7 +28,7 @@
       
     </div>
     <div class="cont">
-      <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: 80vh; margin:0 20px ;" fit="true"
+      <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: calc(100vh - 210px); margin:0 20px ;" fit="true"
         :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', 'color': '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }"
         :cell-style="getCellStyles" :row-style="{ height: '0px' }">
         <el-table-column fixed prop="ind" label="序号" />
diff --git a/src/views/projectManage/index.vue b/src/views/projectManage/index.vue
index b9e31e1..c9b023b 100644
--- a/src/views/projectManage/index.vue
+++ b/src/views/projectManage/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
     <commonManage>
         <div class="head">
             <div class="left">
@@ -18,7 +18,7 @@
             </div>
         </div>
         <div class="cont">
-            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: 80vh; margin:0 20px ;"
+            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: calc(100vh - 210px); margin:0 20px ;"
                 fit="true"
                 :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', 'color': '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }"
                 :cell-style="getCellStyles" :row-style="{ height: '0px' }" @select="select" @select-all="select">
diff --git a/src/views/resourceLibrary/index.vue b/src/views/resourceLibrary/index.vue
index 4a91269..89a9201 100644
--- a/src/views/resourceLibrary/index.vue
+++ b/src/views/resourceLibrary/index.vue
@@ -241,7 +241,7 @@
         
         <!-- PDF预览 -->
         <div v-else-if="isPdf(previewDialog.resource)" class="pdf-preview">
-          <iframe :src="previewDialog.resource.fileUrl" style="width: 100%; height: 80vh;"></iframe>
+          <iframe :src="previewDialog.resource.fileUrl" style="width: 100%; height: 75vh;"></iframe>
         </div>
         
         <!-- 其他文件类型 -->
@@ -859,7 +859,7 @@ onMounted(() => {
 
 .image-preview img {
   max-width: 100%;
-  max-height: 80vh;
+  max-height: 75vh;
 }
 
 .other-preview {
diff --git a/src/views/schoolManage/index.vue b/src/views/schoolManage/index.vue
index eb6f04c..31ab896 100644
--- a/src/views/schoolManage/index.vue
+++ b/src/views/schoolManage/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
     <commonManage>
         <div class="head">
             <div class="left">
@@ -37,7 +37,7 @@
             </div>
         </div>
         <div class="cont">
-            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: 80vh; margin:0 20px ;"
+            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: calc(100vh - 210px); margin:0 20px ;"
                 fit="true"
                 :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', 'color': '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }"
                 :cell-style="getCellStyles" :row-style="{ height: '0px' }">
diff --git a/src/views/specializedTeaching/ropeJumping/index.vue b/src/views/specializedTeaching/ropeJumping/index.vue
index 5d9f2cb..80b60df 100644
--- a/src/views/specializedTeaching/ropeJumping/index.vue
+++ b/src/views/specializedTeaching/ropeJumping/index.vue
@@ -1170,7 +1170,7 @@ async function ModifySpecialAction(val) {
 
     .elMenu {
       margin-top: -14px;
-      height: 80vh;
+      height: 75vh;
     }
 
     :deep(.el-menu) {
diff --git a/src/views/stadiumManage/index.vue b/src/views/stadiumManage/index.vue
index 8ff8ee5..c80e86b 100644
--- a/src/views/stadiumManage/index.vue
+++ b/src/views/stadiumManage/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
     <commonManage>
         <div class="head">
             <div class="left">
@@ -12,7 +12,7 @@
             </div>
         </div>
         <div class="cont">
-            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: 80vh; margin:0 20px ;"
+            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: calc(100vh - 210px); margin:0 20px ;"
                 fit="true"
                 :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', 'color': '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }"
                 :cell-style="getCellStyles" :row-style="{ height: '0px' }">
diff --git a/src/views/studentTransfer/index.vue b/src/views/studentTransfer/index.vue
index 54046f6..a0a9ecc 100644
--- a/src/views/studentTransfer/index.vue
+++ b/src/views/studentTransfer/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
     <commonManage>
         <div class="head">
             <div class="left">
@@ -10,7 +10,7 @@
             </div>
         </div>
         <div class="cont">
-            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: 80vh; margin:0 20px ;"
+            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: calc(100vh - 210px); margin:0 20px ;"
                 fit="true" v-if="data.tableNeed.tableData.length > 0"
                 :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', 'color': '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }"
                 :cell-style="{ 'text-align': 'center', padding: '3px', height: '50px' }" :row-style="{ height: '36.55px' }">
@@ -204,12 +204,12 @@ onMounted(() => {
         .Export,
         .Add {
             margin-right: 20px;
-            width: 98px;
-            height: 40px;
+            width: 80px;
+            height: 33px;
             background: #4188FE;
             border-radius: 4px;
             text-align: center;
-            // line-height: 40px;
+            // line-height: 33px;
             font-size: 14px;
             font-family: PingFangSC;
             font-weight: 400;
@@ -220,26 +220,26 @@ onMounted(() => {
             justify-content: center;
         }
 
-        .Export::before {
-            content: '';
-            background: url('@/assets/images/allImg/export.png') no-repeat;
-            background-size: cover;
-            width: 14px;
-            height: 14px;
-            font-size: 12px;
-            margin-right: 5px;
-        }
+    //     .Export::before {
+    //         content: '';
+    //         background: url('@/assets/images/allImg/export.png') no-repeat;
+    //         background-size: cover;
+    //         width: 14px;
+    //         height: 14px;
+    //         font-size: 12px;
+    //         margin-right: 5px;
+    //     }
 
-        .Add::before {
-            content: '';
-            background: url('@/assets/images/allImg/add.png') no-repeat;
-            background-size: cover;
-            width: 14px;
-            height: 14px;
-            font-size: 12px;
-            margin-right: 5px;
-        }
-    }
+    //     .Add::before {
+    //         content: '';
+    //         background: url('@/assets/images/allImg/add.png') no-repeat;
+    //         background-size: cover;
+    //         width: 14px;
+    //         height: 14px;
+    //         font-size: 12px;
+    //         margin-right: 5px;
+    //     }
+    // }
 
     :deep(.el-table) {
         border-top-left-radius: 8px;
diff --git a/src/views/studentsManage/examinationRecords/index.vue b/src/views/studentsManage/examinationRecords/index.vue
index 6579acb..c8dab5a 100644
--- a/src/views/studentsManage/examinationRecords/index.vue
+++ b/src/views/studentsManage/examinationRecords/index.vue
@@ -1,4 +1,4 @@
-<!-- 赛事发布 -->
+<!-- 赛事发布 -->
 <template>
     <div class="eventRelease">
         <div class="right">
@@ -103,7 +103,7 @@ const data = ref({
             pageSize: 10,
             //模拟数据 1,5 数据正常
             total: 0,
-            height: '75vh',
+            height: 'calc(100vh - 210px)',
             tdHeight: '56px',
             tableLabel: [
                 {
diff --git a/src/views/studentsManage/index.vue b/src/views/studentsManage/index.vue
index 2980362..1feaa86 100644
--- a/src/views/studentsManage/index.vue
+++ b/src/views/studentsManage/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
     <commonManage>
         <div class="head">
             <div class="left">
@@ -33,7 +33,7 @@
                 {{ item.chinName }}</p>
         </div>
         <div class="cont">
-            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: 80vh; margin:0 20px ;"
+            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: calc(100vh - 323px); margin:0 20px ; margin-top: 20px;"
                 fit="true" v-if="data.tableNeed.refresh"
                 :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', 'color': '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }"
                 :cell-style="getCellStyles" :row-style="{ height: '0px' }">
@@ -1349,7 +1349,7 @@ function exportData(val) {
 
 
         .m-2 {
-            width: 180px;
+            width: 130px;
         }
     }
 
@@ -1365,7 +1365,7 @@ function exportData(val) {
 
 .rightBtn {
     width: 100%;
-    height: 100%;
+    // height: 100%;
     display: flex;
     align-items: center;
     justify-content: right;
@@ -1377,12 +1377,12 @@ function exportData(val) {
     .Audit,
     .Export {
         margin-right: 20px;
-        width: 94px;
-        height: 40px;
+        width: 80px;
+        height: 35px;
         background: #4188FE;
         border-radius: 4px;
         text-align: center;
-        // line-height: 40px;
+        // line-height: 35px;
         font-size: 14px;
         font-family: PingFangSC;
         font-weight: 400;
@@ -1402,7 +1402,7 @@ function exportData(val) {
 
     .Upload {
         width: 95px;
-        height: 40px;
+        height: 35px;
         background: #FAFAFA;
         border-radius: 4px;
         border: 1px solid rgba(0, 0, 0, 0.15);
@@ -1411,7 +1411,7 @@ function exportData(val) {
         font-size: 14px;
         color: rgba(0, 0, 0, 0.65);
         text-align: center;
-        line-height: 40px;
+        line-height: 35px;
         margin-right: 20px;
         cursor: pointer;
         user-select: none;
@@ -1419,7 +1419,7 @@ function exportData(val) {
 
     .Search {
         width: 95px;
-        height: 40px;
+        height: 35px;
         background: #4188FE;
         border-radius: 4px;
         border: 1px solid rgba(0, 0, 0, 0.15);
@@ -1428,31 +1428,31 @@ function exportData(val) {
         font-size: 14px;
         color: #fff;
         text-align: center;
-        line-height: 40px;
+        line-height: 35px;
         cursor: pointer;
         user-select: none;
         margin-right: 20px;
     }
 
-    .Add::before {
-        content: '';
-        background: url('@/assets/images/allImg/add.png') no-repeat;
-        background-size: cover;
-        width: 14px;
-        height: 14px;
-        font-size: 12px;
-        margin-right: 5px;
-    }
+    // .Add::before {
+    //     content: '';
+    //     background: url('@/assets/images/allImg/add.png') no-repeat;
+    //     background-size: cover;
+    //     width: 14px;
+    //     height: 14px;
+    //     font-size: 12px;
+    //     margin-right: 5px;
+    // }
 
-    .Search::before {
-        content: '';
-        background: url('@/assets/images/allImg/search.png') no-repeat;
-        background-size: cover;
-        width: 14px;
-        height: 14px;
-        font-size: 12px;
-        margin-right: 5px;
-    }
+    // .Search::before {
+    //     content: '';
+    //     background: url('@/assets/images/allImg/search.png') no-repeat;
+    //     background-size: cover;
+    //     width: 14px;
+    //     height: 14px;
+    //     font-size: 12px;
+    //     margin-right: 5px;
+    // }
 }
 
 
@@ -1516,7 +1516,7 @@ function exportData(val) {
 
         .el-form {
             // width: 500px;
-            // height: 40px;
+            // height: 35px;
             display: flex;
 
             flex-wrap: wrap;
@@ -1612,6 +1612,7 @@ function exportData(val) {
 }
 
 .pagination {
-    margin-left: 20px
+    margin-left: 28px;
+    margin-top: 15px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/studentsManage/trainingRecords/index.vue b/src/views/studentsManage/trainingRecords/index.vue
index 122f73b..998161d 100644
--- a/src/views/studentsManage/trainingRecords/index.vue
+++ b/src/views/studentsManage/trainingRecords/index.vue
@@ -1,4 +1,4 @@
-<!-- 赛事发布 -->
+<!-- 赛事发布 -->
 <template>
     <div class="eventRelease">
         <div class="right">
@@ -102,7 +102,7 @@ const data = ref({
             pageIndex: 1,
             pageSize: 10,
             total: 0,
-            height: '75vh',
+            height: 'calc(100vh - 210px)',
             tdHeight: '56px',
             tableLabel: [
                 {
diff --git a/src/views/teacherManage/index.vue b/src/views/teacherManage/index.vue
index caa460c..5cd2b6c 100644
--- a/src/views/teacherManage/index.vue
+++ b/src/views/teacherManage/index.vue
@@ -894,8 +894,8 @@
       .addTeacher,
       .Export {
         margin-right: 20px;
-        width: 98px;
-        height: 40px;
+        width: 80px;
+        height: 35px;
         background: #4188fe;
         border-radius: 4px;
         text-align: center;
@@ -911,8 +911,8 @@
       }
 
       .Audit {
-        width: 95px;
-        height: 40px;
+        width: 80px;
+        height: 33px;
         background: #fafafa;
         border-radius: 4px;
         border: 1px solid rgba(0, 0, 0, 0.15);
@@ -921,15 +921,15 @@
         font-size: 14px;
         color: rgba(0, 0, 0, 0.65);
         text-align: center;
-        line-height: 40px;
+        line-height: 33px;
         margin-right: 20px;
         cursor: pointer;
         user-select: none;
       }
 
       .Search {
-        width: 95px;
-        height: 40px;
+        width: 80px;
+        height: 33px;
         background: #4188fe;
         border-radius: 4px;
         border: 1px solid rgba(0, 0, 0, 0.15);
@@ -938,31 +938,31 @@
         font-size: 14px;
         color: #fff;
         text-align: center;
-        line-height: 40px;
+        line-height: 33px;
         cursor: pointer;
         user-select: none;
         margin-right: 20px;
       }
 
-      .addTeacher::before {
-        content: "";
-        background: url("@/assets/images/allImg/add.png") no-repeat;
-        background-size: cover;
-        width: 14px;
-        height: 14px;
-        font-size: 12px;
-        margin-right: 5px;
-      }
+      // .addTeacher::before {
+      //   content: "";
+      //   background: url("@/assets/images/allImg/add.png") no-repeat;
+      //   background-size: cover;
+      //   width: 14px;
+      //   height: 14px;
+      //   font-size: 12px;
+      //   margin-right: 5px;
+      // }
 
-      .Search::before {
-        content: "";
-        background: url("@/assets/images/allImg/search.png") no-repeat;
-        background-size: cover;
-        width: 14px;
-        height: 14px;
-        font-size: 12px;
-        margin-right: 5px;
-      }
+      // .Search::before {
+      //   content: "";
+      //   background: url("@/assets/images/allImg/search.png") no-repeat;
+      //   background-size: cover;
+      //   width: 14px;
+      //   height: 14px;
+      //   font-size: 12px;
+      //   margin-right: 5px;
+      // }
     }
   }
 
diff --git a/src/views/userManage/index.vue b/src/views/userManage/index.vue
index 0672cb9..c43f82a 100644
--- a/src/views/userManage/index.vue
+++ b/src/views/userManage/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
     <commonManage>
         <div class="head">
             <div class="left">
@@ -42,7 +42,7 @@
             </div>
         </div>
         <div class="cont">
-            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: 80vh; margin:0 20px ;"
+            <el-table :data="data.tableNeed.tableData" style="width: calc(100% - 40px) ;height: calc(100vh - 210px); margin:0 20px ;"
                 fit="true"
                 :header-cell-style="{ 'text-align': 'center', 'font-size': '12px', 'color': '#3F404A', padding: '3px', background: '#F8F8FA', height: '50px' }"
                 :cell-style="getCellStyles" :row-style="{ height: '0px' }">