change -完成物联网实时数据

boardTest
启龙 曹 10 months ago
parent 6219d8b7eb
commit f9f85b4f79

@ -2,16 +2,16 @@
<div class="app-container">
<el-row :gutter="28">
<el-col :span="5" :xs="24">
<div class="head-container">
<!-- <div class="head-container">
<el-input
v-model="workUnitName"
placeholder="请输入计量设备名称"
placeholder="请输入物联网设备名称"
clearable
size="small"
prefix-icon="el-icon-search"
style="margin-bottom: 20px"
/>
</div>
</div> -->
<div class="head-container">
<el-tree
:data="monitorInfoOptions"
@ -27,45 +27,100 @@
</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="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 :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="记录时间">
<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 label="采集时间" prop="collectTime">
<el-date-picker clearable
v-model="queryParams.collectTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择采集时间">
</el-date-picker>
</el-form-item>
<el-form-item label="温度" prop="tempreture">
<el-input
v-model="queryParams.tempreture"
placeholder="请输入温度"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="湿度" prop="humidity">
<el-input
v-model="queryParams.humidity"
placeholder="请输入湿度"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="照度" prop="illuminance">
<el-input
v-model="queryParams.illuminance"
placeholder="请输入照度"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="噪声" prop="noise">
<el-input
v-model="queryParams.noise"
placeholder="请输入噪声"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="硫化氢浓度" prop="concentration">
<el-input
v-model="queryParams.concentration"
placeholder="请输入硫化氢浓度"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="记录时间" prop="recodeTime">
<el-date-picker clearable
v-model="queryParams.recodeTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择记录时间">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label=" " prop="confirmPersonID">
<el-input
v-model="queryParams.confirmPersonID"
placeholder="请输入 "
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label=" " prop="confirmTime">
<el-date-picker clearable
v-model="queryParams.confirmTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择 ">
</el-date-picker>
</el-form-item>
<el-form-item label=" " prop="confirmFlag">
<el-input
v-model="queryParams.confirmFlag"
placeholder="请输入 "
clearable
@keyup.enter.native="handleQuery"
/>
</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
@ -74,9 +129,8 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['ems/record:recordSteamInstant:add']"
>新增
</el-button>
v-hasPermi="['ems/record:recordIOTInstant:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -86,9 +140,8 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['ems/record:recordSteamInstant:edit']"
>修改
</el-button>
v-hasPermi="['ems/record:recordIOTInstant:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -98,9 +151,8 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['ems/record:recordSteamInstant:remove']"
>删除
</el-button>
v-hasPermi="['ems/record:recordIOTInstant:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -109,60 +161,62 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['ems/record:recordSteamInstant:export']"
>导出
</el-button>
v-hasPermi="['ems/record:recordIOTInstant:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="recordSteamInstantList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="recordIOTInstantList" @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="objid" v-if="columns[0].visible"/>
<el-table-column label="计量设备编号" align="center" prop="monitorId" v-if="columns[1].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="steamFlow" v-if="columns[4].visible"/>
<el-table-column label="瞬时热量" align="center" prop="heatInstantValue" v-if="columns[5].visible"/>
<el-table-column label="累计热量" align="center" prop="heatTotalValue" v-if="columns[6].visible"/>
<el-table-column label="温度" align="center" prop="temperature" v-if="columns[7].visible"/>
<el-table-column label="压力" align="center" prop="press" v-if="columns[8].visible"/>
<el-table-column label="密度" align="center" prop="density" v-if="columns[9].visible"/>
<el-table-column label="压力差值" align="center" prop="differencePress" v-if="columns[10].visible"/>
<el-table-column label="记录时间" align="center" prop="recordTime" width="180" v-if="columns[11].visible">
<el-table-column label="温度" align="center" prop="tempreture" v-if="columns[3].visible"/>
<el-table-column label="湿度" align="center" prop="humidity" v-if="columns[4].visible"/>
<el-table-column label="照度" align="center" prop="illuminance" v-if="columns[5].visible"/>
<el-table-column label="噪声" align="center" prop="noise" v-if="columns[6].visible"/>
<el-table-column label="硫化氢浓度" align="center" prop="concentration" v-if="columns[7].visible"/>
<el-table-column label="记录时间" align="center" prop="recodeTime" width="180" v-if="columns[8].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
<span>{{ parseTime(scope.row.recodeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="报警类型" align="center" prop="alarmType" v-if="columns[9].visible"/>
<el-table-column label=" " align="center" prop="confirmPersonID" v-if="columns[10].visible"/>
<el-table-column label=" " align="center" prop="confirmTime" width="180" v-if="columns[11].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.confirmTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label=" " align="center" prop="confirmFlag" v-if="columns[12].visible"/>
<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/record:recordIOTInstant:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['ems/record:recordIOTInstant:remove']"
>删除</el-button>
</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/record:recordSteamInstant:edit']"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['ems/record:recordSteamInstant:remove']"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</el-col>
</el-row>
<pagination
v-show="total>0"
:total="total"
@ -171,56 +225,62 @@
@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">
<treeselect v-model="form.monitorCode" :options="baseMonitorInfoOptions" :normalizer="normalizer"
placeholder="请选择计量设备名称"
<el-form-item label="能源类型" prop="monitorType">
<treeselect v-model="form.monitorType" :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"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择采集时间"
>
placeholder="请选择采集时间">
</el-date-picker>
</el-form-item>
<el-form-item label="瞬时流量" prop="fluxFlow">
<el-input v-model="form.fluxFlow" placeholder="请输入瞬时流量"/>
<el-form-item label="温度" prop="tempreture">
<el-input v-model="form.tempreture" placeholder="请输入温度" />
</el-form-item>
<el-form-item label="累计流量" prop="steamFlow">
<el-input v-model="form.steamFlow" placeholder="请输入累计流量"/>
<el-form-item label="湿度" prop="humidity">
<el-input v-model="form.humidity" placeholder="请输入湿度" />
</el-form-item>
<el-form-item label="瞬时热量" prop="heatInstantValue">
<el-input v-model="form.heatInstantValue" placeholder="请输入瞬时热量"/>
<el-form-item label="照度" prop="illuminance">
<el-input v-model="form.illuminance" placeholder="请输入照度" />
</el-form-item>
<el-form-item label="累计热量" prop="heatTotalValue">
<el-input v-model="form.heatTotalValue" placeholder="请输入累计热量"/>
<el-form-item label="噪声" prop="noise">
<el-input v-model="form.noise" placeholder="请输入噪声" />
</el-form-item>
<el-form-item label="温度" prop="temperature">
<el-input v-model="form.temperature" placeholder="请输入温度"/>
<el-form-item label="硫化氢浓度" prop="concentration">
<el-input v-model="form.concentration" placeholder="请输入硫化氢浓度" />
</el-form-item>
<el-form-item label="压力" prop="press">
<el-input v-model="form.press" placeholder="请输入压力"/>
</el-form-item>
<el-form-item label="密度" prop="density">
<el-input v-model="form.density" placeholder="请输入密度"/>
</el-form-item>
<el-form-item label="压力差值" prop="differencePress">
<el-input v-model="form.differencePress" placeholder="请输入压力差值"/>
</el-form-item>
<el-form-item label="记录时间" prop="recordTime">
<el-form-item label="记录时间" prop="recodeTime">
<el-date-picker clearable
v-model="form.recordTime"
v-model="form.recodeTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择记录时间"
>
placeholder="请选择记录时间">
</el-date-picker>
</el-form-item>
<el-form-item label=" " prop="confirmPersonID">
<el-input v-model="form.confirmPersonID" placeholder="请输入 " />
</el-form-item>
<el-form-item label=" " prop="confirmTime">
<el-date-picker clearable
v-model="form.confirmTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择 ">
</el-date-picker>
</el-form-item>
<el-form-item label=" " prop="confirmFlag">
<el-input v-model="form.confirmFlag" placeholder="请输入 " />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
@ -232,19 +292,17 @@
<script>
import {
listRecordSteamInstant,
getRecordSteamInstant,
delRecordSteamInstant,
addRecordSteamInstant,
updateRecordSteamInstant
} from '@/api/ems/record/recordSteamInstant'
listRecordIOTInstant,
getRecordIOTInstant,
delRecordIOTInstant,
addRecordIOTInstant,
updateRecordIOTInstant }
from "@/api/ems/record/recordIOTInstant";
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: 'RecordSteamInstant',
name: "RecordIOTInstant",
components: {
Treeselect
},
@ -254,8 +312,7 @@ export default {
baseMonitorInfoOptions: [],
//List
monitorInfoOptions: [],
workUnitName: undefined,
//
//
baseMonitorInfoList: [],
monitorProps: {
children: 'children',
@ -273,64 +330,58 @@ export default {
showSearch: true,
//
total: 0,
//
recordSteamInstantList: [],
//
recordIOTInstantList: [],
//
title: '',
title: "",
//
open: false,
//
daterangeCollectTime: [],
//
daterangeRecordTime: [],
//
queryParams: {
pageNum: 1,
pageSize: 10,
monitorCode: null,
monitorId: null,
collectTime: null,
fluxFlow: null,
steamFlow: null,
heatInstantValue: null,
heatTotalValue: null,
temperature: null,
press: null,
density: null,
differencePress: null,
recordTime: null
tempreture: null,
humidity: null,
illuminance: null,
noise: null,
concentration: null,
recodeTime: null,
alarmType: null,
confirmPersonID: null,
confirmTime: null,
confirmFlag: null
},
//
form: {},
//
rules: {
objId: [
{ required: true, message: '自增标识不能为空', trigger: 'blur' }
]
objid: [
{ required: true, message: "主键标识不能为空", trigger: "blur" }
],
},
columns: [
{ key: 0, label: `自增标识`, visible: false },
{ key: 0, label: `主键标识`, visible: true },
{ key: 1, label: `计量设备编号`, visible: true },
{ key: 2, label: `采集时间`, visible: true },
{ key: 3, label: `瞬时流量`, visible: true },
{ key: 4, label: `累计流量`, visible: true },
{ key: 5, label: `瞬时热量`, visible: true },
{ key: 6, label: `累计热量`, visible: true },
{ key: 7, label: `温度`, visible: false },
{ key: 8, label: `压力`, visible: false },
{ key: 9, label: `密度`, visible: false },
{ key: 10, label: `压力差值`, visible: false },
{ key: 11, label: `记录时间`, visible: true },
{ key: 12, label: `计量设备名称`, visible: true }
{ key: 3, label: `温度`, visible: true },
{ key: 4, label: `湿度`, visible: true },
{ key: 5, label: `照度`, visible: true },
{ key: 6, label: `噪声`, visible: true },
{ key: 7, label: `硫化氢浓度`, visible: true },
{ key: 8, label: `记录时间`, visible: true },
{ key: 9, label: `报警类型`, visible: true },
{ key: 10, label: ` `, visible: true },
{ key: 11, label: ` `, visible: true },
{ key: 12, label: ` `, visible: true },
]
}
};
},
created() {
const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
this.daterangeCollectTime[0] = nowDate + ' 00:00:00'
this.daterangeCollectTime[1] = nowDate + ' 23:59:59'
this.getList();
this.getTreeselect()
this.getTreeMonitorInfo()
this.getList()
},
watch: {
//
@ -345,152 +396,137 @@ export default {
delete node.children
}
return {
id: node.monitorCode,
id: node.monitorId,
label: node.monitorName,
children: node.children
}
},
/** 查询计量设备信息下拉树结构 新增用*/
getTreeMonitorInfo() {
listBaseMonitorInfo({ monitorType: 2 }).then(response => {
listBaseMonitorInfo({ monitorTypeList: [5,6,7,8,9] }).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]
}
listRecordSteamInstant(this.queryParams).then(response => {
this.recordSteamInstantList = response.rows
this.total = response.total
this.loading = false
})
this.loading = true;
listRecordIOTInstant(this.queryParams).then(response => {
this.recordIOTInstantList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false
this.reset()
this.open = false;
this.reset();
},
//
reset() {
this.form = {
objId: null,
monitorCode: null,
objid: null,
monitorId: null,
collectTime: null,
fluxFlow: null,
steamFlow: null,
heatInstantValue: null,
heatTotalValue: null,
temperature: null,
press: null,
density: null,
differencePress: null,
recordTime: null
}
this.resetForm('form')
tempreture: null,
humidity: null,
illuminance: null,
noise: null,
concentration: null,
recodeTime: null,
alarmType: null,
confirmPersonID: null,
confirmTime: null,
confirmFlag: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.daterangeCollectTime = []
this.daterangeRecordTime = []
this.resetForm('queryForm')
this.handleQuery()
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: 4 }).then(response => {
getMonitorInfoTree({ monitorTypeList: [5,6,7,8,9]}).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.queryParams.monitorId = data.code
this.handleQuery()
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.objid)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.open = true
this.title = '添加蒸汽实时数据'
this.reset();
this.open = true;
this.title = "添加物联网实时数据";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const objId = row.objId || this.ids
getRecordSteamInstant(objId).then(response => {
this.form = response.data
this.open = true
this.title = '修改蒸汽实时数据'
})
this.reset();
const objid = row.objid || this.ids
getRecordIOTInstant(objid).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改物联网实时数据";
});
},
/** 提交按钮 */
submitForm() {
this.$refs['form'].validate(valid => {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.objId != null) {
updateRecordSteamInstant(this.form).then(response => {
this.$modal.msgSuccess('修改成功')
this.open = false
this.getList()
})
if (this.form.objid != null) {
updateRecordIOTInstant(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addRecordSteamInstant(this.form).then(response => {
this.$modal.msgSuccess('新增成功')
this.open = false
this.getList()
})
addRecordIOTInstant(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 delRecordSteamInstant(objIds)
const objids = row.objid || this.ids;
this.$modal.confirm('是否确认删除物联网实时数据编号为"' + objids + '"的数据项?').then(function() {
return delRecordIOTInstant(objids);
}).then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
}).catch(() => {
})
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('ems/record/recordSteamInstant/export', {
this.download('ems/record/recordIOTInstant/export', {
...this.queryParams
}, `recordSteamInstant_${new Date().getTime()}.xlsx`)
}
}, `recordIOTInstant_${new Date().getTime()}.xlsx`)
}
}
};
</script>

Loading…
Cancel
Save