yinq
/
XMXS-OS-UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 修改水电实时数据

Browse Source
main
yinq 6 months ago
parent ca8f7a2b23
commit 1b1a0fe0cc
3 changed files with 410 additions and 432 deletions
Show Stats Download Patch File Download Diff File

18
src/views/ems/base/baseMonitorInfo/index.vue
Unescape Escape View File

@ -162,7 +162,14 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="采集设备" prop="collectDeviceId"> <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>
<!-- <el-form-item label="等级" prop="grade">--> <!-- <el-form-item label="等级" prop="grade">-->
<!-- <el-input v-model="form.grade" placeholder="请输入等级" />--> <!-- <el-input v-model="form.grade" placeholder="请输入等级" />-->
@ -213,6 +220,8 @@
import { listBaseMonitorInfo, getBaseMonitorInfo, delBaseMonitorInfo, addBaseMonitorInfo, updateBaseMonitorInfo } from "@/api/ems/base/baseMonitorInfo"; import { listBaseMonitorInfo, getBaseMonitorInfo, delBaseMonitorInfo, addBaseMonitorInfo, updateBaseMonitorInfo } from "@/api/ems/base/baseMonitorInfo";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { getBaseEnergyTypeList } from '@/api/ems/base/baseEnergyType'
import { getCollectDeviceInfo } from '@/api/ems/base/baseCollectDeviceInfo'
export default { export default {
name: "BaseMonitorInfo", name: "BaseMonitorInfo",
@ -298,10 +307,15 @@ export default {
{key: 20, label: `更新时间`, visible: false}, {key: 20, label: `更新时间`, visible: false},
{key: 21, label: `公摊表类型`, visible: false}, {key: 21, label: `公摊表类型`, visible: false},
{key: 22, label: `表具层级`, visible: false}, {key: 22, label: `表具层级`, visible: false},
] ],
// 采集设备选项选项
collectDeviceList: []
}; };
}, },
created() { created() {
getCollectDeviceInfo({}).then(response => {
this.collectDeviceList = response.data
})
this.getList(); this.getList();
}, },
methods: { methods: {

248
src/views/ems/record/recordDnbInstant/index.vue
Unescape Escape View File

@ -15,7 +15,7 @@
<div class="head-container"> <div class="head-container">
<el-tree <el-tree
:data="monitorInfoOptions" :data="monitorInfoOptions"
:props="workUnitProps" :props="monitorProps"
:expand-on-click-node="false" :expand-on-click-node="false"
:filter-node-method="filterNode" :filter-node-method="filterNode"
ref="tree" ref="tree"
@ -28,33 +28,37 @@
</el-col> </el-col>
<el-col :span="19" :xs="24"> <el-col :span="19" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="100px"> label-width="100px"
<!-- <el-form-item label="计量设备编号" prop="monitorId">--> >
<!-- <el-form-item label="计量设备编号" prop="monitorCode">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.monitorId"--> <!-- v-model="queryParams.monitorCode"-->
<!-- placeholder="请输入计量设备编号"--> <!-- placeholder="请输入计量设备编号"-->
<!-- clearable--> <!-- clearable-->
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="采集时间" prop="collectTime"> <el-form-item label="采集时间">
<el-date-picker clearable <el-date-picker
v-model="queryParams.beginCollectTime" v-model="daterangeCollectTime"
type="datetime" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择开始时间" type="datetimerange"
@input="changeDate" range-separator="-"
> start-placeholder="开始时间"
</el-date-picker> end-placeholder="结束时间"
- ></el-date-picker>
<el-date-picker clearable </el-form-item>
v-model="queryParams.endCollectTime" <el-form-item label="记录时间">
type="datetime" <el-date-picker
v-model="daterangeRecordTime"
style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择结束时间" type="datetimerange"
@input="changeDate" range-separator="-"
> start-placeholder="开始时间"
</el-date-picker> end-placeholder="结束时间"
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="采集方式" prop="collectType"> <el-form-item label="采集方式" prop="collectType">
<el-select v-model="queryParams.collectType" placeholder="请选择采集方式" clearable> <el-select v-model="queryParams.collectType" placeholder="请选择采集方式" clearable>
@ -66,27 +70,6 @@
/> />
</el-select> </el-select>
</el-form-item> </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-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <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-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -145,8 +128,8 @@
<el-table v-loading="loading" :data="recordDnbInstantList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="recordDnbInstantList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <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="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="monitorCode" v-if="columns[1].visible" width="100"/>
<el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[15].visible"/> <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"> <el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[2].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <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="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="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="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="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="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="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="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"> <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> </template>
</el-table-column> </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"> <template slot-scope="scope">
<el-button <dict-tag :options="dict.type.collect_type" :value="scope.row.collectType"/>
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> </template>
</el-table-column> </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-table>
</el-col> </el-col>
</el-row> </el-row>
@ -211,12 +191,11 @@
<!-- 添加或修改电实时数据对话框 --> <!-- 添加或修改电实时数据对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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 ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="计量设备编号" prop="monitorId"> <el-form-item label="计量设备名称" prop="monitorCode">
<treeselect v-model="form.monitorId" :options="baseMonitorInfoOptions" :normalizer="normalizer" placeholder="请选择父级编号" /> <treeselect v-model="form.monitorCode" :options="baseMonitorInfoOptions" :normalizer="normalizer"
placeholder="请选择计量设备名称"
/>
</el-form-item> </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-form-item label="采集时间" prop="collectTime">
<el-date-picker clearable <el-date-picker clearable
v-model="form.collectTime" v-model="form.collectTime"
@ -244,20 +223,20 @@
<!-- <el-form-item label="C项电流" prop="ic">--> <!-- <el-form-item label="C项电流" prop="ic">-->
<!-- <el-input v-model="form.ic" placeholder="请输入C项电流"/>--> <!-- <el-input v-model="form.ic" placeholder="请输入C项电流"/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="记录时间" prop="recordTime"> <!-- <el-form-item label="记录时间" prop="recordTime">-->
<el-date-picker clearable <!-- <el-date-picker clearable-->
v-model="form.recordTime" <!-- v-model="form.recordTime"-->
type="datetime" <!-- type="datetime"-->
value-format="yyyy-MM-dd HH:mm:ss" <!-- value-format="yyyy-MM-dd HH:mm:ss"-->
placeholder="请选择记录时间" <!-- placeholder="请选择记录时间"-->
> <!-- >-->
</el-date-picker> <!-- </el-date-picker>-->
</el-form-item> <!-- </el-form-item>-->
<!-- <el-form-item label="功率因数" prop="glys">--> <!-- <el-form-item label="功率因数" prop="glys">-->
<!-- <el-input v-model="form.glys" placeholder="请输入功率因数"/>--> <!-- <el-input v-model="form.glys" placeholder="请输入功率因数"/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="正向有功" prop="zxyg"> <el-form-item label="正向有功" prop="zxyg">
<el-input v-model="form.zxyg" placeholder="请输入正向有功"/> <el-input-number v-model="form.zxyg" placeholder="请输入正向有功"/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="有功功率" prop="activePower">--> <!-- <el-form-item label="有功功率" prop="activePower">-->
<!-- <el-input v-model="form.activePower" placeholder="请输入有功功率"/>--> <!-- <el-input v-model="form.activePower" placeholder="请输入有功功率"/>-->
@ -266,7 +245,7 @@
<!-- <el-input v-model="form.reactivePower" placeholder="请输入无功功率"/>--> <!-- <el-input v-model="form.reactivePower" placeholder="请输入无功功率"/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="采集方式" prop="collectType"> <el-form-item label="采集方式" prop="collectType">
<el-radio-group v-model="form.collectType"> <el-radio-group v-model="form.collectType" disabled>
<el-radio <el-radio
v-for="dict in dict.type.collect_type" v-for="dict in dict.type.collect_type"
:key="dict.value" :key="dict.value"
@ -294,8 +273,8 @@ import {
} from '@/api/ems/record/recordDnbInstant' } from '@/api/ems/record/recordDnbInstant'
import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo' import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
import Treeselect from '@riophae/vue-treeselect' import Treeselect from '@riophae/vue-treeselect'
import { getWorkUnitTrees, listBaseWorkUnit } from '@/api/ems/base/baseWorkUnit'
import '@riophae/vue-treeselect/dist/vue-treeselect.css' import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import { parseTime } from '@/utils/ruoyi'
export default { export default {
name: 'RecordDnbInstant', name: 'RecordDnbInstant',
@ -305,13 +284,17 @@ export default {
}, },
data() { data() {
return { return {
//下拉树List
baseMonitorInfoOptions: [], baseMonitorInfoOptions: [],
//左侧树结构List
monitorInfoOptions: [], monitorInfoOptions: [],
workUnitName: undefined, workUnitName: undefined,
//计量设备信息 //计量设备信息
baseMonitorInfoList: [], baseMonitorInfoList: [],
nowBeginTime:null, // 采集方式时间范围
nowEndTime:null, daterangeCollectTime: [],
// 采集方式时间范围
daterangeRecordTime: [],
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
@ -334,7 +317,7 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
monitorId: null, monitorCode: null,
collectTime: null, collectTime: null,
va: null, va: null,
vb: null, vb: null,
@ -349,12 +332,9 @@ export default {
reactivePower: null, reactivePower: null,
collectType: null collectType: null
}, },
queryParamsInsert: {
monitorType:2,
},
// 表单参数 // 表单参数
form: {}, form: {},
workUnitProps: { monitorProps: {
children: 'children', children: 'children',
label: 'label' label: 'label'
}, },
@ -365,15 +345,15 @@ export default {
] ]
}, },
columns: [ columns: [
{ key: 0, label: `编号`, visible: false }, { key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `计量设备编号`, visible: true }, { key: 1, label: `计量设备编号`, visible: true },
{ key: 2, label: `采集时间`, visible: true }, { key: 2, label: `采集时间`, visible: true },
{ key: 3, label: `A项电压`, visible: false }, { key: 3, label: `A项电压`, visible: true },
{ key: 4, label: `B项电压`, visible: false }, { key: 4, label: `B项电压`, visible: true },
{ key: 5, label: `C项电压`, visible: false }, { key: 5, label: `C项电压`, visible: true },
{ key: 6, label: `A项电流`, visible: false }, { key: 6, label: `A项电流`, visible: true },
{ key: 7, label: `B项电流`, visible: false }, { key: 7, label: `B项电流`, visible: true },
{ key: 8, label: `C项电流`, visible: false }, { key: 8, label: `C项电流`, visible: true },
{ key: 9, label: `记录时间`, visible: true }, { key: 9, label: `记录时间`, visible: true },
{ key: 10, label: `功率因数`, visible: true }, { key: 10, label: `功率因数`, visible: true },
{ key: 11, label: `正向有功`, visible: true }, { key: 11, label: `正向有功`, visible: true },
@ -385,20 +365,15 @@ export default {
} }
}, },
created() { created() {
this.form.monitorType = 2; const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
const date = new Date; this.daterangeCollectTime[0] = nowDate + ' 00:00:00'
this.nowBeginTime = date.toLocaleDateString().replaceAll("/","-")+" 00:00:00"; this.daterangeCollectTime[1] = nowDate + ' 23:59:59'
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()
this.getTreeselect() this.getTreeselect()
this.getTreeMonitorInfo() this.getTreeMonitorInfo()
this.getList()
}, },
watch: { watch: {
// 根据名称筛选部门树 // 根据名称筛选计量设备树
workUnitName(val) { workUnitName(val) {
this.$refs.tree.filter(val) this.$refs.tree.filter(val)
} }
@ -407,30 +382,35 @@ export default {
/** 转换计量设备信息数据结构 */ /** 转换计量设备信息数据结构 */
normalizer(node) { normalizer(node) {
if (node.children && !node.children.length) { if (node.children && !node.children.length) {
delete node.children; delete node.children
} }
return { return {
id: node.objId, id: node.monitorCode,
label: node.monitorName, label: node.monitorName,
children: node.children children: node.children
}; }
}, },
/** 查询计量设备信息下拉树结构 新增用*/ /** 查询计量设备信息下拉树结构 新增用*/
getTreeMonitorInfo() { getTreeMonitorInfo() {
listBaseMonitorInfo(this.queryParamsInsert).then(response => { listBaseMonitorInfo({ monitorType: 2 }).then(response => {
this.baseMonitorInfoOptions = []; this.baseMonitorInfoOptions = []
const data = { objId: 0, monitorName: '顶级节点', children: [] }; const data = { objId: 0, monitorName: '顶级节点', children: [] }
data.children = this.handleTree(response.data, "objId", "parentId"); data.children = this.handleTree(response.data, 'objId', 'parentId')
this.baseMonitorInfoOptions.push(data); this.baseMonitorInfoOptions.push(data)
}); })
},
//因为重置后时间选择器视图不更新，所以强制更新
changeDate() {
this.$forceUpdate()
}, },
/** 查询电实时数据列表 */ /** 查询电实时数据列表 */
getList() { getList() {
this.loading = true 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 => { listRecordDnbInstant(this.queryParams).then(response => {
this.recordDnbInstantList = response.rows this.recordDnbInstantList = response.rows
this.total = response.total this.total = response.total
@ -446,8 +426,7 @@ export default {
reset() { reset() {
this.form = { this.form = {
objId: null, objId: null,
monitorId: null, monitorCode: null,
monitorType:2,
collectTime: null, collectTime: null,
va: null, va: null,
vb: null, vb: null,
@ -460,7 +439,7 @@ export default {
zxyg: null, zxyg: null,
activePower: null, activePower: null,
reactivePower: null, reactivePower: null,
collectType: null collectType: 1
} }
this.resetForm('form') this.resetForm('form')
}, },
@ -471,11 +450,7 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams.beginCollectTime = this.nowBeginTime; this.queryParams.monitorCode = null
this.queryParams.endCollectTime = this.nowEndTime;
this.queryParams.beginRecordTime = this.nowBeginTime;
this.queryParams.endRecordTime = this.nowEndTime;
this.queryParams.monitorId = null
this.resetForm('queryForm') this.resetForm('queryForm')
this.handleQuery() this.handleQuery()
}, },
@ -541,8 +516,8 @@ export default {
/** 查询计量设备信息下拉树结构 */ /** 查询计量设备信息下拉树结构 */
getTreeselect() { getTreeselect() {
getMonitorInfoTree(this.form).then(response => { getMonitorInfoTree({ monitorType: 2 }).then(response => {
this.monitorInfoOptions = response.data; this.monitorInfoOptions = response.data
}) })
}, },
@ -551,11 +526,12 @@ export default {
if (!value) return true if (!value) return true
return data.label.indexOf(value) !== -1 return data.label.indexOf(value) !== -1
}, },
// 节点单击事件 // 节点单击事件
handleNodeClick(data) { handleNodeClick(data) {
this.queryParams.monitorId = data.id this.queryParams.monitorCode = data.code
this.handleQuery() this.handleQuery()
}, }
} }
} }

210
src/views/ems/record/recordWaterInstant/index.vue
Unescape Escape View File

@ -15,7 +15,7 @@
<div class="head-container"> <div class="head-container">
<el-tree <el-tree
:data="monitorInfoOptions" :data="monitorInfoOptions"
:props="workUnitProps" :props="monitorProps"
:expand-on-click-node="false" :expand-on-click-node="false"
:filter-node-method="filterNode" :filter-node-method="filterNode"
ref="tree" ref="tree"
@ -28,23 +28,30 @@
</el-col> </el-col>
<el-col :span="19" :xs="24"> <el-col :span="19" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="100px"
>
<el-form-item label="采集时间"> <el-form-item label="采集时间">
<el-date-picker clearable prop="beginCollectTime" <el-date-picker
v-model="queryParams.beginCollectTime" v-model="daterangeCollectTime"
type="datetime" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
@input="changeDate" type="datetimerange"
placeholder="请选择开始时间"> range-separator="-"
</el-date-picker> start-placeholder="开始时间"
- end-placeholder="结束时间"
<el-date-picker clearable prop="endCollectTime" ></el-date-picker>
v-model="queryParams.endCollectTime" </el-form-item>
type="datetime" <el-form-item label="记录时间">
<el-date-picker
v-model="daterangeRecordTime"
style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
@input="changeDate" type="datetimerange"
placeholder="请选择结束时间"> range-separator="-"
</el-date-picker> start-placeholder="开始时间"
end-placeholder="结束时间"
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="采集方式" prop="collectType"> <el-form-item label="采集方式" prop="collectType">
<el-select v-model="queryParams.collectType" placeholder="请选择采集方式" clearable> <el-select v-model="queryParams.collectType" placeholder="请选择采集方式" clearable>
@ -56,24 +63,6 @@
/> />
</el-select> </el-select>
</el-form-item> </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-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <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-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -152,26 +141,26 @@
<dict-tag :options="dict.type.collect_type" :value="scope.row.collectType"/> <dict-tag :options="dict.type.collect_type" :value="scope.row.collectType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
@click="handleUpdate(scope.row)" <!-- @click="handleUpdate(scope.row)"-->
v-hasPermi="['ems/record:recordWaterInstant:edit']" <!-- v-hasPermi="['ems/record:recordWaterInstant:edit']"-->
>修改 <!-- >修改-->
</el-button> <!-- </el-button>-->
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
@click="handleDelete(scope.row)" <!-- @click="handleDelete(scope.row)"-->
v-hasPermi="['ems/record:recordWaterInstant:remove']" <!-- v-hasPermi="['ems/record:recordWaterInstant:remove']"-->
>删除 <!-- >删除-->
</el-button> <!-- </el-button>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
</el-table> </el-table>
<pagination <pagination
@ -186,33 +175,36 @@
<!-- 添加或修改水实时数据对话框 --> <!-- 添加或修改水实时数据对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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 ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="计量设备编号" prop="monitorId"> <el-form-item label="计量设备名称" prop="monitorCode">
<treeselect v-model="form.monitorId" :options="baseMonitorInfoOptions" :normalizer="normalizer" placeholder="请选择父级编号" /> <treeselect v-model="form.monitorCode" :options="baseMonitorInfoOptions" :normalizer="normalizer"
placeholder="请选择计量设备名称"
/>
</el-form-item> </el-form-item>
<el-form-item label="采集时间" prop="collectTime"> <el-form-item label="采集时间" prop="collectTime">
<el-date-picker clearable <el-date-picker clearable
v-model="form.collectTime" v-model="form.collectTime"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择采集时间"> placeholder="请选择采集时间"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="瞬时流量" prop="fluxFlow"> <!-- <el-form-item label="瞬时流量" prop="fluxFlow">-->
<el-input v-model="form.fluxFlow" placeholder="请输入瞬时流量"/> <!-- <el-input v-model="form.fluxFlow" placeholder="请输入瞬时流量"/>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="累计流量" prop="waterFlow"> <el-form-item label="累计流量" prop="waterFlow">
<el-input v-model="form.waterFlow" placeholder="请输入累计流量"/> <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>
<!-- <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-form-item label="采集方式" prop="collectType">
<el-radio-group v-model="form.collectType"> <el-radio-group v-model="form.collectType" disabled>
<el-radio <el-radio
v-for="dict in dict.type.collect_type" v-for="dict in dict.type.collect_type"
:key="dict.value" :key="dict.value"
@ -241,7 +233,7 @@ import {
import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo' import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
import Treeselect from '@riophae/vue-treeselect' import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css' import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import { parseTime } from '@/utils/ruoyi'
export default { export default {
name: 'RecordWaterInstant', name: 'RecordWaterInstant',
@ -251,14 +243,13 @@ export default {
}, },
data() { data() {
return { return {
//下拉树List
baseMonitorInfoOptions: [], baseMonitorInfoOptions: [],
//左侧树结构List
monitorInfoOptions: [], monitorInfoOptions: [],
workUnitOptions: [],
workUnitName: undefined, workUnitName: undefined,
//计量设备信息 //计量设备信息
baseMonitorInfoList: [], baseMonitorInfoList: [],
nowBeginTime:null,
nowEndTime:null,
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
@ -281,7 +272,7 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
monitorId: null, monitorName: null,
monitorType: 3, monitorType: 3,
collectTime: null, collectTime: null,
fluxFlow: null, fluxFlow: null,
@ -289,12 +280,13 @@ export default {
recordTime: null, recordTime: null,
collectType: null collectType: null
}, },
queryParamsInsert: { // 采集方式时间范围
monitorType:3, daterangeCollectTime: [],
}, // 采集方式时间范围
daterangeRecordTime: [],
// 表单参数 // 表单参数
form: {}, form: {},
workUnitProps: { monitorProps: {
children: 'children', children: 'children',
label: 'label' label: 'label'
}, },
@ -305,7 +297,7 @@ export default {
] ]
}, },
columns: [ columns: [
{ key: 0, label: ` `, visible: true }, { key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `计量设备编号`, visible: true }, { key: 1, label: `计量设备编号`, visible: true },
{ key: 2, label: `采集时间`, visible: true }, { key: 2, label: `采集时间`, visible: true },
{ key: 3, label: `瞬时流量`, visible: true }, { key: 3, label: `瞬时流量`, visible: true },
@ -317,17 +309,12 @@ export default {
} }
}, },
created() { created() {
this.form.monitorType = 3; const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
const date = new Date; this.daterangeCollectTime[0] = nowDate + ' 00:00:00'
this.nowBeginTime = date.toLocaleDateString().replaceAll("/","-")+" 00:00:00"; this.daterangeCollectTime[1] = nowDate + ' 23:59:59'
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();
this.getTreeselect() this.getTreeselect()
this.getTreeMonitorInfo() this.getTreeMonitorInfo()
this.getList()
}, },
watch: { watch: {
// 根据名称筛选部门树 // 根据名称筛选部门树
@ -336,22 +323,27 @@ export default {
} }
}, },
methods: { methods: {
//因为重置后时间选择器视图不更新，所以强制更新 /** 查询计量设备信息下拉树结构 */
changeDate() {
this.$forceUpdate()
},
/** 查询计量设备信息下拉树结构 新增用*/
getTreeMonitorInfo() { getTreeMonitorInfo() {
listBaseMonitorInfo(this.queryParamsInsert).then(response => { listBaseMonitorInfo({ monitorType: 3 }).then(response => {
this.baseMonitorInfoOptions = []; this.baseMonitorInfoOptions = []
const data = { objId: 0, monitorName: '顶级节点', children: [] }; const data = { objId: 0, monitorName: '顶级节点', children: [] }
data.children = this.handleTree(response.data, "objId", "parentId"); data.children = this.handleTree(response.data, 'objId', 'parentId')
this.baseMonitorInfoOptions.push(data); this.baseMonitorInfoOptions.push(data)
}); })
}, },
/** 查询水实时数据列表 */ /** 查询水实时数据列表 */
getList() { getList() {
this.loading = true 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 => { listRecordWaterInstant(this.queryParams).then(response => {
this.recordWaterInstantList = response.rows this.recordWaterInstantList = response.rows
this.total = response.total this.total = response.total
@ -367,13 +359,12 @@ export default {
reset() { reset() {
this.form = { this.form = {
objId: null, objId: null,
monitorId: null, monitorName: null,
monitorType: 3,
collectTime: null, collectTime: null,
fluxFlow: null, fluxFlow: null,
waterFlow: null, waterFlow: null,
recordTime: null, recordTime: null,
collectType: null collectType: 1
} }
this.resetForm('form') this.resetForm('form')
}, },
@ -384,11 +375,7 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.queryParams.beginCollectTime = this.nowBeginTime this.queryParams.monitorCode = null
this.queryParams.endCollectTime = this.nowEndTime
this.queryParams.beginRecordTime = this.nowBeginTime
this.queryParams.endRecordTime = this.nowEndTime
this.queryParams.monitorId = null
this.resetForm('queryForm') this.resetForm('queryForm')
this.handleQuery() this.handleQuery()
}, },
@ -451,10 +438,11 @@ export default {
...this.queryParams ...this.queryParams
}, `recordWaterInstant_${new Date().getTime()}.xlsx`) }, `recordWaterInstant_${new Date().getTime()}.xlsx`)
}, },
/** 查询计量设备信息下拉树结构 */ /** 查询计量设备信息下拉树结构 */
getTreeselect() { getTreeselect() {
getMonitorInfoTree(this.form).then(response => { getMonitorInfoTree({ monitorType: 3 }).then(response => {
this.monitorInfoOptions = response.data; this.monitorInfoOptions = response.data
}) })
}, },
@ -464,7 +452,7 @@ export default {
delete node.children delete node.children
} }
return { return {
id: node.objId, id: node.monitorCode,
label: node.monitorName, label: node.monitorName,
children: node.children children: node.children
} }
@ -477,7 +465,7 @@ export default {
}, },
// 节点单击事件 // 节点单击事件
handleNodeClick(data) { handleNodeClick(data) {
this.queryParams.monitorId = data.id this.queryParams.monitorCode = data.code
this.handleQuery() this.handleQuery()
} }
} }

Write Preview
Loading…
Cancel
Save