From 1b1a0fe0cc7274ae0df3784f36ebe6d91e829595 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Tue, 21 May 2024 15:50:44 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=BF=AE=E6=94=B9=E6=B0=B4?=
 =?UTF-8?q?=E7=94=B5=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ems/base/baseMonitorInfo/index.vue  |  18 +-
 .../ems/record/recordDnbInstant/index.vue     | 416 +++++++++---------
 .../ems/record/recordWaterInstant/index.vue   | 408 +++++++++--------
 3 files changed, 410 insertions(+), 432 deletions(-)

diff --git a/src/views/ems/base/baseMonitorInfo/index.vue b/src/views/ems/base/baseMonitorInfo/index.vue
index 41cf94a..a06ea3c 100644
--- a/src/views/ems/base/baseMonitorInfo/index.vue
+++ b/src/views/ems/base/baseMonitorInfo/index.vue
@@ -162,7 +162,14 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="采集设备" prop="collectDeviceId">
-          <el-input v-model="form.collectDeviceId" placeholder="请输入采集设备编号" />
+          <el-select v-model="form.collectDeviceId" placeholder="请选择采集设备">
+            <el-option
+              v-for="item in collectDeviceList"
+              :key="item.collectDeviceId"
+              :label="item.collectDeviceName"
+              :value="item.collectDeviceId"
+            ></el-option>
+          </el-select>
         </el-form-item>
 <!--        <el-form-item label="等级" prop="grade">-->
 <!--          <el-input v-model="form.grade" placeholder="请输入等级" />-->
@@ -213,6 +220,8 @@
 import { listBaseMonitorInfo, getBaseMonitorInfo, delBaseMonitorInfo, addBaseMonitorInfo, updateBaseMonitorInfo } from "@/api/ems/base/baseMonitorInfo";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { getBaseEnergyTypeList } from '@/api/ems/base/baseEnergyType'
