From dde426b092e271948a91ebd2432a4ebe61344c26 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Wed, 22 May 2024 16:07:42 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20add=E6=B0=B4=E3=80=81=E7=94=B5?=
 =?UTF-8?q?=E6=95=B4=E7=82=B9=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ems/report/reportPointDnb.js          |  44 ++
 src/api/ems/report/reportPointWater.js        |  44 ++
 src/views/ems/report/reportPointDnb/index.vue | 471 ++++++++++++++++++
 .../ems/report/reportPointWater/index.vue     | 469 +++++++++++++++++
 4 files changed, 1028 insertions(+)
 create mode 100644 src/api/ems/report/reportPointDnb.js
 create mode 100644 src/api/ems/report/reportPointWater.js
 create mode 100644 src/views/ems/report/reportPointDnb/index.vue
 create mode 100644 src/views/ems/report/reportPointWater/index.vue

diff --git a/src/api/ems/report/reportPointDnb.js b/src/api/ems/report/reportPointDnb.js
new file mode 100644
index 0000000..cc0968a
--- /dev/null
+++ b/src/api/ems/report/reportPointDnb.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询电整点数据列表
+export function listReportPointDnb(query) {
+  return request({
+    url: '/ems/report/reportPointDnb/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询电整点数据详细
+export function getReportPointDnb(objId) {
+  return request({
+    url: '/ems/report/reportPointDnb/' + objId,
+    method: 'get'
+  })
+}
+
+// 新增电整点数据
+export function addReportPointDnb(data) {
+  return request({
+    url: '/ems/report/reportPointDnb',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改电整点数据
+export function updateReportPointDnb(data) {
+  return request({
+    url: '/ems/report/reportPointDnb',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除电整点数据
+export function delReportPointDnb(objId) {
+  return request({
+    url: '/ems/report/reportPointDnb/' + objId,
+    method: 'delete'
+  })
+}
diff --git a/src/api/ems/report/reportPointWater.js b/src/api/ems/report/reportPointWater.js
new file mode 100644
index 0000000..adc0848
--- /dev/null
+++ b/src/api/ems/report/reportPointWater.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询水整点数据列表
+export function listReportPointWater(query) {
+  return request({
+    url: '/ems/report/reportPointWater/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询水整点数据详细
+export function getReportPointWater(objId) {
+  return request({
+    url: '/ems/report/reportPointWater/' + objId,
+    method: 'get'
+  })
+}
+
+// 新增水整点数据
+export function addReportPointWater(data) {
+  return request({
+    url: '/ems/report/reportPointWater',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改水整点数据
+export function updateReportPointWater(data) {
+  return request({
+    url: '/ems/report/reportPointWater',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除水整点数据
+export function delReportPointWater(objId) {
+  return request({
+    url: '/ems/report/reportPointWater/' + objId,
+    method: 'delete'
+  })
+}
diff --git a/src/views/ems/report/reportPointDnb/index.vue b/src/views/ems/report/reportPointDnb/index.vue
new file mode 100644
index 0000000..ebe84b0
--- /dev/null
+++ b/src/views/ems/report/reportPointDnb/index.vue
@@ -0,0 +1,471 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="28">
+      <el-col :span="5" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="filterBoxName"
+            placeholder="请输入计量设备名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree
+            :data="monitorInfoOptions"
+            :props="monitorProps"
+            :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="19" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 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="daterangeBeginTime"
+              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="updateFlag">
+            <el-select v-model="queryParams.updateFlag" placeholder="请选择修改标识" clearable>
+              <el-option
+                v-for="dict in dict.type.update_flag"
+                :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/report:reportPointDnb: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/report:reportPointDnb: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/report:reportPointDnb: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/report:reportPointDnb:export']"
+            >导出
+            </el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="reportPointDnbList" @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[12].visible"/>
+          <el-table-column label="耗量" align="center" prop="expend" v-if="columns[3].visible"/>
+          <el-table-column label="记录时间" align="center" prop="recordTime" width="180" v-if="columns[4].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="beginTime" width="180" v-if="columns[5].visible">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.beginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="结束时间" align="center" prop="endTime" width="180" v-if="columns[6].visible">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="仪表值" align="center" prop="instrumentValue" v-if="columns[2].visible"/>
+          <el-table-column label="修改标识" align="center" prop="updateFlag" v-if="columns[7].visible">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.update_flag" :value="scope.row.updateFlag"/>
+            </template>
+          </el-table-column>
+          <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">-->
+          <!--        <template slot-scope="scope">-->
+          <!--          <el-button-->
+          <!--            size="mini"-->
+          <!--            type="text"-->
+          <!--            icon="el-icon-edit"-->
+          <!--            @click="handleUpdate(scope.row)"-->
+          <!--            v-hasPermi="['ems/report:reportPointDnb:edit']"-->
+          <!--          >修改-->
+          <!--          </el-button>-->
+          <!--          <el-button-->
+          <!--            size="mini"-->
+          <!--            type="text"-->
+          <!--            icon="el-icon-delete"-->
+          <!--            @click="handleDelete(scope.row)"-->
+          <!--            v-hasPermi="['ems/report:reportPointDnb:remove']"-->
+          <!--          >删除-->
+          <!--          </el-button>-->
+          <!--        </template>-->
+          <!--      </el-table-column>-->
+        </el-table>
+      </el-col>
+    </el-row>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改电整点数据对话框 -->
+    <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="monitorCode">
+          <el-input v-model="form.monitorCode" placeholder="请输入计量设备编号" disabled/>
+        </el-form-item>
+        <el-form-item label="计量设备名称" prop="monitorName">
+          <el-input v-model="form.monitorName" placeholder="计量设备名称" disabled/>
+        </el-form-item>
+        <el-form-item label="仪表值" prop="instrumentValue">
+          <el-input v-model="form.instrumentValue" placeholder="请输入仪表值"/>
+        </el-form-item>
+        <el-form-item label="耗量" prop="expend">
+          <el-input v-model="form.expend" 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="请选择记录时间"-->
+<!--                          disabled-->
+<!--          >-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+        <el-form-item label="开始时间" prop="beginTime">
+          <el-date-picker clearable
+                          v-model="form.beginTime"
+                          type="datetime"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          placeholder="请选择开始时间"
+                          disabled
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-date-picker clearable
+                          v-model="form.endTime"
+                          type="datetime"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          placeholder="请选择结束时间"
+                          disabled
+          >
+          </el-date-picker>
+        </el-form-item>
+<!--        <el-form-item label="修改标识" prop="updateFlag">-->
+<!--          <el-radio-group v-model="form.updateFlag" disabled>-->
+<!--            <el-radio-->
+<!--              v-for="dict in dict.type.update_flag"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.value"-->
+<!--            >{{ dict.label }}-->
+<!--            </el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listReportPointDnb,
+  getReportPointDnb,
+  delReportPointDnb,
+  addReportPointDnb,
+  updateReportPointDnb
+} from '@/api/ems/report/reportPointDnb'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { parseTime } from '@/utils/ruoyi'
+import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo'
+
+export default {
+  name: 'ReportPointDnb',
+  dicts: ['update_flag'],
+  components: {
+    Treeselect
+  },
+  data() {
+    return {
+      //左侧树结构List
+      monitorInfoOptions: [],
+      //左侧树结构筛选框
+      filterBoxName: undefined,
+      monitorProps: {
+        children: 'children',
+        label: 'label'
+      },
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 电整点数据表格数据
+      reportPointDnbList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 修改标识时间范围
+      daterangeBeginTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        monitorCode: null,
+        instrumentValue: null,
+        expend: null,
+        recordTime: null,
+        beginTime: null,
+        endTime: null,
+        updateFlag: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        objId: [
+          { required: true, message: '主键标识不能为空', trigger: 'blur' }
+        ]
+      },
+      columns: [
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `计量设备编号`, visible: true },
+        { key: 2, label: `仪表值`, visible: true },
+        { key: 3, label: `耗量`, visible: true },
+        { key: 4, label: `记录时间`, visible: false },
+        { key: 5, label: `开始时间`, visible: true },
+        { key: 6, label: `结束时间`, visible: true },
+        { key: 7, label: `修改标识`, visible: true },
+        { key: 8, label: `创建人`, visible: false },
+        { key: 9, label: `创建时间`, visible: false },
+        { key: 10, label: `更新人`, visible: false },
+        { key: 11, label: `更新时间`, visible: false },
+        { key: 12, label: `计量设备名称`, visible: true }
+      ]
+    }
+  },
+  created() {
+    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
+    this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
+    this.daterangeBeginTime[1] = nowDate + ' 23:59:59'
+    this.getTreeselect()
+    this.getList()
+  },
+  watch: {
+    // 根据输入字符左侧树结构筛选
+    filterBoxName(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
+  methods: {
+    /** 查询电整点数据列表 */
+    getList() {
+      this.loading = true
+      this.queryParams.params = {}
+      if (null != this.daterangeBeginTime && '' != this.daterangeBeginTime) {
+        this.queryParams.params['beginBeginTime'] = this.daterangeBeginTime[0]
+        this.queryParams.params['endBeginTime'] = this.daterangeBeginTime[1]
+      }
+      listReportPointDnb(this.queryParams).then(response => {
+        this.reportPointDnbList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        monitorCode: null,
+        instrumentValue: null,
+        expend: null,
+        recordTime: null,
+        beginTime: null,
+        endTime: null,
+        updateFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeBeginTime = []
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+
+    /** 查询计量设备信息下拉树结构 */
+    getTreeselect() {
+      getMonitorInfoTree({ monitorType: 2 }).then(response => {
+        this.monitorInfoOptions = response.data
+      })
+    },
+
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
+    },
+
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.monitorCode = data.code
+      this.handleQuery()
+    },
+
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加电整点数据'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const objId = row.objId || this.ids
+      getReportPointDnb(objId).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改电整点数据'
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            this.form.updateFlag = '0'
+            updateReportPointDnb(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addReportPointDnb(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const objIds = row.objId || this.ids
+      this.$modal.confirm('是否确认删除电整点数据编号为"' + objIds + '"的数据项？').then(function() {
+        return delReportPointDnb(objIds)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/report/reportPointDnb/export', {
+        ...this.queryParams
+      }, `reportPointDnb_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>
diff --git a/src/views/ems/report/reportPointWater/index.vue b/src/views/ems/report/reportPointWater/index.vue
new file mode 100644
index 0000000..e40fdff
--- /dev/null
+++ b/src/views/ems/report/reportPointWater/index.vue
@@ -0,0 +1,469 @@
+<script src="../../../../api/ems/report/reportPointWater.js"></script>
+<template>
+  <div class="app-container">
+    <el-row :gutter="28">
+      <el-col :span="5" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="filterBoxName"
+            placeholder="请输入计量设备名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree
+            :data="monitorInfoOptions"
+            :props="monitorProps"
+            :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="19" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 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="daterangeBeginTime"
+              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="updateFlag">
+            <el-select v-model="queryParams.updateFlag" placeholder="请选择修改标识" clearable>
+              <el-option
+                v-for="dict in dict.type.update_flag"
+                :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/report:reportPointWater: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/report:reportPointWater: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/report:reportPointWater: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/report:reportPointWater:export']"
+            >导出
+            </el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="reportPointWaterList" @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[12].visible"/>
+          <el-table-column label="耗量" align="center" prop="expend" v-if="columns[3].visible"/>
+          <el-table-column label="记录时间" align="center" prop="recordTime" width="180" v-if="columns[4].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="beginTime" width="180" v-if="columns[5].visible">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.beginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="结束时间" align="center" prop="endTime" width="180" v-if="columns[6].visible">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="仪表值" align="center" prop="instrumentValue" v-if="columns[2].visible"/>
+          <el-table-column label="修改标识" align="center" prop="updateFlag" v-if="columns[7].visible">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.update_flag" :value="scope.row.updateFlag"/>
+            </template>
+          </el-table-column>
+<!--          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-button-->
+<!--                size="mini"-->
+<!--                type="text"-->
+<!--                icon="el-icon-edit"-->
+<!--                @click="handleUpdate(scope.row)"-->
+<!--                v-hasPermi="['ems/report:reportPointWater:edit']"-->
+<!--              >修改-->
+<!--              </el-button>-->
+<!--              <el-button-->
+<!--                size="mini"-->
+<!--                type="text"-->
+<!--                icon="el-icon-delete"-->
+<!--                @click="handleDelete(scope.row)"-->
+<!--                v-hasPermi="['ems/report:reportPointWater:remove']"-->
+<!--              >删除-->
+<!--              </el-button>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+        </el-table>
+      </el-col>
+    </el-row>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改水整点数据对话框 -->
+    <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="monitorCode">
+          <el-input v-model="form.monitorCode" placeholder="请输入计量设备编号" disabled/>
+        </el-form-item>
+        <el-form-item label="计量设备名称" prop="monitorName">
+          <el-input v-model="form.monitorName" placeholder="计量设备名称" disabled/>
+        </el-form-item>
+        <el-form-item label="仪表值" prop="instrumentValue">
+          <el-input v-model="form.instrumentValue" placeholder="请输入仪表值"/>
+        </el-form-item>
+        <el-form-item label="耗量" prop="expend">
+          <el-input v-model="form.expend" 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="请选择记录时间"-->
+        <!--                          disabled-->
+        <!--          >-->
+        <!--          </el-date-picker>-->
+        <!--        </el-form-item>-->
+        <el-form-item label="开始时间" prop="beginTime">
+          <el-date-picker clearable
+                          v-model="form.beginTime"
+                          type="datetime"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          placeholder="请选择开始时间"
+                          disabled
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-date-picker clearable
+                          v-model="form.endTime"
+                          type="datetime"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          placeholder="请选择结束时间"
+                          disabled
+          >
+          </el-date-picker>
+        </el-form-item>
+        <!--        <el-form-item label="修改标识" prop="updateFlag">-->
+        <!--          <el-radio-group v-model="form.updateFlag" disabled>-->
+        <!--            <el-radio-->
+        <!--              v-for="dict in dict.type.update_flag"-->
+        <!--              :key="dict.value"-->
+        <!--              :label="dict.value"-->
+        <!--            >{{ dict.label }}-->
+        <!--            </el-radio>-->
+        <!--          </el-radio-group>-->
+        <!--        </el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listReportPointWater,
+  getReportPointWater,
+  delReportPointWater,
+  addReportPointWater,
+  updateReportPointWater
+} from '@/api/ems/report/reportPointWater'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { parseTime } from '@/utils/ruoyi'
+import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo'
+
+export default {
+  name: 'ReportPointWater',
+  dicts: ['update_flag'],
+  data() {
+    return {
+      //左侧树结构List
+      monitorInfoOptions: [],
+      //左侧树结构筛选框
+      filterBoxName: undefined,
+      monitorProps: {
+        children: 'children',
+        label: 'label'
+      },
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 水整点数据表格数据
+      reportPointWaterList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 修改标识时间范围
+      daterangeBeginTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        monitorCode: null,
+        instrumentValue: null,
+        expend: null,
+        recordTime: null,
+        beginTime: null,
+        endTime: null,
+        updateFlag: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        objId: [
+          { required: true, message: '主键标识不能为空', trigger: 'blur' }
+        ]
+      },
+      columns: [
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `计量设备编号`, visible: true },
+        { key: 2, label: `仪表值`, visible: true },
+        { key: 3, label: `耗量`, visible: true },
+        { key: 4, label: `记录时间`, visible: false },
+        { key: 5, label: `开始时间`, visible: true },
+        { key: 6, label: `结束时间`, visible: true },
+        { key: 7, label: `修改标识`, visible: true },
+        { key: 8, label: `创建人`, visible: false },
+        { key: 9, label: `创建时间`, visible: false },
+        { key: 10, label: `更新人`, visible: false },
+        { key: 11, label: `更新时间`, visible: false },
+        { key: 12, label: `计量设备名称`, visible: true }
+      ]
+    }
+  },
+  created() {
+    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
+    this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
+    this.daterangeBeginTime[1] = nowDate + ' 23:59:59'
+    this.getTreeselect()
+    this.getList()
+  },
+  watch: {
+    // 根据输入字符左侧树结构筛选
+    filterBoxName(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
+  methods: {
+    /** 查询水整点数据列表 */
+    getList() {
+      this.loading = true
+      this.queryParams.params = {}
+      if (null != this.daterangeBeginTime && '' != this.daterangeBeginTime) {
+        this.queryParams.params['beginBeginTime'] = this.daterangeBeginTime[0]
+        this.queryParams.params['endBeginTime'] = this.daterangeBeginTime[1]
+      }
+      listReportPointWater(this.queryParams).then(response => {
+        this.reportPointWaterList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        monitorCode: null,
+        instrumentValue: null,
+        expend: null,
+        recordTime: null,
+        beginTime: null,
+        endTime: null,
+        updateFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeBeginTime = []
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+
+    /** 查询计量设备信息下拉树结构 */
+    getTreeselect() {
+      getMonitorInfoTree({ monitorType: 3 }).then(response => {
+        this.monitorInfoOptions = response.data
+      })
+    },
+
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
+    },
+
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.monitorCode = data.code
+      this.handleQuery()
+    },
+
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加水整点数据'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const objId = row.objId || this.ids
+      getReportPointWater(objId).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改水整点数据'
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            this.form.updateFlag = '0'
+            updateReportPointWater(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addReportPointWater(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const objIds = row.objId || this.ids
+      this.$modal.confirm('是否确认删除水整点数据编号为"' + objIds + '"的数据项？').then(function() {
+        return delReportPointWater(objIds)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/report/reportPointWater/export', {
+        ...this.queryParams
+      }, `reportPointWater_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>