From 2c2ebef9d0e6ef08b05c039457aec97f974dea22 Mon Sep 17 00:00:00 2001
From: ds <ds@qq.com>
Date: Fri, 1 Nov 2024 15:08:04 +0800
Subject: [PATCH] 11.1

---
 fuintAdmin/src/views/EventMarketing/center/index.vue  |  8 ++++----
 .../src/views/EventMarketing/giftBlock/index.vue      |  4 ++--
 .../src/views/EventMarketing/newCertificate/index.vue |  2 +-
 fuintAdmin/src/views/convenienceStore/goodsFile.vue   |  2 +-
 fuintAdmin/src/views/convenienceStore/goodsSale.vue   |  2 +-
 fuintAdmin/src/views/convenienceStore/pinlei.vue      |  2 +-
 .../src/views/convenienceStore/purchase/purchase.vue  |  2 +-
 .../src/views/convenienceStore/returns/index.vue      |  2 +-
 .../src/views/convenienceStore/stockStatistic.vue     |  2 +-
 fuintAdmin/src/views/convenienceStore/supplier.vue    |  4 ++--
 fuintAdmin/src/views/duty/index.vue                   |  2 +-
 fuintAdmin/src/views/feedBack/index.vue               |  2 +-
 .../src/views/financialStatement/buy/tab/em.vue       |  2 +-
 .../src/views/financialStatement/buy/tab/goods.vue    |  2 +-
 .../src/views/financialStatement/buy/tab/gun.vue      |  2 +-
 .../src/views/financialStatement/buy/tab/inter.vue    |  2 +-
 .../src/views/financialStatement/buy/tab/oil.vue      |  2 +-
 .../reconciliation/tab/favourable.vue                 |  2 +-
 .../financialStatement/reconciliation/tab/ref.vue     |  4 ++--
 .../financialStatement/reconciliation/tab/trading.vue |  4 ++--
 .../views/financialStatement/runningWater/tab/day.vue |  2 +-
 .../financialStatement/runningWater/tab/oilDepot.vue  |  2 +-
 fuintAdmin/src/views/fleet/tab/fleetInfo.vue          |  4 ++--
 fuintAdmin/src/views/fleet/tab/fleetMember.vue        |  6 +++---
 fuintAdmin/src/views/integral/gift/gift.vue           |  4 ++--
 fuintAdmin/src/views/integral/order/index.vue         |  4 ++--
 fuintAdmin/src/views/member/creditIndex.vue           |  2 +-
 fuintAdmin/src/views/member/index.vue                 |  6 +++---
 fuintAdmin/src/views/member/manage.vue                |  6 +++---
 fuintAdmin/src/views/member/userLabel.vue             |  2 +-
 fuintAdmin/src/views/oilConfig/oilGun/list.vue        |  2 +-
 fuintAdmin/src/views/oilConfig/oilInventory/list.vue  |  2 +-
 fuintAdmin/src/views/oilConfig/oilPurchase/list.vue   |  2 +-
 fuintAdmin/src/views/oilConfig/oilStatistics/list.vue |  2 +-
 fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue  |  2 +-
 fuintAdmin/src/views/oilConfig/oilTank/list.vue       |  2 +-
 fuintAdmin/src/views/order/order_Added.vue            |  4 +++-
 fuintAdmin/src/views/order/order_Goods.vue            |  9 +++++++--
 fuintAdmin/src/views/order/order_Oil.vue              | 11 ++++++++---
 fuintAdmin/src/views/order/order_Vip.vue              |  3 ++-
 fuintAdmin/src/views/power/message.vue                |  2 +-
 fuintAdmin/src/views/power/page/mode.vue              |  4 ++--
 fuintAdmin/src/views/power/page/record.vue            |  2 +-
 .../src/views/setting/device/content/youqiji.vue      |  2 +-
 fuintAdmin/src/views/setting/print/index.vue          |  4 ++--
 fuintAdmin/src/views/staff/list.vue                   |  2 +-
 .../src/views/staffCommission/staffCommission.vue     |  4 ++--
 fuintAdmin/src/views/userGrade/index.vue              |  6 +++---
 48 files changed, 85 insertions(+), 72 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/center/index.vue b/fuintAdmin/src/views/EventMarketing/center/index.vue
index d751ea674..a53e9c237 100644
--- a/fuintAdmin/src/views/EventMarketing/center/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/center/index.vue
@@ -9,7 +9,7 @@
     </div>
     <div class="rp-box">
       <!--      营销活动-->
