自动抄表

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

ems-ui-cloud/src/api/device/elecMeterH.js

@@ -34,3 +34,46 @@ export function delElecMeterH(date) {
     method: 'delete'
   })
 }
+
+// 查询用水计量-小时列表
+export function listWaterMeterH(query) {
+  return request({
+    url: '/ems/waterMeterH/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询用水计量-小时详细
+export function getWaterMeterH(id) {
+  return request({
+    url: '/ems/waterMeterH/' + id,
+    method: 'get'
+  })
+}
+
+// 新增用水计量-小时
+export function addWaterMeterH(data) {
+  return request({
+    url: '/ems/waterMeterH',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改用水计量-小时
+export function updateWaterMeterH(data) {
+  return request({
+    url: '/ems/waterMeterH',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除用水计量-小时
+export function delWaterMeterH(id) {
+  return request({
+    url: '/ems/waterMeterH/' + id,
+    method: 'delete'
+  })
+}

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

@@ -59,7 +59,6 @@
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-
         <el-table v-loading="loading" :data="rbookList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="园区名称" align="center" prop="areaName" />
@@ -85,7 +84,6 @@
             </template>
           </el-table-column>
         </el-table>
-
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize" @pagination="getList" />
       </el-col>
@@ -417,7 +415,8 @@ export default {
     },
     // 取消按钮
     cancel () {
-      // this.isViewOnly = true; // 切换回只读模式
+      // 切换回只读模式
+      // this.isViewOnly = true;
       this.addOrUpdateOpen = false
       this.open = false
       this.reset()
@@ -454,6 +453,7 @@ export default {
     handleQuery () {
       this.queryParams.pageNum = 1
       this.getList()
+      console.log(this.queryParams.recordTime)
     },
     /** 重置按钮操作 */
     resetQuery () {
@@ -633,6 +633,6 @@ export default {
 <style lang="css">
 .el-form-item--inline {
   display: inline-block;
-  margin-right: 10px; /* 根据需要调整间距 */
+  margin-right: 10px;
 }
 </style>

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

@@ -1,14 +1,24 @@
 <template>
   <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input v-model="areaName" placeholder="请输入服务区名称" clearable size="small" prefix-icon="el-icon-search"
+                    style="margin-bottom: 20px" />
+        </div>
+        <div class="head-container">
+          <el-tree :data="areaOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree"
+                   node-key="id" default-expand-all highlight-current @node-click="handleNodeClick" />
+        </div>
+      </el-col>
+      <el-col :span="20" :xs="24">
+        <el-tabs v-model="activeTab" @tab-click="handleTabChange">
+          <el-tab-pane label="电报读数" name="first">
+          </el-tab-pane>
+          <el-tab-pane label="水表读数" name="second">
+          </el-tab-pane>
+        </el-tabs>
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="园区代码" prop="areaCode">
-        <el-input
-          v-model="queryParams.areaCode"
-          placeholder="请输入园区代码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="计量设备" prop="deviceCode">
         <el-input
           v-model="queryParams.deviceCode"
@@ -34,64 +44,58 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['ems:elecMeterH:add']"
-        >新增</el-button>
-      </el-col>
-
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['ems:elecMeterH:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="elecMeterHList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="园区名称" align="center" prop="areaCode" />
-      <el-table-column label="计量设备" align="center" prop="deviceCode" />
-      <el-table-column label="日期" align="center" prop="date" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="时间" align="center" prop="time" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="时间序列" align="center" prop="timeIndex" />
-      <el-table-column label="用电量(kW·h)" align="center" prop="elecQuantity" />
-      <el-table-column label="计量类型" align="center" prop="meterType" >
-        <template slot-scope="scope">
-          <span>{{ getElecMeterType(scope.row.meterType) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="单位电价" align="center" prop="meterUnitPrice" />
-      <el-table-column label="小时电费" align="center" prop="useElecCost" />
+        <el-table v-if="activeTab === 'first'" v-loading="loading" :data="elecMeterHList">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="园区名称" align="center" prop="areaCode" />
+          <el-table-column label="计量设备" align="center" prop="deviceCode" />
+          <el-table-column label="日期" align="center" prop="date" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="时间" align="center" prop="time" width="180">
+            <template slot-scope="scope">
+              <span>{{ scope.row.time }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="时间序列" align="center" prop="timeIndex" />
+          <el-table-column label="用电量(kW·h)" align="center" prop="elecQuantity" />
+          <el-table-column label="计量类型" align="center" prop="meterType" >
+            <template slot-scope="scope">
+              <span>{{ getElecMeterType(scope.row.meterType) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="单位电价" align="center" prop="meterUnitPrice" />
+          <el-table-column label="小时电费" align="center" prop="useElecCost" />
     </el-table>
 
-    <pagination
+        <el-table v-if="activeTab === 'second'" v-loading="loading" :data="waterMeterHList">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="园区名称" align="center" prop="areaCode" />
+          <el-table-column label="计量设备" align="center" prop="deviceCode" />
+          <el-table-column label="日期" align="center" prop="date" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="时间" align="center" prop="time" width="180">
+            <template slot-scope="scope">
+              <span>{{ scope.row.time }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="时间序列" align="center" prop="timeIndex" />
+          <el-table-column label="用水量(t)" align="center" prop="waterQuantity" />
+          <el-table-column label="单位水价" align="center" prop="meterUnitPrice" />
+          <el-table-column label="小时水费" align="center" prop="useWaterCost" />
+        </el-table>
+
+        <pagination
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
-      @pagination="getList"
+      @pagination="getElecList"
     />
-
     <!-- 添加或修改用电计量-小时对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -138,16 +142,20 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
 <script>
-import { listElecMeterH, delElecMeterH, addElecMeterH, updateElecMeterH } from "@/api/device/elecMeterH";
+import { listElecMeterH, delElecMeterH, addElecMeterH, updateElecMeterH,listWaterMeterH } from "@/api/device/elecMeterH";
+import { areaTreeSelect } from '@/api/basecfg/area'
 
 export default {
   name: "ElecMeterH",
   data() {
     return {
+      activeTab: 'first',
       // 遮罩层
       loading: true,
       // 选中数组
@@ -162,6 +170,8 @@ export default {
       total: 0,
       // 用电计量-小时表格数据
       elecMeterHList: [],
+      // 用水计量-小时表格数据
+      waterMeterHList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -175,6 +185,16 @@ export default {
         areaCode: null,
         deviceCode: null,
         recordTime: null,
+        startRecTime:null,
+        endRecTime:null
+
+      },
+      // 区域名称
+      areaName: undefined,
+      areaOptions: [],
+      defaultProps: {
+        children: 'children',
+        label: 'label'
       },
       // 表单参数
       form: {},
@@ -202,13 +222,41 @@ export default {
     };
   },
   created() {
-    this.getList();
+    this.getAreaTreeSelect('0', false)
+    this.getElecList();
   },
   methods: {
+    handleTabChange() {
+      // 根据newTabName给someParam赋值
+      if (this.activeTab === 'first') {
+        // 电表读数
+        this.getElecList();
+      } else if (this.activeTab === 'second') {
+        // 水表读数
+        this.getWaterList();
+      }
+      this.handleQuery()
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.areaCode = data.id
+      this.handleQuery()
+    },
+    async getAreaTreeSelect(areaCode, recursion) {
+      await areaTreeSelect(areaCode, recursion).then(response => {
+        this.areaOptions = response.data
+      })
+    },
     /** 查询用电计量-小时列表 */
-    getList() {
+    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];
@@ -219,13 +267,27 @@ export default {
         this.loading = false;
       });
     },
+    /** 查询用水计量-小时列表 */
+    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.waterMeterHList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
-      this.reset();
+      this.Elecreset();
     },
     // 表单重置
-    reset() {
+    Elecreset() {
       this.form = {
         id: null,
         areaCode: null,
@@ -242,10 +304,17 @@ export default {
       };
       this.resetForm("form");
     },
+
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      if (this.activeTab === 'first'){
+        this.queryParams.pageNum = 1;
+        this.getElecList();
+      }else if(this.activeTab === 'second'){
+        this.queryParams.pageNum = 1;
+        this.getWaterList();
+      }
+
     },
     /** 重置按钮操作 */
     resetQuery() {
@@ -255,7 +324,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
+      this.Elecreset();
       this.open = true;
       this.title = "添加用电计量-小时";
     },
@@ -267,13 +336,13 @@ export default {
             updateElecMeterH(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
-              this.getList();
+              this.getElecList();
             });
           } else {
             addElecMeterH(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
-              this.getList();
+              this.getElecList();
             });
           }
         }