bug

fuintAdmin_zt/src/assets/styles/element-ui.scss

@@ -127,6 +127,7 @@
 }
 .el-pagination.is-background .el-pager li:not(.disabled).active{
   background-color: #FF9655 !important;
+  color: white !important;
 }
 .el-pagination.is-background .el-pager li:hover{
   color: #FF9655 !important;/*hover时候的文字颜色*/

fuintAdmin_zt/src/views/Service/index.vue

@@ -50,6 +50,8 @@
         </div>
 
       </div>
+      <div style="width: 100%;height: 68vh;overflow: auto">
+
       <el-table
         :data="tableData"
         border
@@ -157,6 +159,8 @@
           </template>
         </el-table-column>
       </el-table>
+
+      </div>
       <pagination
         v-show="total>0"
         :total="total"

fuintAdmin_zt/src/views/Site/add.vue

@@ -31,7 +31,7 @@ export default {
         roleCode: [
           {required: true, message: '请选择登录权限', trigger: 'change'}
         ],
-        menuIds: [
+        checkedKeys: [
           {required: true, message: '请选择菜单信息', trigger: 'change'}
         ],
       },
@@ -356,7 +356,7 @@ export default {
 <!--              <el-radio :label="3">全部</el-radio>-->
 <!--            </el-radio-group>-->
 <!--          </el-form-item>-->
-          <el-form-item label="菜单功能权限" prop="menuIds">
+          <el-form-item label="菜单功能权限" prop="checkedKeys">
             <el-checkbox v-model="checked" @change="chooseAllOrNo">全选</el-checkbox>
             <el-checkbox v-model="isOpen" @change="openTable">展开</el-checkbox>
           </el-form-item>

fuintAdmin_zt/src/views/Site/index.vue

@@ -36,8 +36,7 @@
       </el-col>
 
       <el-col :span="18">
-        <el-card style="margin-bottom: 20px;border: none;
+        <el-card style="margin-bottom: 20px;border: none;box-shadow: none;height: 81.5vh;overflow: auto" shadow="never">
-box-shadow: none;" shadow="never">
 <!--          <el-tabs v-model="activeName" @tab-click="handleClick">-->
 <!--        用户信息    -->
 <!--            <el-tab-pane label="用户信息" name="list">-->
@@ -2175,12 +2174,12 @@ export default {
 
 .app-container{
     width: 100%;
-    height: 100vh;
+    height: 100%;
     background: #f6f8f9;
   }
   .left-box{
     box-sizing: border-box;
-    height: 85vh;
+    height: 77vh;
     padding: 15px;
     overflow-y: auto; /* 只显示垂直滚动条 */
   }

fuintAdmin_zt/src/views/components/Service/allOrder.vue

@@ -83,6 +83,7 @@
 
         </el-form-item>
       </el-form>
+      <div style="width: 100%;height: 65vh;overflow: auto">
       <el-table ref="tables" border v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
         <el-table-column label="序号" align="center" type="index" />
         <el-table-column label="订单号" align="center" prop="orderNo"  width="220"/>
@@ -149,6 +150,7 @@
 
       </el-table>
 
+      </div>
       <pagination
         v-show="total>0"
         :total="total"

fuintAdmin_zt/src/views/components/Service/payment.vue

@@ -1020,6 +1020,8 @@ export default {
 
 .new-box {
   width: 100%;
+  height: 80vh;
+  overflow: auto;
   background: #fff;
   box-sizing: border-box;
   padding: 20px;

fuintAdmin_zt/src/views/components/Service/staff.vue

@@ -38,7 +38,7 @@
         </div>
 
       </div>
-
+      <div style="width: 100%;height: 64vh;overflow: auto">
       <el-table ref="tables" border v-loading="loading" :data="list" @selection-change="handleSelectionChange"
                 :default-sort="defaultSort" @sort-change="handleSortChange">
         <el-table-column
@@ -102,6 +102,7 @@
         </el-table-column>
       </el-table>
 
+      </div>
       <pagination
         v-show="total>0"
         :total="total"

fuintAdmin_zt/src/views/components/Service/way.vue

@@ -116,6 +116,8 @@ export default {
   box-sizing: border-box;
   padding: 20px;
   width: 98%;
+  height: 80vh;
+  overflow: auto;
   margin: 20px auto;
 }
 .d-s{

fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/list.vue

@@ -68,7 +68,7 @@ export default {
 .app-top{
   width: 100%;
   //margin-bottom: 20px;
-  height: 60px;
+  height: 50px;
   box-sizing: border-box;
 
 }
@@ -86,7 +86,7 @@ background-color: #FFFFFF;
   //border: 1px solid #EBEEF5;
 }
 .nbox{
-  margin-left: 30px;
+  margin-right: 30px;
 }
 .fount-box{
   font-size: 14px;

fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue

@@ -343,6 +343,8 @@ export default {
 
 .table-box {
   width: 100%;
+  height: 45vh;
+  overflow: auto;
 }
 
 .wrap-boxs {

fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue

@@ -310,6 +310,8 @@ export default {
 
 .table-box {
   width: 100%;
+  height: 46vh;
+  overflow: auto;
 }
 
 .wrap-boxs {

fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/list.vue

@@ -102,7 +102,7 @@ background-color: #FFFFFF;
   //border: 1px solid #EBEEF5;
 }
 .nbox{
-  margin-left: 30px;
+  margin-right: 30px;
 }
 .fount-box{
   font-size: 14px;

fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue

@@ -1,6 +1,6 @@
 <!-- 收银台订单-->
 <template>
-  <div style="background: #f6f8f9;width: 100%;padding: 20px;height: 100vh">
+  <div style="background: #f6f8f9;width: 100%;padding: 20px;">
     <div class="card-change">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="" prop="deptId" style="width: 180px">
@@ -273,6 +273,8 @@ import {getDuiZhangIntegralListApi} from "@/api/financialStatement/jiaoyiduizhan
 
 .table-box{
   width: 100%;
+  height: 65vh;
+  overflow: auto;
 }
 
 

fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue

@@ -1,6 +1,6 @@
 <!-- 收银台订单-->
 <template>
-  <div style="background: #f6f8f9;width: 100%;padding: 20px;height: 100vh">
+  <div style="background: #f6f8f9;width: 100%;padding: 20px;">
     <div class="card-change">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="" prop="deptId" style="width: 180px">
@@ -76,7 +76,7 @@
       </el-form>
       <!--    </el-card>-->
       <!--    <el-card class="box-card">-->
-      <div class="table-box">
+      <div class="table-box"  style="width: 100%;height: 65vh;overflow: auto">
         <el-table
           :data="orderList"
           style="width: 100%">

fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue

@@ -1,6 +1,6 @@
 <!-- 收银台订单-->
 <template>
-  <div style="background: #f6f8f9;width: 100%;padding: 20px;height: 100vh">
+  <div style="background: #f6f8f9;width: 100%;padding: 20px;">
     <div class="card-change">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="" prop="deptId" style="width: 180px">
@@ -272,6 +272,8 @@ import {getDuiZhangGoodsListApi} from "@/api/financialStatement/jiaoyiduizhang";
 
 .table-box{
   width: 100%;
+  height: 65vh;
+  overflow: auto;
 }
 
 </style>

fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue

@@ -1,6 +1,6 @@
 <!-- 收银台订单-->
 <template>
-  <div style="background: #f6f8f9;width: 100%;padding: 20px;height: 100vh" >
+  <div style="background: #f6f8f9;width: 100%;padding: 20px;" >
     <div class="card-change">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="" prop="deptId" style="width: 180px">
@@ -276,6 +276,8 @@ import {getRunningWaterByTissueApi} from "@/api/allOrder";
 
   .table-box{
     width: 100%;
+    height: 66vh;
+    overflow: auto;
   }
 
 </style>

fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue

@@ -121,7 +121,7 @@ background-color: #FFFFFF;
   //border: 1px solid #EBEEF5;
 }
 .nbox{
-  margin-left: 30px;
+  margin-right: 30px;
 }
 .fount-box{
   font-size: 14px;

fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue

@@ -298,6 +298,8 @@ export default {
 
 .table-box {
   width: 100%;
+  height: 47vh;
+  overflow: auto;
 }
 
 .wrap-box {

fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue

@@ -1,6 +1,6 @@
 <!-- 收银台订单-->
 <template>
-  <div style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;">
+  <div style="padding-top: 15px; padding-right: 40px; background: #f6f8f9;">
     <el-card class="box-card" shadow="never">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <div class="d-s" style="justify-content: space-between;width: 100%">
@@ -342,6 +342,8 @@ import {parseTime} from "@/utils/fuint";
 
 .table-box{
   width: 100%;
+  height: 47vh;
+  overflow: auto;
 }
 .wrap-box{
   width: 100%;

fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue

@@ -1,6 +1,6 @@
 <!-- 收银台订单-->
 <template>
-  <div style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;" shadow="never">
+  <div style="padding-top: 15px; padding-right: 40px; background: #f6f8f9;" shadow="never">
     <el-card class="box-card">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" >
         <div class="d-s" style="justify-content: space-between;width: 100%">
@@ -317,6 +317,8 @@ import {parseTime} from "@/utils/fuint";
 
 .table-box{
   width: 100%;
+  height: 47vh;
+  overflow: auto;
 }
 .wrap-box{
   width: 100%;

fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue

@@ -1,6 +1,6 @@
 <!-- 收银台订单-->
 <template>
-  <div class=""  style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;min-height: 900px;">
+  <div class=""  style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;">
     <el-card class="box-card"  shadow="never">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="" prop="deptId" style="width: 180px">
@@ -239,6 +239,8 @@ import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/fina
 
   .table-box{
     width: 100%;
+    height: 49vh;
+    overflow: auto;
   }
   .wrap-box{
     width: 100%;

fuintAdmin_zt/src/views/setting/app/index.vue

@@ -45,6 +45,8 @@
 
       <!--    &lt;!&ndash;    列表信息&ndash;&gt;-->
       <!--    <el-card style="margin-top: 20px" >-->
+      <div style="height: 70vh;overflow: auto">
+
       <el-table :data="tableData" style="width: 100%" border>
         <el-table-column type="index" label="序号"></el-table-column>
         <el-table-column prop="orgName" label="机构名称"></el-table-column>
@@ -85,6 +87,7 @@
           </template>
         </el-table-column>
       </el-table>
+      </div>
       <pagination
         v-show="total>0"
         :total="total"
@@ -345,6 +348,9 @@ export default {
   width: 60px;
   height: 50px;
   line-height: 60px;
+}
+.app-container{
+
 }
 </style>
 

fuintAdmin_zt/src/views/setting/banner/index.vue

@@ -54,6 +54,7 @@
 <!--    <el-card style="margin-top: 20px" >-->
 
 
+      <div style="height: 70vh;overflow: auto">
     <el-table :data="tableData" style="width: 100%;" border>
       <el-table-column type="index" label="序号"></el-table-column>
       <el-table-column prop="bannerName" label="banner名称"></el-table-column>
@@ -103,6 +104,7 @@
         </template>
       </el-table-column>
     </el-table>
+      </div>
     <pagination
       v-show="total>0"
       :total="total"

fuintAdmin_zt/src/views/setting/hardware.vue

@@ -46,6 +46,7 @@
         </el-form-item>
       </el-form>
 
+      <div style="height: 70vh;overflow: auto">
       <el-table :data="tableData" style="width: 100%" border>
         <el-table-column type="index" label="序号"></el-table-column>
         <el-table-column prop="name" label="商品名称"></el-table-column>
@@ -104,6 +105,7 @@
           </template>
         </el-table-column>
       </el-table>
+      </div>
       <pagination
         v-show="total>0"
         :total="total"

fuintAdmin_zt/src/views/setting/message.vue

@@ -37,6 +37,7 @@
         </el-form-item>
       </el-form>
 
+      <div style="height: 70vh;overflow: auto">
       <el-table :data="tableData" border style="width: 100%">
         <el-table-column type="index" label="序号"></el-table-column>
         <el-table-column prop="messageId" label="短信模板ID"></el-table-column>
@@ -81,6 +82,7 @@
           </template>
         </el-table-column>
       </el-table>
+      </div>
       <pagination
         v-show="total>0"
         :total="total"

fuintAdmin_zt/src/views/setting/pay/index.vue

@@ -61,6 +61,7 @@
 
 <!--    &lt;!&ndash;    列表信息&ndash;&gt;-->
 <!--    <el-card style="margin-top: 20px" >-->
+      <div style="height: 70vh;overflow: auto">
       <el-table :data="tableData" style="width: 100%">
         <el-table-column type="index" label="序号"></el-table-column>
         <el-table-column prop="deptName" label="机构名称"></el-table-column>
@@ -121,6 +122,7 @@
           </template>
         </el-table-column>
       </el-table>
+      </div>
       <pagination
         v-show="total>0"
         :total="total"

fuintAdmin_zt/src/views/setting/sysLog.vue

@@ -85,6 +85,7 @@
         </el-form-item>
       </el-form>
 
+      <div style="height: 65vh;overflow: auto">
       <el-table :data="tableData" style="width: 100%" border>
         <el-table-column type="index" label="序号"></el-table-column>
         <el-table-column prop="createAccount" label="登录账号"></el-table-column>
@@ -105,6 +106,7 @@
         <el-table-column prop="ipAddr" label="IP地址"></el-table-column>
         <el-table-column prop="createTime" label="操作时间"></el-table-column>
       </el-table>
+      </div>
       <pagination
         v-show="total>0"
         :total="total"

fuintAdmin_zt/src/views/system/notify/index.vue

@@ -54,7 +54,6 @@ export default {
 }
 .container{
   background: #F4F5F9;
-  height: 100vh;
   box-sizing: border-box;
   //padding: 20px;
 }

fuintAdmin_zt/src/views/system/notify/page/mode.vue

@@ -48,6 +48,8 @@
 <!--    </el-card>-->
 <!--    &lt;!&ndash;    列表信息&ndash;&gt;-->
 <!--    <el-card style="margin-top: 20px" >-->
+      <div style="height: 65vh;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="notificationName" label="通知名称"></el-table-column>
@@ -82,6 +84,7 @@
           </template>
         </el-table-column>
       </el-table>
+      </div>
       <pagination
         v-show="total>0"
         :total="total"

fuintAdmin_zt/src/views/system/notify/page/record.vue

@@ -49,6 +49,7 @@
 <!--    &lt;!&ndash;          &ndash;&gt;-->
 <!--    &lt;!&ndash;    列表信息&ndash;&gt;-->
 <!--    <el-card style="margin-top: 20px" >-->
+      <div style="height: 65vh;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="notificationName" label="通知名称"></el-table-column>
@@ -85,6 +86,7 @@
           </template>
         </el-table-column>
       </el-table>
+      </div>
       <pagination
         v-show="total>0"
         :total="total"