-      <div class="bai-box" style="height: 84.5vh;overflow: auto" v-show="tabindex == 0">
+      <div class="bai-box" style="overflow: auto" v-show="tabindex == 0">
         <div class="d-s">
           <div class="gang"></div>
           <div style="font-weight: bold">会员营销</div>
@@ -217,7 +217,7 @@
             <el-button icon="el-icon-refresh-right" @click="resetQuery">重置</el-button>
           </div>
         </div>
-        <div style="height: 70vh;overflow: auto">
+        <div style="height: 66vh;overflow: auto">
           <el-table
             :data="tableData"
             border
@@ -312,7 +312,7 @@
             <el-button icon="el-icon-refresh-right" @click="resetOldQuery">重置</el-button>
           </div>
         </div>
-        <div style="height: 70vh;overflow: auto">
+        <div style="height: 66vh;overflow: auto">
           <el-table
             :data="oldTableData"
             border
@@ -733,7 +733,7 @@ export default {
 
 .bai-box {
   width: 100%;
-  height: 100%;
+  height: 83vh;
   background: #fff;
   border-radius: 10px;
   box-sizing: border-box;
diff --git a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
index e9613848b..3fbc0551b 100644
--- a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
@@ -804,7 +804,7 @@ export default {
 }
 .table-box{
   width: 100%;
-  height: 70vh;
+  height: 68vh;
   overflow: auto;
   scrollbar-width: none;
   //padding: 15px;
@@ -916,7 +916,7 @@ export default {
 
 .card-boxs {
   width: 100%;
-  height: 85vh;
+  height: 83.5vh;
   background: #fff;
   box-sizing: border-box;
   padding: 15px;
diff --git a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
index 5eb28d99b..482b804ad 100644
--- a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
@@ -25,7 +25,7 @@
           <el-button type="primary" @click="addCertificate">新增优惠券</el-button>
         </div>
       </div>
-      <div style="height: 71vh;overflow: auto">
+      <div style="height: 68.5vh;overflow: auto">
         <el-table border :data="tableData" style="width: 100%">
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column prop="number" label="优惠券编号"></el-table-column>
diff --git a/fuintAdmin/src/views/convenienceStore/goodsFile.vue b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
index f3367e260..a344a5ce0 100644
--- a/fuintAdmin/src/views/convenienceStore/goodsFile.vue
+++ b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
@@ -75,7 +75,7 @@
         <div style="font-size: 12px;color: red;margin: 5px 0">注：库存为0或未设置零售价和会员价的商品不可上架</div>
       </div>
 
-      <div style="height: 68vh;overflow: auto">
+      <div style="height: 66vh;overflow: auto">
         <el-table ref="tables" v-loading="loading" :data="list"
                   @selection-change="handleSelectionChange"
                   border
diff --git a/fuintAdmin/src/views/convenienceStore/goodsSale.vue b/fuintAdmin/src/views/convenienceStore/goodsSale.vue
index 1a3aeb754..d240be9fd 100644
--- a/fuintAdmin/src/views/convenienceStore/goodsSale.vue
+++ b/fuintAdmin/src/views/convenienceStore/goodsSale.vue
@@ -44,7 +44,7 @@
         </el-form-item>
       </el-form>
 
-      <div style="height: 71vh;overflow: auto">
+      <div style="height: 69vh;overflow: auto">
         <el-table ref="tables" v-loading="loading" :data="list" border
                   @selection-change="handleSelectionChange" :default-sort="defaultSort"
                   @sort-change="handleSortChange">
diff --git a/fuintAdmin/src/views/convenienceStore/pinlei.vue b/fuintAdmin/src/views/convenienceStore/pinlei.vue
index 7d302db76..efb9f6117 100644
--- a/fuintAdmin/src/views/convenienceStore/pinlei.vue
+++ b/fuintAdmin/src/views/convenienceStore/pinlei.vue
@@ -28,7 +28,7 @@
         </el-form-item>
       </el-form>
 
-      <div style="height: 70vh;overflow: auto">
+      <div style="height: 68vh;overflow: auto">
         <el-table ref="tables" v-loading="loading" :data="list" row-key="id" border>
           <el-table-column type="expand">
             <template slot-scope="props">
diff --git a/fuintAdmin/src/views/convenienceStore/purchase/purchase.vue b/fuintAdmin/src/views/convenienceStore/purchase/purchase.vue
index 9d4993a17..ec99d467c 100644
--- a/fuintAdmin/src/views/convenienceStore/purchase/purchase.vue
+++ b/fuintAdmin/src/views/convenienceStore/purchase/purchase.vue
@@ -52,7 +52,7 @@
         </el-form-item>
       </el-form>
 
-      <div style="height: 71vh;overflow: auto;scrollbar-width: none">
+      <div style="height: 69vh;overflow: auto;scrollbar-width: none">
         <el-table ref="tables" border
                   v-loading="loading"
                   :data="purchaseList"
diff --git a/fuintAdmin/src/views/convenienceStore/returns/index.vue b/fuintAdmin/src/views/convenienceStore/returns/index.vue
index 53a2f4d8b..51e134b6e 100644
--- a/fuintAdmin/src/views/convenienceStore/returns/index.vue
+++ b/fuintAdmin/src/views/convenienceStore/returns/index.vue
@@ -53,7 +53,7 @@
         </el-form-item>
       </el-form>
 
-      <div style="height: 71vh;overflow: auto">
+      <div style="height: 69vh;overflow: auto">
         <el-table ref="tables" border
                   v-loading="loading"
                   :data="returnsList"
diff --git a/fuintAdmin/src/views/convenienceStore/stockStatistic.vue b/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
index d7ab527c4..14a277bee 100644
--- a/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
+++ b/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
@@ -93,7 +93,7 @@
           </el-button>
         </el-form-item>
       </el-form>
-      <div style="height: 71vh;overflow: auto;scrollbar-width: none">
+      <div style="height: 69vh;overflow: auto;scrollbar-width: none">
         <el-table ref="tables" v-loading="loading" :data="list" border
                   @selection-change="handleSelectionChange" :default-sort="defaultSort"
                   @sort-change="handleSortChange">
diff --git a/fuintAdmin/src/views/convenienceStore/supplier.vue b/fuintAdmin/src/views/convenienceStore/supplier.vue
index 81ec9a271..9ae4cf01f 100644
--- a/fuintAdmin/src/views/convenienceStore/supplier.vue
+++ b/fuintAdmin/src/views/convenienceStore/supplier.vue
@@ -42,7 +42,7 @@
         </el-form-item>
       </el-form>
 
-      <div style="height: 70vh;overflow: auto">
+      <div style="height: 68vh;overflow: auto">
         <el-table ref="tables" v-loading="loading" :data="list" border
                   @selection-change="handleSelectionChange" :default-sort="defaultSort"
                   @sort-change="handleSortChange">
@@ -309,7 +309,7 @@ export default {
 <style lang="scss" scoped>
 .app-container {
   width: 100%;
-  height: 100vh;
+  height: 100%;
   background: #f6f8f9;
 }
 </style>
diff --git a/fuintAdmin/src/views/duty/index.vue b/fuintAdmin/src/views/duty/index.vue
index 5acaeaf81..5141c1970 100644
--- a/fuintAdmin/src/views/duty/index.vue
+++ b/fuintAdmin/src/views/duty/index.vue
@@ -32,7 +32,7 @@
         </el-form-item>
       </el-form>
 
-      <div style="height: 76vh;overflow: auto">
+      <div style="height: 74vh;overflow: auto">
         <el-table ref="tables"
                   border
                   v-loading="loading"
diff --git a/fuintAdmin/src/views/feedBack/index.vue b/fuintAdmin/src/views/feedBack/index.vue
index 152cad9e8..a45bb7248 100644
--- a/fuintAdmin/src/views/feedBack/index.vue
+++ b/fuintAdmin/src/views/feedBack/index.vue
@@ -32,7 +32,7 @@
 
       </el-form>
 
-      <div style="height: 76.5vh;overflow: auto">
+      <div style="height: 74vh;overflow: auto">
         <el-table border v-loading="loading" :data="list">
           <el-table-column type="index" width="80" align="center" label="序号"/>
           <el-table-column align="center" prop="storeName" label="所属机构"/>
diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/em.vue b/fuintAdmin/src/views/financialStatement/buy/tab/em.vue
index b3e40cdb1..9008cf155 100644
--- a/fuintAdmin/src/views/financialStatement/buy/tab/em.vue
+++ b/fuintAdmin/src/views/financialStatement/buy/tab/em.vue
@@ -371,7 +371,7 @@ export default {
   box-sizing: border-box;
   padding: 15px;
   border-radius: 4px;
-  height: 80vh;
+  height: 78vh;
 }
 .pagination-box{
   width: 100%;
diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/goods.vue b/fuintAdmin/src/views/financialStatement/buy/tab/goods.vue
index 1f04e099f..00d8fa339 100644
--- a/fuintAdmin/src/views/financialStatement/buy/tab/goods.vue
+++ b/fuintAdmin/src/views/financialStatement/buy/tab/goods.vue
@@ -371,7 +371,7 @@ export default {
   box-sizing: border-box;
   padding: 15px;
   border-radius: 4px;
-  height: 80vh;
+  height: 78vh;
 }
 .pagination-box{
   width: 100%;
diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue b/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue
index 86ac8ab83..6d10ee0be 100644
--- a/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue
+++ b/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue
@@ -365,7 +365,7 @@ export default {
   box-sizing: border-box;
   padding: 15px;
   border-radius: 4px;
-  height: 80vh;
+  height: 78%;
 }
 .pagination-box{
   width: 100%;
diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/inter.vue b/fuintAdmin/src/views/financialStatement/buy/tab/inter.vue
index 2ff39a50b..16f7001e4 100644
--- a/fuintAdmin/src/views/financialStatement/buy/tab/inter.vue
+++ b/fuintAdmin/src/views/financialStatement/buy/tab/inter.vue
@@ -340,7 +340,7 @@ export default {
   box-sizing: border-box;
   padding: 15px;
   border-radius: 4px;
-  height: 80.5vh;
+  height: 78vh;
 }
 .pagination-box{
   width: 100%;
diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/oil.vue b/fuintAdmin/src/views/financialStatement/buy/tab/oil.vue
index a84e3630c..f6dd39588 100644
--- a/fuintAdmin/src/views/financialStatement/buy/tab/oil.vue
+++ b/fuintAdmin/src/views/financialStatement/buy/tab/oil.vue
@@ -369,7 +369,7 @@ export default {
   box-sizing: border-box;
   padding: 15px;
   border-radius: 4px;
-  height: 80vh;
+  height: 78vh;
 }
 .pagination-box{
   width: 100%;
diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue
index 4d630b24c..f509dc3db 100644
--- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue
+++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue
@@ -569,7 +569,7 @@ export default {
   box-sizing: border-box;
   padding: 15px;
   border-radius: 4px;
-  height: 73vh;
+  height: 72vh;
 }
 
 </style>
diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
index 39bf82200..db5b37908 100644
--- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
+++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
@@ -532,7 +532,7 @@ export default {
 }
 .table-box{
   width: 100%;
-  height: 58vh;
+  height: 52vh;
   overflow: auto;
 }
 .pagination-box{
@@ -567,7 +567,7 @@ export default {
   box-sizing: border-box;
   padding: 15px;
   border-radius: 4px;
-  height: 72vh;
+  height: 71vh;
 }
 
 </style>
diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
index c966fc543..272d07792 100644
--- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
+++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
@@ -560,7 +560,7 @@ export default {
 
 .table-box {
   width: 100%;
-  height: 56vh;
+  height: 52vh;
   overflow: auto;
   scrollbar-width: none;
 }
@@ -601,7 +601,7 @@ export default {
   box-sizing: border-box;
   padding: 15px;
   border-radius: 4px;
-  height: 73vh;
+  height: 71vh;
 }
 
 </style>
diff --git a/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue b/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue
index cac45bdbf..858998a9a 100644
--- a/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue
+++ b/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue
@@ -383,7 +383,7 @@ export default {
   box-sizing: border-box;
   padding: 15px;
   border-radius: 4px;
-  height: 79vh;
+  height: 78vh;
 }
 .pagination-box{
   width: 100%;
diff --git a/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue b/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue
index 98eec0861..89f824c1b 100644
--- a/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue
+++ b/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue
@@ -369,7 +369,7 @@ import {
   box-sizing: border-box;
   padding: 15px;
   border-radius: 4px;
-  height: 79vh;
+  height: 78vh;
 }
   .pagination-box{
     width: 100%;
diff --git a/fuintAdmin/src/views/fleet/tab/fleetInfo.vue b/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
index 085a1abc5..bbd6986ef 100644
--- a/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
+++ b/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
@@ -477,7 +477,7 @@ export default {
 
 .table-box {
   width: 100%;
-  height: 73.5vh;
+  height: 70vh;
   overflow: auto;
   scrollbar-width: none;
 }
@@ -541,6 +541,6 @@ export default {
   background: #fff;
   box-sizing: border-box;
   padding: 15px;
-  height: 87vh;
+  height: 85vh;
 }
 </style>
diff --git a/fuintAdmin/src/views/fleet/tab/fleetMember.vue b/fuintAdmin/src/views/fleet/tab/fleetMember.vue
index a1b59c3a6..a179c6c9b 100644
--- a/fuintAdmin/src/views/fleet/tab/fleetMember.vue
+++ b/fuintAdmin/src/views/fleet/tab/fleetMember.vue
@@ -107,7 +107,7 @@
             </template>
           </el-table-column>
           <el-table-column align="center" prop="accountName" label="创建人"></el-table-column>
-          <el-table-column align="center" prop="createTime" label="创建时间" width="150"></el-table-column>
+          <el-table-column align="center" prop="createTime" label="创建时间" width="180"></el-table-column>
           <el-table-column align="center" label="操作" width="230">
             <template slot-scope="scope">
               <el-button
@@ -826,7 +826,7 @@ export default {
 
 .table-boxs {
   width: 100%;
-  height: 78vh;
+  height: 74vh;
   overflow: auto;
 }
 
@@ -848,6 +848,6 @@ export default {
   box-sizing: border-box;
   padding: 15px;
   padding-bottom: 0px;
-  height: 87vh;
+  height: 85vh;
 }
 </style>
diff --git a/fuintAdmin/src/views/integral/gift/gift.vue b/fuintAdmin/src/views/integral/gift/gift.vue
index c47300505..d3b652c76 100644
--- a/fuintAdmin/src/views/integral/gift/gift.vue
+++ b/fuintAdmin/src/views/integral/gift/gift.vue
@@ -1255,10 +1255,10 @@ export default {
   height: 98px;
 }
 .card-change{
-  height: 87vh;
+  height: 85vh;
 }
 .table_box{
-  height: 70vh;
+  height: 68vh;
   overflow: auto;
   scrollbar-width: none;
 }
diff --git a/fuintAdmin/src/views/integral/order/index.vue b/fuintAdmin/src/views/integral/order/index.vue
index 7268ef962..df09c9e2e 100644
--- a/fuintAdmin/src/views/integral/order/index.vue
+++ b/fuintAdmin/src/views/integral/order/index.vue
@@ -73,13 +73,13 @@
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item style="float: right">
+        <el-form-item style="float: right; margin-right: 0px;">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
           <el-button type="primary" @click="exportExcelVip">导出</el-button>
         </el-form-item>
       </el-form>
-      <div style="height: 70vh;overflow: auto">
+      <div style="height: 73.5vh;overflow: auto">
 
         <el-table ref="tables"
                   v-loading="loading"
diff --git a/fuintAdmin/src/views/member/creditIndex.vue b/fuintAdmin/src/views/member/creditIndex.vue
index fc3dbbddc..8c20174aa 100644
--- a/fuintAdmin/src/views/member/creditIndex.vue
+++ b/fuintAdmin/src/views/member/creditIndex.vue
@@ -57,7 +57,7 @@
         </el-form-item>
       </el-form>
 
-      <div style="height: 77vh;overflow: auto" >
+      <div style="height: 75vh;overflow: auto" >
       <el-table border ref="tables" v-loading="loading" :data="list" >
         <el-table-column type="index" width="80" align="center" label="序号"/>
         <el-table-column label="单位名称" prop="unitName" align="center" />
diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue
index 0f0dfd316..6f6795d77 100644
--- a/fuintAdmin/src/views/member/index.vue
+++ b/fuintAdmin/src/views/member/index.vue
@@ -164,7 +164,7 @@
 
         </el-form>
       </div>
-      <div style="height: 62vh;overflow: auto;margin-top: 15px;margin-bottom: 15px">
+      <div style="height: 58vh;overflow: auto;margin-top: 15px;margin-bottom: 15px">
         <el-table ref="tables" v-loading="loading" :data="list" border
                   @selection-change="handleSelectionChange" :default-sort="defaultSort"
                   @sort-change="handleSortChange">
@@ -318,7 +318,7 @@
         </el-form>
       </div>
       <!--      -->
-      <div style="height: 72vh;overflow: auto">
+      <div style="height: 70vh;overflow: auto">
         <el-table
           :data="massSendRecordList"
           border
@@ -1448,7 +1448,7 @@ export default {
   box-sizing: border-box;
   padding: 20px;
   margin: 0 auto;
-  height: 87vh;
+  height: 86vh;
 
 
 }
diff --git a/fuintAdmin/src/views/member/manage.vue b/fuintAdmin/src/views/member/manage.vue
index 1d1643308..6d7ca7293 100644
--- a/fuintAdmin/src/views/member/manage.vue
+++ b/fuintAdmin/src/views/member/manage.vue
@@ -43,7 +43,7 @@
         </el-form>
       </div>
       <!--      -->
-      <div style="height: 72vh;overflow: auto">
+      <div style="height: 70vh;overflow: auto">
         <el-table
           :data="userGroupList"
           border
@@ -156,7 +156,7 @@
         </el-form>
       </div>
       <!--      -->
-      <div style="height: 72vh;overflow: auto">
+      <div style="height: 70vh;overflow: auto">
         <el-table
           :data="massSendList"
           border
@@ -272,7 +272,7 @@
         </el-form>
       </div>
       <!--      -->
-      <div style="height: 72vh;overflow: auto">
+      <div style="height: 70vh;overflow: auto">
         <el-table
           :data="massSendRecordList"
           border
diff --git a/fuintAdmin/src/views/member/userLabel.vue b/fuintAdmin/src/views/member/userLabel.vue
index ffa189890..a1601a1f7 100644
--- a/fuintAdmin/src/views/member/userLabel.vue
+++ b/fuintAdmin/src/views/member/userLabel.vue
@@ -280,7 +280,7 @@ export default {
 
 .table-box {
   width: 100%;
-  height: 77vh;
+  height: 75vh;
   overflow: auto;
 }
 
diff --git a/fuintAdmin/src/views/oilConfig/oilGun/list.vue b/fuintAdmin/src/views/oilConfig/oilGun/list.vue
index 3e5bb64ac..615dcc420 100644
--- a/fuintAdmin/src/views/oilConfig/oilGun/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilGun/list.vue
@@ -48,7 +48,7 @@
         </el-form-item>
       </el-form>
       <div>
-        <div style="width: 100%;overflow: auto;height: 72vh">
+        <div style="width: 100%;overflow: auto;height: 69vh">
           <el-table ref="tables"
                   v-loading="loading"
                   :data="gunList"
diff --git a/fuintAdmin/src/views/oilConfig/oilInventory/list.vue b/fuintAdmin/src/views/oilConfig/oilInventory/list.vue
index 9584a8a24..2e296660e 100644
--- a/fuintAdmin/src/views/oilConfig/oilInventory/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilInventory/list.vue
@@ -53,7 +53,7 @@
         </el-form-item>
       </el-form>
 
-      <div style="height: 76vh;overflow: auto;scrollbar-width: none">
+      <div style="height: 74vh;overflow: auto;scrollbar-width: none">
         <el-table ref="tables"
                   v-loading="loading"
                   :data="inventoryList"
diff --git a/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue b/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
index 7b3357370..37db80447 100644
--- a/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
@@ -63,7 +63,7 @@
           </el-button>
         </el-form-item>
       </el-form>
-      <div style="height: 75vh;overflow: auto;scrollbar-width: none">
+      <div style="height: 73vh;overflow: auto;scrollbar-width: none">
         <el-table ref="tables"
                   v-loading="loading"
                   :data="purchaseList"
diff --git a/fuintAdmin/src/views/oilConfig/oilStatistics/list.vue b/fuintAdmin/src/views/oilConfig/oilStatistics/list.vue
index 5e7fc4a12..ab8b24dcf 100644
--- a/fuintAdmin/src/views/oilConfig/oilStatistics/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilStatistics/list.vue
@@ -46,7 +46,7 @@
         </el-form-item>
       </el-form>
 
-      <div style="height: 77vh;overflow: auto">
+      <div style="height: 75vh;overflow: auto">
         <el-table key="2" ref="tables"
                   v-loading="loading"
                   :data="statisticsList"
diff --git a/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue b/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
index 71e2eb580..03e40bf05 100644
--- a/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
@@ -43,7 +43,7 @@
           </el-button>
         </el-form-item>
       </el-form>
-      <div style="height: 76vh;overflow: auto">
+      <div style="height: 74vh;overflow: auto">
         <el-table ref="tables"
                   v-loading="loading"
                   :data="suppliersList"
diff --git a/fuintAdmin/src/views/oilConfig/oilTank/list.vue b/fuintAdmin/src/views/oilConfig/oilTank/list.vue
index cf636caba..819732290 100644
--- a/fuintAdmin/src/views/oilConfig/oilTank/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilTank/list.vue
@@ -53,7 +53,7 @@
       <!--    </div>-->
 
       <!--     列表-->
-      <div style="height: 72vh;overflow: auto">
+      <div style="height: 69vh;overflow: auto">
         <el-table ref="tables"
                   v-loading="loading"
                   :data="tankList"
diff --git a/fuintAdmin/src/views/order/order_Added.vue b/fuintAdmin/src/views/order/order_Added.vue
index 86622b7c9..94d409800 100644
--- a/fuintAdmin/src/views/order/order_Added.vue
+++ b/fuintAdmin/src/views/order/order_Added.vue
@@ -425,6 +425,8 @@ export default {
 
 .box-card {
   width: 100%;
+  height: 89vh;
+  border-radius: 8px;
   margin-bottom: 15px;
   background: #fff;
   box-sizing: border-box;
@@ -495,7 +497,7 @@ export default {
 
 .table-box {
   width: 100%;
-  height: 75vh;
+  height: 73vh;
   overflow: auto;
 }
 
diff --git a/fuintAdmin/src/views/order/order_Goods.vue b/fuintAdmin/src/views/order/order_Goods.vue
index c37a46a10..ab0fee6d1 100644
--- a/fuintAdmin/src/views/order/order_Goods.vue
+++ b/fuintAdmin/src/views/order/order_Goods.vue
@@ -1,7 +1,7 @@
 <!--商品交易列表-->
 <template>
   <div class="app-container">
-    <div class="card-change">
+    <div class="box-card">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="85px">
         <el-form-item label="" prop="orderNo">
           <el-input
@@ -551,6 +551,11 @@ export default {
 
 .box-card {
   width: 100%;
+  height: 89vh;
+  border-radius: 8px;
+  background: #fff;
+  box-sizing: border-box;
+  padding: 10px;
   margin-bottom: 15px;
 }
 
@@ -626,7 +631,7 @@ export default {
 
 .table-box {
   width: 100%;
-  height: 70vh;
+  height: 66vh;
   overflow: auto;
 }
 
diff --git a/fuintAdmin/src/views/order/order_Oil.vue b/fuintAdmin/src/views/order/order_Oil.vue
index 52160ebed..ef94dbf2c 100644
--- a/fuintAdmin/src/views/order/order_Oil.vue
+++ b/fuintAdmin/src/views/order/order_Oil.vue
@@ -2,7 +2,7 @@
 
 <template>
   <div class="app-container">
-    <div class="card-change">
+    <div class="box-card">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="">
           <el-input v-model="queryParams.orderNo" clearable placeholder="请输入订单号"></el-input>
@@ -713,8 +713,13 @@
     width: 100%;
 
   }
-  .box-card{
+  .box-card {
     width: 100%;
+    height: 89vh;
+    border-radius: 8px;
+    background: #fff;
+    box-sizing: border-box;
+    padding: 10px;
     margin-bottom: 15px;
   }
   .box-gang{
@@ -775,7 +780,7 @@
   }
   .table-box{
     width: 100%;
-    height: 69vh;
+    height: 66vh;
     overflow: auto;
     scrollbar-width: none;
   }
diff --git a/fuintAdmin/src/views/order/order_Vip.vue b/fuintAdmin/src/views/order/order_Vip.vue
index 61d56d7be..bac0343e6 100644
--- a/fuintAdmin/src/views/order/order_Vip.vue
+++ b/fuintAdmin/src/views/order/order_Vip.vue
@@ -422,6 +422,7 @@ export default {
 
 .box-card {
   width: 100%;
+  height: 89vh;
   border-radius: 8px;
   background: #fff;
   box-sizing: border-box;
@@ -490,7 +491,7 @@ export default {
 
 .table-box {
   width: 100%;
-  height: 78vh;
+  height: 72vh;
   overflow: auto;
 }
 
diff --git a/fuintAdmin/src/views/power/message.vue b/fuintAdmin/src/views/power/message.vue
index 79f53c40a..f0e1f1ab9 100644
--- a/fuintAdmin/src/views/power/message.vue
+++ b/fuintAdmin/src/views/power/message.vue
@@ -1155,7 +1155,7 @@ export default {
   box-sizing: border-box;
   padding: 15px;
   margin: 10px;
-  height: 86vh;
+  height: 84.5vh;
 }
 
 .common-dialog > > > .el-upload--picture-card {
diff --git a/fuintAdmin/src/views/power/page/mode.vue b/fuintAdmin/src/views/power/page/mode.vue
index e4bdd2b57..d2229ecb1 100644
--- a/fuintAdmin/src/views/power/page/mode.vue
+++ b/fuintAdmin/src/views/power/page/mode.vue
@@ -40,7 +40,7 @@
           </el-button>
         </el-form-item>
       </el-form>
-      <div style="height: 70vh;overflow: auto">
+      <div style="height: 68vh;overflow: auto">
 
         <el-table :data="tableData" style="width: 100%" border>
           <el-table-column align="center" type="index" label="序号"></el-table-column>
@@ -479,7 +479,7 @@ export default {
 
 }
 .cards-change{
-    height: 83vh;
+    height: 81vh;
 }
 
 </style>
diff --git a/fuintAdmin/src/views/power/page/record.vue b/fuintAdmin/src/views/power/page/record.vue
index 7de66ab4d..7e7f51a3e 100644
--- a/fuintAdmin/src/views/power/page/record.vue
+++ b/fuintAdmin/src/views/power/page/record.vue
@@ -557,7 +557,7 @@ export default {
 
 }
 .cards-change{
-  height: 83vh;
+  height: 81vh;
 }
 
 </style>
diff --git a/fuintAdmin/src/views/setting/device/content/youqiji.vue b/fuintAdmin/src/views/setting/device/content/youqiji.vue
index 757f53f89..dd6bdbbe5 100644
--- a/fuintAdmin/src/views/setting/device/content/youqiji.vue
+++ b/fuintAdmin/src/views/setting/device/content/youqiji.vue
@@ -318,7 +318,7 @@ export default {
   border-radius: 8px;
   box-sizing: border-box;
   padding: 15px;
-  height: 87vh;
+  height: 85vh;
 }
 </style>
 
diff --git a/fuintAdmin/src/views/setting/print/index.vue b/fuintAdmin/src/views/setting/print/index.vue
index ed6b854ed..a1a1f27e3 100644
--- a/fuintAdmin/src/views/setting/print/index.vue
+++ b/fuintAdmin/src/views/setting/print/index.vue
@@ -49,7 +49,7 @@
           <el-button type="primary" icon="el-icon-search" @click="handleAdd">新增设备</el-button>
         </el-form-item>
       </el-form>
-      <div style="width: 100%; height: 674px; overflow: auto; ">
+      <div style="width: 100%; height: 68vh; overflow: auto; ">
         <el-table :data="tableData" style="width: 100%" border>
           <el-table-column align="center" type="index" label="序号"></el-table-column>
           <el-table-column align="center" prop="deviceName" label="设备名称"></el-table-column>
@@ -427,7 +427,7 @@ export default {
   border-radius: 8px;
   box-sizing: border-box;
   padding: 15px;
-  height: 87vh;
+  height: 85vh;
 }
 </style>
 
diff --git a/fuintAdmin/src/views/staff/list.vue b/fuintAdmin/src/views/staff/list.vue
index 73e2ac409..988a3873b 100644
--- a/fuintAdmin/src/views/staff/list.vue
+++ b/fuintAdmin/src/views/staff/list.vue
@@ -48,7 +48,7 @@
 
         </el-form-item>
       </el-form>
-      <div style="height: 78.5vh;overflow: auto">
+      <div style="height: 76vh;overflow: auto">
         <el-table ref="tables" v-loading="loading" :data="list" border @selection-change="handleSelectionChange"
                   :default-sort="defaultSort" @sort-change="handleSortChange">
           <el-table-column type="index" width="80" align="center" label="序号"/>
diff --git a/fuintAdmin/src/views/staffCommission/staffCommission.vue b/fuintAdmin/src/views/staffCommission/staffCommission.vue
index a754cce56..dfe4b1a09 100644
--- a/fuintAdmin/src/views/staffCommission/staffCommission.vue
+++ b/fuintAdmin/src/views/staffCommission/staffCommission.vue
@@ -60,7 +60,7 @@
           </el-form>
         </div>
 
-        <div style="height: 72vh;overflow: auto">
+        <div style="height: 70vh;overflow: auto">
           <el-table ref="tables" v-loading="loading" :data="staffCommissionList" border>
             <el-table-column type="index" width="80" align="center" label="序号"/>
             <!--            <el-table-column label="员工信息" align="center">-->
@@ -179,7 +179,7 @@
             </el-form-item>
           </el-form>
         </div>
-        <div style="height: 72vh; overflow: auto ">
+        <div style="height: 70vh; overflow: auto ">
 
 
         <el-table ref="tables" v-loading="loading" :data="list" border
diff --git a/fuintAdmin/src/views/userGrade/index.vue b/fuintAdmin/src/views/userGrade/index.vue
index 2550c7582..978174ef4 100644
--- a/fuintAdmin/src/views/userGrade/index.vue
+++ b/fuintAdmin/src/views/userGrade/index.vue
@@ -169,7 +169,7 @@
 
         </el-form>
       </div>
-      <div style="height: 72vh;overflow: auto">
+      <div style="height: 69vh;overflow: auto">
         <el-table ref="tables" v-loading="loading" :data="list" border>
           <el-table-column label="序号" align="center" type="index" width="55"/>
           <el-table-column label="会员等级名称" align="center" prop="name">
@@ -269,7 +269,7 @@
         </el-form>
       </div>
       <!--      -->
-      <div style="height: 72vh;overflow: auto">
+      <div style="height: 69vh;overflow: auto">
         <el-table
           :data="discountList"
           border
@@ -1932,7 +1932,7 @@ export default {
   box-sizing: border-box;
   padding: 20px;
   margin: 0 auto;
-  height: 86vh;
+  height: 85vh;
 }
 
 .tab-box {