+import { getCollectDeviceInfo } from '@/api/ems/base/baseCollectDeviceInfo'
 
 export default {
   name: "BaseMonitorInfo",
@@ -298,10 +307,15 @@ export default {
         {key: 20, label: `更新时间`, visible: false},
         {key: 21, label: `公摊表类型`, visible: false},
         {key: 22, label: `表具层级`, visible: false},
-      ]
+      ],
+      // 采集设备选项选项
+      collectDeviceList: []
     };
   },
   created() {
+    getCollectDeviceInfo({}).then(response => {
+      this.collectDeviceList = response.data
+    })
     this.getList();
   },
   methods: {
diff --git a/src/views/ems/record/recordDnbInstant/index.vue b/src/views/ems/record/recordDnbInstant/index.vue
index a79528e..620dfa2 100644
--- a/src/views/ems/record/recordDnbInstant/index.vue
+++ b/src/views/ems/record/recordDnbInstant/index.vue
@@ -15,7 +15,7 @@
         <div class="head-container">
           <el-tree
             :data="monitorInfoOptions"
-            :props="workUnitProps"
+            :props="monitorProps"
             :expand-on-click-node="false"
             :filter-node-method="filterNode"
             ref="tree"
@@ -28,33 +28,37 @@
       </el-col>
       <el-col :span="19" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                 label-width="100px">
-<!--          <el-form-item label="计量设备编号" prop="monitorId">-->
-<!--            <el-input-->
-<!--              v-model="queryParams.monitorId"-->
-<!--              placeholder="请输入计量设备编号"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
-<!--          </el-form-item>-->
-          <el-form-item label="采集时间" prop="collectTime">
-            <el-date-picker clearable
-                            v-model="queryParams.beginCollectTime"
-                            type="datetime"
-                            value-format="yyyy-MM-dd HH:mm:ss"
-                            placeholder="请选择开始时间"
-                            @input="changeDate"
-            >
-            </el-date-picker>
-            -
-            <el-date-picker clearable
-                            v-model="queryParams.endCollectTime"
-                            type="datetime"
-                            value-format="yyyy-MM-dd HH:mm:ss"
-                            placeholder="请选择结束时间"
-                            @input="changeDate"
-            >
-            </el-date-picker>
+                 label-width="100px"
+        >
+          <!--          <el-form-item label="计量设备编号" prop="monitorCode">-->
+          <!--            <el-input-->
+          <!--              v-model="queryParams.monitorCode"-->
+          <!--              placeholder="请输入计量设备编号"-->
+          <!--              clearable-->
+          <!--              @keyup.enter.native="handleQuery"-->
+          <!--            />-->
+          <!--          </el-form-item>-->
+          <el-form-item label="采集时间">
+            <el-date-picker
+              v-model="daterangeCollectTime"
+              style="width: 340px"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="datetimerange"
+              range-separator="-"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="记录时间">
+            <el-date-picker
+              v-model="daterangeRecordTime"
+              style="width: 340px"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="datetimerange"
+              range-separator="-"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+            ></el-date-picker>
           </el-form-item>
           <el-form-item label="采集方式" prop="collectType">
             <el-select v-model="queryParams.collectType" placeholder="请选择采集方式" clearable>
@@ -66,87 +70,66 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="记录时间" prop="recordTime">
-            <el-date-picker clearable
-                            v-model="queryParams.beginRecordTime"
-                            type="datetime"
-                            value-format="yyyy-MM-dd HH:mm:ss"
-                            placeholder="请选择开始时间"
-                            @input="changeDate"
-            >
-            </el-date-picker>
-            -
-            <el-date-picker clearable
-                            v-model="queryParams.endRecordTime"
-                            type="datetime"
-                            value-format="yyyy-MM-dd HH:mm:ss"
-                            placeholder="请选择结束时间"
-                            @input="changeDate"
-            >
-            </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>
           </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/record:recordDnbInstant:add']"
-          >新增
-          </el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="success"
-            plain
-            icon="el-icon-edit"
-            size="mini"
-            :disabled="single"
-            @click="handleUpdate"
-            v-hasPermi="['ems/record:recordDnbInstant:edit']"
-          >修改
-          </el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="danger"
-            plain
-            icon="el-icon-delete"
-            size="mini"
-            :disabled="multiple"
-            @click="handleDelete"
-            v-hasPermi="['ems/record:recordDnbInstant:remove']"
-          >删除
-          </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/record:recordDnbInstant:export']"
-          >导出
-          </el-button>
-        </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['ems/record:recordDnbInstant:add']"
+            >新增
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="success"
+              plain
+              icon="el-icon-edit"
+              size="mini"
+              :disabled="single"
+              @click="handleUpdate"
+              v-hasPermi="['ems/record:recordDnbInstant:edit']"
+            >修改
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="danger"
+              plain
+              icon="el-icon-delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDelete"
+              v-hasPermi="['ems/record:recordDnbInstant:remove']"
+            >删除
+            </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/record:recordDnbInstant:export']"
+            >导出
+            </el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
         <el-table v-loading="loading" :data="recordDnbInstantList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center"/>
           <el-table-column label="编号" align="center" prop="objId" v-if="columns[0].visible"/>
-          <el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[1].visible"/>
-          <el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[15].visible"/>
+          <el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[1].visible" width="100"/>
+          <el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[15].visible" width="120"/>
           <el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[2].visible">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -158,45 +141,42 @@
           <el-table-column label="A项电流" align="center" prop="ia" v-if="columns[6].visible"/>
           <el-table-column label="B项电流" align="center" prop="ib" v-if="columns[7].visible"/>
           <el-table-column label="C项电流" align="center" prop="ic" v-if="columns[8].visible"/>
-          <el-table-column label="记录时间" align="center" prop="recordTime" width="180" v-if="columns[9].visible">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-            </template>
-          </el-table-column>
           <el-table-column label="功率因数" align="center" prop="glys" v-if="columns[10].visible"/>
           <el-table-column label="正向有功" align="center" prop="zxyg" v-if="columns[11].visible"/>
           <el-table-column label="有功功率" align="center" prop="activePower" v-if="columns[12].visible"/>
           <el-table-column label="无功功率" align="center" prop="reactivePower" v-if="columns[13].visible"/>
-          <el-table-column label="采集方式" align="center" prop="collectType" v-if="columns[14].visible">
+          <el-table-column label="记录时间" align="center" prop="recordTime" width="180" v-if="columns[9].visible">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.collect_type" :value="scope.row.collectType"/>
+              <span>{{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <el-table-column label="采集方式" align="center" prop="collectType" v-if="columns[14].visible">
             <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['ems/record:recordDnbInstant:edit']"
-              >修改
-              </el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['ems/record:recordDnbInstant:remove']"
-              >删除
-              </el-button>
+              <dict-tag :options="dict.type.collect_type" :value="scope.row.collectType"/>
             </template>
           </el-table-column>
+          <!--          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <el-button-->
+          <!--                size="mini"-->
+          <!--                type="text"-->
+          <!--                icon="el-icon-edit"-->
+          <!--                @click="handleUpdate(scope.row)"-->
+          <!--                v-hasPermi="['ems/record:recordDnbInstant:edit']"-->
+          <!--              >修改-->
+          <!--              </el-button>-->
+          <!--              <el-button-->
+          <!--                size="mini"-->
+          <!--                type="text"-->
+          <!--                icon="el-icon-delete"-->
+          <!--                @click="handleDelete(scope.row)"-->
+          <!--                v-hasPermi="['ems/record:recordDnbInstant:remove']"-->
+          <!--              >删除-->
+          <!--              </el-button>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
         </el-table>
-
-
       </el-col>
-
     </el-row>
 
 
@@ -211,12 +191,11 @@
     <!-- 添加或修改电实时数据对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="计量设备编号" prop="monitorId">
-          <treeselect v-model="form.monitorId" :options="baseMonitorInfoOptions" :normalizer="normalizer" placeholder="请选择父级编号" />
+        <el-form-item label="计量设备名称" prop="monitorCode">
+          <treeselect v-model="form.monitorCode" :options="baseMonitorInfoOptions" :normalizer="normalizer"
+                      placeholder="请选择计量设备名称"
+          />
         </el-form-item>
-<!--        <el-form-item label="计量设备编号" prop="monitorId">-->
-<!--          <el-input v-model="form.monitorId" placeholder="请输入计量设备编号"/>-->
-<!--        </el-form-item>-->
         <el-form-item label="采集时间" prop="collectTime">
           <el-date-picker clearable
                           v-model="form.collectTime"
@@ -226,47 +205,47 @@
           >
           </el-date-picker>
         </el-form-item>
-<!--        <el-form-item label="A项电压" prop="va">-->
-<!--          <el-input v-model="form.va" placeholder="请输入A项电压"/>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="B项电压" prop="vb">-->
-<!--          <el-input v-model="form.vb" placeholder="请输入B项电压"/>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="C项电压" prop="vc">-->
-<!--          <el-input v-model="form.vc" placeholder="请输入C项电压"/>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="A项电流" prop="ia">-->
-<!--          <el-input v-model="form.ia" placeholder="请输入A项电流"/>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="B项电流" prop="ib">-->
-<!--          <el-input v-model="form.ib" placeholder="请输入B项电流"/>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="C项电流" prop="ic">-->
-<!--          <el-input v-model="form.ic" placeholder="请输入C项电流"/>-->
-<!--        </el-form-item>-->
-        <el-form-item label="记录时间" prop="recordTime">
-          <el-date-picker clearable
-                          v-model="form.recordTime"
-                          type="datetime"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="请选择记录时间"
-          >
-          </el-date-picker>
+        <!--        <el-form-item label="A项电压" prop="va">-->
+        <!--          <el-input v-model="form.va" placeholder="请输入A项电压"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="B项电压" prop="vb">-->
+        <!--          <el-input v-model="form.vb" placeholder="请输入B项电压"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="C项电压" prop="vc">-->
+        <!--          <el-input v-model="form.vc" placeholder="请输入C项电压"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="A项电流" prop="ia">-->
+        <!--          <el-input v-model="form.ia" placeholder="请输入A项电流"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="B项电流" prop="ib">-->
+        <!--          <el-input v-model="form.ib" placeholder="请输入B项电流"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="C项电流" prop="ic">-->
+        <!--          <el-input v-model="form.ic" placeholder="请输入C项电流"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="记录时间" prop="recordTime">-->
+        <!--          <el-date-picker clearable-->
+        <!--                          v-model="form.recordTime"-->
+        <!--                          type="datetime"-->
+        <!--                          value-format="yyyy-MM-dd HH:mm:ss"-->
+        <!--                          placeholder="请选择记录时间"-->
+        <!--          >-->
+        <!--          </el-date-picker>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="功率因数" prop="glys">-->
+        <!--          <el-input v-model="form.glys" placeholder="请输入功率因数"/>-->
+        <!--        </el-form-item>-->
+        <el-form-item label="正向有功" prop="zxyg">
+          <el-input-number v-model="form.zxyg" placeholder="请输入正向有功"/>
         </el-form-item>
-<!--        <el-form-item label="功率因数" prop="glys">-->
-<!--          <el-input v-model="form.glys" placeholder="请输入功率因数"/>-->
-<!--        </el-form-item>-->
-          <el-form-item label="正向有功" prop="zxyg">
-            <el-input v-model="form.zxyg" placeholder="请输入正向有功"/>
-          </el-form-item>
-<!--        <el-form-item label="有功功率" prop="activePower">-->
-<!--          <el-input v-model="form.activePower" placeholder="请输入有功功率"/>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="无功功率" prop="reactivePower">-->
-<!--          <el-input v-model="form.reactivePower" placeholder="请输入无功功率"/>-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="有功功率" prop="activePower">-->
+        <!--          <el-input v-model="form.activePower" placeholder="请输入有功功率"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="无功功率" prop="reactivePower">-->
+        <!--          <el-input v-model="form.reactivePower" placeholder="请输入无功功率"/>-->
+        <!--        </el-form-item>-->
         <el-form-item label="采集方式" prop="collectType">
-          <el-radio-group v-model="form.collectType">
+          <el-radio-group v-model="form.collectType" disabled>
             <el-radio
               v-for="dict in dict.type.collect_type"
               :key="dict.value"
@@ -294,8 +273,8 @@ import {
 } from '@/api/ems/record/recordDnbInstant'
 import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
 import Treeselect from '@riophae/vue-treeselect'
-import { getWorkUnitTrees, listBaseWorkUnit } from '@/api/ems/base/baseWorkUnit'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { parseTime } from '@/utils/ruoyi'
 
 export default {
   name: 'RecordDnbInstant',
@@ -305,13 +284,17 @@ export default {
   },
   data() {
     return {
-      baseMonitorInfoOptions:[],
+      //下拉树List
+      baseMonitorInfoOptions: [],
+      //左侧树结构List
       monitorInfoOptions: [],
       workUnitName: undefined,
       //计量设备信息
       baseMonitorInfoList: [],
-      nowBeginTime:null,
-      nowEndTime:null,
+      // 采集方式时间范围
+      daterangeCollectTime: [],
+      // 采集方式时间范围
+      daterangeRecordTime: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -334,7 +317,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        monitorId: null,
+        monitorCode: null,
         collectTime: null,
         va: null,
         vb: null,
@@ -349,12 +332,9 @@ export default {
         reactivePower: null,
         collectType: null
       },
-      queryParamsInsert: {
-        monitorType:2,
-      },
       // 表单参数
       form: {},
-      workUnitProps: {
+      monitorProps: {
         children: 'children',
         label: 'label'
       },
@@ -365,15 +345,15 @@ export default {
         ]
       },
       columns: [
-        { key: 0, label: `编号`, visible: false },
+        { key: 0, label: `主键标识`, visible: false },
         { key: 1, label: `计量设备编号`, visible: true },
         { key: 2, label: `采集时间`, visible: true },
-        { key: 3, label: `A项电压`, visible: false },
-        { key: 4, label: `B项电压`, visible: false },
-        { key: 5, label: `C项电压`, visible: false },
-        { key: 6, label: `A项电流`, visible: false },
-        { key: 7, label: `B项电流`, visible: false },
-        { key: 8, label: `C项电流`, visible: false },
+        { key: 3, label: `A项电压`, visible: true },
+        { key: 4, label: `B项电压`, visible: true },
+        { key: 5, label: `C项电压`, visible: true },
+        { key: 6, label: `A项电流`, visible: true },
+        { key: 7, label: `B项电流`, visible: true },
+        { key: 8, label: `C项电流`, visible: true },
         { key: 9, label: `记录时间`, visible: true },
         { key: 10, label: `功率因数`, visible: true },
         { key: 11, label: `正向有功`, visible: true },
@@ -385,20 +365,15 @@ export default {
     }
   },
   created() {
-    this.form.monitorType = 2;
-    const date = new Date;
-    this.nowBeginTime = date.toLocaleDateString().replaceAll("/","-")+" 00:00:00";
-    this.nowEndTime = date.toLocaleDateString().replaceAll("/","-")+" 23:59:59";
-    this.queryParams.beginCollectTime = this.nowBeginTime,
-      this.queryParams.endCollectTime=this.nowEndTime,
-      this.queryParams.beginRecordTime=this.nowBeginTime,
-      this.queryParams.endRecordTime=this.nowEndTime,
-    this.getList()
+    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
+    this.daterangeCollectTime[0] = nowDate + ' 00:00:00'
+    this.daterangeCollectTime[1] = nowDate + ' 23:59:59'
     this.getTreeselect()
     this.getTreeMonitorInfo()
+    this.getList()
   },
   watch: {
-    // 根据名称筛选部门树
+    // 根据名称筛选计量设备树
     workUnitName(val) {
       this.$refs.tree.filter(val)
     }
@@ -407,30 +382,35 @@ export default {
     /** 转换计量设备信息数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {
-        delete node.children;
+        delete node.children
       }
       return {
-        id: node.objId,
+        id: node.monitorCode,
         label: node.monitorName,
         children: node.children
-      };
+      }
     },
     /** 查询计量设备信息下拉树结构   新增用*/
     getTreeMonitorInfo() {
-      listBaseMonitorInfo(this.queryParamsInsert).then(response => {
-        this.baseMonitorInfoOptions = [];
-        const data = { objId: 0, monitorName: '顶级节点', children: [] };
-        data.children = this.handleTree(response.data, "objId", "parentId");
-        this.baseMonitorInfoOptions.push(data);
-      });
-    },
-    //因为重置后时间选择器视图不更新，所以强制更新
-    changeDate() {
-      this.$forceUpdate()
+      listBaseMonitorInfo({ monitorType: 2 }).then(response => {
+        this.baseMonitorInfoOptions = []
+        const data = { objId: 0, monitorName: '顶级节点', children: [] }
+        data.children = this.handleTree(response.data, 'objId', 'parentId')
+        this.baseMonitorInfoOptions.push(data)
+      })
     },
     /** 查询电实时数据列表 */
     getList() {
       this.loading = true
+      this.queryParams.params = {}
+      if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) {
+        this.queryParams.params['beginCollectTime'] = this.daterangeCollectTime[0]
+        this.queryParams.params['endCollectTime'] = this.daterangeCollectTime[1]
+      }
+      if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) {
+        this.queryParams.params['beginRecordTime'] = this.daterangeRecordTime[0]
+        this.queryParams.params['endRecordTime'] = this.daterangeRecordTime[1]
+      }
       listRecordDnbInstant(this.queryParams).then(response => {
         this.recordDnbInstantList = response.rows
         this.total = response.total
@@ -446,8 +426,7 @@ export default {
     reset() {
       this.form = {
         objId: null,
-        monitorId: null,
-        monitorType:2,
+        monitorCode: null,
         collectTime: null,
         va: null,
         vb: null,
@@ -460,7 +439,7 @@ export default {
         zxyg: null,
         activePower: null,
         reactivePower: null,
-        collectType: null
+        collectType: 1
       }
       this.resetForm('form')
     },
@@ -471,11 +450,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams.beginCollectTime = this.nowBeginTime;
-      this.queryParams.endCollectTime = this.nowEndTime;
-      this.queryParams.beginRecordTime = this.nowBeginTime;
-      this.queryParams.endRecordTime = this.nowEndTime;
-      this.queryParams.monitorId = null
+      this.queryParams.monitorCode = null
       this.resetForm('queryForm')
       this.handleQuery()
     },
@@ -541,8 +516,8 @@ export default {
 
     /** 查询计量设备信息下拉树结构 */
     getTreeselect() {
-      getMonitorInfoTree(this.form).then(response => {
-        this.monitorInfoOptions = response.data;
+      getMonitorInfoTree({ monitorType: 2 }).then(response => {
+        this.monitorInfoOptions = response.data
       })
     },
 
@@ -551,11 +526,12 @@ export default {
       if (!value) return true
       return data.label.indexOf(value) !== -1
     },
+
     // 节点单击事件
     handleNodeClick(data) {
-      this.queryParams.monitorId = data.id
+      this.queryParams.monitorCode = data.code
       this.handleQuery()
-    },
+    }
 
   }
 }
diff --git a/src/views/ems/record/recordWaterInstant/index.vue b/src/views/ems/record/recordWaterInstant/index.vue
index 8e2a198..51ae741 100644
--- a/src/views/ems/record/recordWaterInstant/index.vue
+++ b/src/views/ems/record/recordWaterInstant/index.vue
@@ -15,7 +15,7 @@
         <div class="head-container">
           <el-tree
             :data="monitorInfoOptions"
-            :props="workUnitProps"
+            :props="monitorProps"
             :expand-on-click-node="false"
             :filter-node-method="filterNode"
             ref="tree"
@@ -28,191 +28,183 @@
       </el-col>
 
       <el-col :span="19" :xs="24">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="采集时间" >
-        <el-date-picker clearable prop="beginCollectTime"
-                        v-model="queryParams.beginCollectTime"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        @input="changeDate"
-                        placeholder="请选择开始时间">
-        </el-date-picker>
-        -
-        <el-date-picker clearable prop="endCollectTime"
-                        v-model="queryParams.endCollectTime"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        @input="changeDate"
-                        placeholder="请选择结束时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="采集方式" prop="collectType">
-        <el-select v-model="queryParams.collectType" placeholder="请选择采集方式" clearable>
-          <el-option
-            v-for="dict in dict.type.collect_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="记录时间" prop="recordTime">
-        <el-date-picker clearable
-                        v-model="queryParams.beginRecordTime"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        @input="changeDate"
-                        placeholder="请选择记录时间">
-        </el-date-picker>
-        -
-        <el-date-picker clearable
-                        v-model="queryParams.endRecordTime"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        @input="changeDate"
-                        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>
-      </el-form-item>
-    </el-form>
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="100px"
+        >
+          <el-form-item label="采集时间">
+            <el-date-picker
+              v-model="daterangeCollectTime"
+              style="width: 340px"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="datetimerange"
+              range-separator="-"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="记录时间">
+            <el-date-picker
+              v-model="daterangeRecordTime"
+              style="width: 340px"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="datetimerange"
+              range-separator="-"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="采集方式" prop="collectType">
+            <el-select v-model="queryParams.collectType" placeholder="请选择采集方式" clearable>
+              <el-option
+                v-for="dict in dict.type.collect_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </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>
+          </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/record:recordWaterInstant:add']"
-        >新增
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['ems/record:recordWaterInstant:edit']"
-        >修改
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['ems/record:recordWaterInstant:remove']"
-        >删除
-        </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/record:recordWaterInstant:export']"
-        >导出
-        </el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-    </el-row>
+        <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/record:recordWaterInstant:add']"
+            >新增
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="success"
+              plain
+              icon="el-icon-edit"
+              size="mini"
+              :disabled="single"
+              @click="handleUpdate"
+              v-hasPermi="['ems/record:recordWaterInstant:edit']"
+            >修改
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="danger"
+              plain
+              icon="el-icon-delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDelete"
+              v-hasPermi="['ems/record:recordWaterInstant:remove']"
+            >删除
+            </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/record:recordWaterInstant:export']"
+            >导出
+            </el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
 
-    <el-table v-loading="loading" :data="recordWaterInstantList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
-<!--      <el-table-column label=" " align="center" prop="objId" v-if="columns[0].visible"/>-->
-      <el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[1].visible"/>
-      <el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[7].visible"/>
-      <el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[2].visible">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="瞬时流量" align="center" prop="fluxFlow" v-if="columns[3].visible"/>
-      <el-table-column label="累计流量" align="center" prop="waterFlow" v-if="columns[4].visible"/>
-      <el-table-column label="记录时间" align="center" prop="recordTime" width="180" v-if="columns[5].visible">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="采集方式" align="center" prop="collectType" v-if="columns[6].visible">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.collect_type" :value="scope.row.collectType"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['ems/record:recordWaterInstant:edit']"
-          >修改
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['ems/record:recordWaterInstant:remove']"
-          >删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table v-loading="loading" :data="recordWaterInstantList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center"/>
+          <!--      <el-table-column label=" " align="center" prop="objId" v-if="columns[0].visible"/>-->
+          <el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[1].visible"/>
+          <el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[7].visible"/>
+          <el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[2].visible">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="瞬时流量" align="center" prop="fluxFlow" v-if="columns[3].visible"/>
+          <el-table-column label="累计流量" align="center" prop="waterFlow" v-if="columns[4].visible"/>
+          <el-table-column label="记录时间" align="center" prop="recordTime" width="180" v-if="columns[5].visible">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="采集方式" align="center" prop="collectType" v-if="columns[6].visible">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.collect_type" :value="scope.row.collectType"/>
+            </template>
+          </el-table-column>
+          <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+          <!--        <template slot-scope="scope">-->
+          <!--          <el-button-->
+          <!--            size="mini"-->
+          <!--            type="text"-->
+          <!--            icon="el-icon-edit"-->
+          <!--            @click="handleUpdate(scope.row)"-->
+          <!--            v-hasPermi="['ems/record:recordWaterInstant:edit']"-->
+          <!--          >修改-->
+          <!--          </el-button>-->
+          <!--          <el-button-->
+          <!--            size="mini"-->
+          <!--            type="text"-->
+          <!--            icon="el-icon-delete"-->
+          <!--            @click="handleDelete(scope.row)"-->
+          <!--            v-hasPermi="['ems/record:recordWaterInstant:remove']"-->
+          <!--          >删除-->
+          <!--          </el-button>-->
+          <!--        </template>-->
+          <!--      </el-table-column>-->
+        </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-col>
     </el-row>
     <!-- 添加或修改水实时数据对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="计量设备编号" prop="monitorId">
-          <treeselect v-model="form.monitorId" :options="baseMonitorInfoOptions" :normalizer="normalizer" placeholder="请选择父级编号" />
+        <el-form-item label="计量设备名称" prop="monitorCode">
+          <treeselect v-model="form.monitorCode" :options="baseMonitorInfoOptions" :normalizer="normalizer"
+                      placeholder="请选择计量设备名称"
+          />
         </el-form-item>
         <el-form-item label="采集时间" prop="collectTime">
           <el-date-picker clearable
                           v-model="form.collectTime"
                           type="datetime"
                           value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="请选择采集时间">
+                          placeholder="请选择采集时间"
+          >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="瞬时流量" prop="fluxFlow">
-          <el-input v-model="form.fluxFlow" placeholder="请输入瞬时流量"/>
-        </el-form-item>
+        <!--        <el-form-item label="瞬时流量" prop="fluxFlow">-->
+        <!--          <el-input v-model="form.fluxFlow" placeholder="请输入瞬时流量"/>-->
+        <!--        </el-form-item>-->
         <el-form-item label="累计流量" prop="waterFlow">
-          <el-input v-model="form.waterFlow" placeholder="请输入累计流量"/>
-        </el-form-item>
-        <el-form-item label="记录时间" prop="recordTime">
-          <el-date-picker clearable
-                          v-model="form.recordTime"
-                          type="datetime"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="请选择采集时间">
-          </el-date-picker>
+          <el-input-number v-model="form.waterFlow" placeholder="请输入累计流量"/>
         </el-form-item>
+        <!--        <el-form-item label="记录时间" prop="recordTime">-->
+        <!--          <el-date-picker clearable-->
+        <!--                          v-model="form.recordTime"-->
+        <!--                          type="datetime"-->
+        <!--                          value-format="yyyy-MM-dd HH:mm:ss"-->
+        <!--                          placeholder="请选择采集时间">-->
+        <!--          </el-date-picker>-->
+        <!--        </el-form-item>-->
         <el-form-item label="采集方式" prop="collectType">
-          <el-radio-group v-model="form.collectType">
+          <el-radio-group v-model="form.collectType" disabled>
             <el-radio
               v-for="dict in dict.type.collect_type"
               :key="dict.value"
@@ -241,7 +233,7 @@ import {
 import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-
+import { parseTime } from '@/utils/ruoyi'
 
 export default {
   name: 'RecordWaterInstant',
@@ -251,14 +243,13 @@ export default {
   },
   data() {
     return {
-      baseMonitorInfoOptions:[],
+      //下拉树List
+      baseMonitorInfoOptions: [],
+      //左侧树结构List
       monitorInfoOptions: [],
-      workUnitOptions: [],
       workUnitName: undefined,
       //计量设备信息
       baseMonitorInfoList: [],
-      nowBeginTime:null,
-      nowEndTime:null,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -281,7 +272,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        monitorId: null,
+        monitorName: null,
         monitorType: 3,
         collectTime: null,
         fluxFlow: null,
@@ -289,12 +280,13 @@ export default {
         recordTime: null,
         collectType: null
       },
-      queryParamsInsert: {
-        monitorType:3,
-      },
+      // 采集方式时间范围
+      daterangeCollectTime: [],
+      // 采集方式时间范围
+      daterangeRecordTime: [],
       // 表单参数
       form: {},
-      workUnitProps: {
+      monitorProps: {
         children: 'children',
         label: 'label'
       },
@@ -305,7 +297,7 @@ export default {
         ]
       },
       columns: [
-        { key: 0, label: ` `, visible: true },
+        { key: 0, label: `主键标识`, visible: false },
         { key: 1, label: `计量设备编号`, visible: true },
         { key: 2, label: `采集时间`, visible: true },
         { key: 3, label: `瞬时流量`, visible: true },
@@ -317,17 +309,12 @@ export default {
     }
   },
   created() {
-    this.form.monitorType = 3;
-    const date = new Date;
-    this.nowBeginTime = date.toLocaleDateString().replaceAll("/","-")+" 00:00:00";
-    this.nowEndTime = date.toLocaleDateString().replaceAll("/","-")+" 23:59:59";
-    this.queryParams.beginCollectTime = this.nowBeginTime,
-      this.queryParams.endCollectTime=this.nowEndTime,
-      this.queryParams.beginRecordTime=this.nowBeginTime,
-      this.queryParams.endRecordTime=this.nowEndTime,
-    this.getList();
+    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
+    this.daterangeCollectTime[0] = nowDate + ' 00:00:00'
+    this.daterangeCollectTime[1] = nowDate + ' 23:59:59'
     this.getTreeselect()
     this.getTreeMonitorInfo()
+    this.getList()
   },
   watch: {
     // 根据名称筛选部门树
@@ -336,22 +323,27 @@ export default {
     }
   },
   methods: {
-    //因为重置后时间选择器视图不更新，所以强制更新
-    changeDate() {
-      this.$forceUpdate()
-    },
-    /** 查询计量设备信息下拉树结构   新增用*/
+    /** 查询计量设备信息下拉树结构 */
     getTreeMonitorInfo() {
-      listBaseMonitorInfo(this.queryParamsInsert).then(response => {
-        this.baseMonitorInfoOptions = [];
-        const data = { objId: 0, monitorName: '顶级节点', children: [] };
-        data.children = this.handleTree(response.data, "objId", "parentId");
-        this.baseMonitorInfoOptions.push(data);
-      });
+      listBaseMonitorInfo({ monitorType: 3 }).then(response => {
+        this.baseMonitorInfoOptions = []
+        const data = { objId: 0, monitorName: '顶级节点', children: [] }
+        data.children = this.handleTree(response.data, 'objId', 'parentId')
+        this.baseMonitorInfoOptions.push(data)
+      })
     },
     /** 查询水实时数据列表 */
     getList() {
       this.loading = true
+      this.queryParams.params = {}
+      if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) {
+        this.queryParams.params['beginCollectTime'] = this.daterangeCollectTime[0]
+        this.queryParams.params['endCollectTime'] = this.daterangeCollectTime[1]
+      }
+      if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) {
+        this.queryParams.params['beginRecordTime'] = this.daterangeRecordTime[0]
+        this.queryParams.params['endRecordTime'] = this.daterangeRecordTime[1]
+      }
       listRecordWaterInstant(this.queryParams).then(response => {
         this.recordWaterInstantList = response.rows
         this.total = response.total
@@ -367,13 +359,12 @@ export default {
     reset() {
       this.form = {
         objId: null,
-        monitorId: null,
-        monitorType: 3,
+        monitorName: null,
         collectTime: null,
         fluxFlow: null,
         waterFlow: null,
         recordTime: null,
-        collectType: null
+        collectType: 1
       }
       this.resetForm('form')
     },
@@ -384,11 +375,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams.beginCollectTime = this.nowBeginTime
-      this.queryParams.endCollectTime = this.nowEndTime
-      this.queryParams.beginRecordTime = this.nowBeginTime
-      this.queryParams.endRecordTime = this.nowEndTime
-      this.queryParams.monitorId = null
+      this.queryParams.monitorCode = null
       this.resetForm('queryForm')
       this.handleQuery()
     },
@@ -451,10 +438,11 @@ export default {
         ...this.queryParams
       }, `recordWaterInstant_${new Date().getTime()}.xlsx`)
     },
+
     /** 查询计量设备信息下拉树结构 */
     getTreeselect() {
-      getMonitorInfoTree(this.form).then(response => {
-        this.monitorInfoOptions = response.data;
+      getMonitorInfoTree({ monitorType: 3 }).then(response => {
+        this.monitorInfoOptions = response.data
       })
     },
 
@@ -464,7 +452,7 @@ export default {
         delete node.children
       }
       return {
-        id: node.objId,
+        id: node.monitorCode,
         label: node.monitorName,
         children: node.children
       }
@@ -477,7 +465,7 @@ export default {
     },
     // 节点单击事件
     handleNodeClick(data) {
-      this.queryParams.monitorId = data.id
+      this.queryParams.monitorCode = data.code
       this.handleQuery()
     }
   }