1、夜间最小流量样式

src/views/shiYuan/components/WaterAmountAnalyse.vue

@@ -11,8 +11,29 @@
         <el-row style="margin-bottom: 10px">
           <slot name="query" />
         </el-row>
-        <el-row>
-          <el-table :data="tableData" border style="width: 100%" :height="innerTableHeight" :max-height="innerTableHeight" @cell-dblclick="dblclick">
+        <el-row class="rowTable">
+          <div class="tableheight">
+            <!-- @handleSelectionChange="handleSelectionChange" -->
+            <table-item
+              :table-data="tableData"
+              :column="tableColumns"
+              :for-id="true"
+              :pagination="true"
+              :pagesize="pagination.size"
+              :currentpage="pagination.current"
+              :border="true"
+              :multiple="true"
+              :total="pagination.tableTotal"
+              :fixed="true"
+              :isdelete="false"
+              :is-select="false"
+              :stripe="true"
+              @handleCurrentChange="handleCurrentChange"
+              @handleSizeChange="handleSizeChange"
+            />
+          </div>
+
+          <!-- <el-table :data="tableData" border style="width: 100%" :height="innerTableHeight" :max-height="innerTableHeight" @cell-dblclick="dblclick">
             <template slot="empty">
               <img src="@/assets/icon/null.png" alt="">
               <p class="empty-p">暂无数据</p>
@@ -38,9 +59,9 @@
               </el-table-column>
             </template>
           </el-table>
-          <el-pagination v-if="needPagination" style="margin: 10px 0" :current-page="pagination.current" :page-sizes="[20, 50, 100]" :page-size="pagination.size" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+          <el-pagination v-if="needPagination" style="margin: 10px 0" :current-page="pagination.current" :page-sizes="[20, 50, 100]" :page-size="pagination.size" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" /> -->
         </el-row>
-        <el-row :gutter="20" type="flex" justify="center">
+        <el-row :gutter="20" type="flex" justify="center" class="rowChart">
           <div v-if="showChart" id="chart" :style="{ width: '100%', height: '300px' }" />
           <slot v-else name="two-charts" />
         </el-row>
@@ -50,10 +71,12 @@
 </template>
 
 <script>
+  import TableItem from '@/components/TableAuto'
 import Echarts from 'echarts'
 import { client } from '@/utils/index'
 
 export default {
+  components: { TableItem },
   props: {
     needTree: {
       type: Boolean,
@@ -211,5 +234,20 @@ export default {
       margin-top: -7px;
     }
   }
+
+  .rowTable{
+    height: calc(100% - 300px - 40px);
+    border: 1px red solid;
+  }
+  
+  .rowChart{
+    height: 300px;
+    border: 1px red solid;
+  }
+
+  .tableheight {
+    margin-top: 4px;
+    height: 100%;
+  }
 }
 </style>