zhuliu 2 éve
szülő
commit
a02fe87b48

+ 3 - 1
RMS-FrontEnd/src/views/layout/ReportAdmin.vue

@@ -18,7 +18,9 @@
           <el-main class="admin-main-box">
             <router-view></router-view>
           </el-main>
-          <Footer></Footer>
+          <el-footer style="height:44px" v-if="aside">
+            <Footer ></Footer>
+          </el-footer>
         </el-container>
       </el-container>
     </section>

+ 6 - 2
RMS-FrontEnd/src/views/layout/index.vue

@@ -42,9 +42,12 @@
         <el-container>
           <el-header></el-header>
           <el-main class="admin-main-box">
-            <router-view style="100%"></router-view>
+            <router-view style=""></router-view>
           </el-main>
-          <Footer v-if="aside"></Footer>
+          <el-footer style="height:44px" v-if="aside">
+            <Footer ></Footer>
+          </el-footer>
+          
         </el-container>
       </el-container>
     </section>
@@ -205,6 +208,7 @@ export default {
   .wrapper {
     width: 100%;
     height: calc(100% - 71px);
+    // height: 100%;
 
     .el-menu-item.is-active {
       background: #ecf5ff !important;

+ 1 - 1
RMS-FrontEnd/src/views/report/components/Tabel.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-table :data="data" border ref="table" :height="tableHeight-35" header-row-class-name="custom-table-header" @sort-change="sortChange">
+    <el-table :data="data" border ref="table" :height="tableHeight - 25" header-row-class-name="custom-table-header" @sort-change="sortChange">
       <el-table-column label="#" align="center" width="50px">
         <template slot-scope="scope">
           <span>{{ (scope.$index + 1) + ((params.current - 1) * params.size) }}</span>