tab分页

Signed-off-by: hsshuxian <3049816743@qq.com>

ems-ui-cloud/src/views/basecfg/meterdevc/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+
     <el-row :gutter="20">
       <el-col :span="4" :xs="24">
         <div class="head-container">
@@ -11,6 +12,12 @@
             node-key="id" default-expand-all highlight-current @node-click="handleNodeClick" />
         </div>
       </el-col>
+
+      <el-tabs v-model="activeTab" @tab-click="handleTabClick">
+        <el-tab-pane label="电表" name="电表"></el-tab-pane>
+        <el-tab-pane label="水表" name="水表"></el-tab-pane>
+      </el-tabs>
+
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
           <el-form-item label="计量类别" prop="meterCls">
@@ -155,6 +162,7 @@ export default {
   components: { Treeselect },
   data() {
     return {
+      activeTab: '电表',
       // 遮罩层
       loading: true,
       // 选中数组
@@ -251,6 +259,10 @@ export default {
     this.getList()
   },
   methods: {
+    handleTabClick(tab) {
+      this.activeTab = tab.name;
+      this.getList(); // 重新获取数据
+    },
     colModeChange(val) {
       if (val === 1) {
         this.form.colCycle = 4
@@ -260,12 +272,18 @@ export default {
     },
     /** 查询计量设备列表 */
     getList() {
-      this.loading = true
-      listDevice(this.queryParams).then(response => {
-        this.deviceList = response.rows
-        this.total = response.total
-        this.loading = false
-      })
+      this.loading = true;
+      let meterCls = '';
+      if (this.activeTab === '电表') {
+        meterCls = 45;
+      } else if (this.activeTab === '水表') {
+        meterCls = 70;
+      }
+      listDevice({ ...this.queryParams, meterCls }).then(response => {
+        this.deviceList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
     },
     // 取消按钮
     cancel() {

ems-ui-cloud/src/views/devmgr/meterData/index.vue

@@ -27,6 +27,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
       <el-form-item label="记录时间">
         <el-date-picker
           v-model="daterangeRecordTime"
@@ -38,6 +39,7 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
+      
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -255,13 +257,12 @@ export default {
     /** 查询用电计量-小时列表 */
     getElecList() {
       this.loading = true;
-      this.queryParams.params = {};
-      console.log("this.daterangeRecordTime",this.daterangeRecordTime);
-      if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) {
-        this.queryParams.params["beginRecordTime"] = this.daterangeRecordTime[0];
-        this.queryParams.params["endRecordTime"] = this.daterangeRecordTime[1];
-      }
-      listElecMeterH(this.queryParams).then(response => {
+      // this.queryParams.params = {};
+      // if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) {
+      //   this.queryParams.params["startRecTime"] = this.daterangeRecordTime[0];
+      //   this.queryParams.params["endRecTime"] = this.daterangeRecordTime[1];
+      // }
+      listElecMeterH(this.addDateRange(this.queryParams, this.daterangeRecordTime)).then(response => {
         this.elecMeterHList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -270,12 +271,12 @@ export default {
     /** 查询用水计量-小时列表 */
     getWaterList() {
       this.loading = true;
-      this.queryParams.params = {};
-      if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) {
-        this.queryParams.params["beginRecordTime"] = this.daterangeRecordTime[0];
-        this.queryParams.params["endRecordTime"] = this.daterangeRecordTime[1];
-      }
-      listWaterMeterH(this.queryParams).then(response => {
+      // this.queryParams.params = {};
+      // if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) {
+      //   this.queryParams.params["beginRecordTime"] = this.daterangeRecordTime[0];
+      //   this.queryParams.params["endRecordTime"] = this.daterangeRecordTime[1];
+      // }
+      listWaterMeterH(this.addDateRange(this.queryParams, this.daterangeRecordTime)).then(response => {
         this.waterMeterHList = response.rows;
         this.total = response.total;
         this.loading = false;