zangch
/
JDAirPort.Ems.UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(ems): 重构物联网数据查询功能

Browse Source 
- 移除了不必要的控制台日志输出
- 新增了 getRecordIotenvInstantList API 用于查询物联网数据列表
- 优化了左侧树结构的渲染逻辑
-调整了日期范围选择器的使用方式
- 重构了查询参数的处理逻辑
boardTest
zch 9 months ago
parent 93f6c6d1a3
commit 945e88df34
6 changed files with 1568 additions and 1040 deletions
Show Stats Download Patch File Download Diff File

9
src/api/ems/record/recordIotenvInstant.js
Unescape Escape View File

@ -42,3 +42,12 @@ export function delRecordIotenvInstant(objid) {
method: 'delete'
})
}
// 查询物联网数据列表
export function getRecordIotenvInstantList(query) {
return request({
url: '/ems/record/recordIotenvInstant/getRecordIotenvInstantList',
method: 'get',
params: query
})
}

442
src/views/ems/record/recordIOTInstant/index.vue
Unescape Escape View File

@ -28,28 +28,17 @@
</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-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="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="温度" prop="tempreture">
</el-form-item>
<el-form-item label="温度" prop="temperature">
<el-input
v-model="queryParams.tempreture"
v-model="queryParams.temperature"
placeholder="请输入温度"
clearable
@keyup.enter.native="handleQuery"
@ -86,7 +75,55 @@
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
</el-form-item>
<el-form-item label="振动-速度(mm/s)" prop="vibrationSpeed">
<el-input
v-model="queryParams.vibrationSpeed"
placeholder="请输入振动-速度(mm/s)"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="振动-位移(um)" prop="vibrationDisplacement">
<el-input
v-model="queryParams.vibrationDisplacement"
placeholder="请输入振动-位移(um)"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="振动-加速度(g)" prop="vibrationAcceleration">
<el-input
v-model="queryParams.vibrationAcceleration"
placeholder="请输入振动-加速度(g)"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="振动-温度(℃)" prop="vibrationTemp">
<el-input
v-model="queryParams.vibrationTemp"
placeholder="请输入振动-温度(℃)"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<!-- <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="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="记录时间">
<el-date-picker
v-model="daterangeRecordTime"
@ -98,35 +135,12 @@
end-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
@ -135,7 +149,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['ems/record:recordIOTInstant:add']"
v-hasPermi="['ems/record:recordIotenvInstant:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
@ -146,7 +160,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['ems/record:recordIOTInstant:edit']"
v-hasPermi="['ems/record:recordIotenvInstant:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
@ -157,7 +171,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['ems/record:recordIOTInstant:remove']"
v-hasPermi="['ems/record:recordIotenvInstant:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
@ -167,40 +181,52 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['ems/record:recordIOTInstant:export']"
v-hasPermi="['ems/record:recordIotenvInstant:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="recordIOTInstantList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="recordIotenvInstantList" @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="monitorId" v-if="columns[1].visible"/>
<el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[2].visible"/>
<el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[3].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
<!-- <el-table-column label="主键标识" align="center" prop="objid" v-if="columns[0].visible"/>-->
<el-table-column label="序号" type="index" width="55" align="center" v-if="columns[0].visible" />
<el-table-column label="计量设备编号" align="center" prop="monitorId" v-if="columns[1].visible">
</el-table-column>
<el-table-column label="温度" align="center" prop="tempreture" v-if="columns[4].visible"/>
<el-table-column label="湿度" align="center" prop="humidity" v-if="columns[5].visible"/>
<el-table-column label="照度" align="center" prop="illuminance" v-if="columns[6].visible"/>
<el-table-column label="噪声" align="center" prop="noise" v-if="columns[7].visible"/>
<el-table-column label="硫化氢浓度" align="center" prop="concentration" v-if="columns[8].visible"/>
<el-table-column label="记录时间" align="center" prop="recodeTime" width="180" v-if="columns[9].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.recodeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
<el-table-column label="温度" align="center" prop="temperature" v-if="columns[2].visible">
</el-table-column>
<el-table-column label="报警类型" align="center" prop="alarmType" v-if="columns[10].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 label="湿度" align="center" prop="humidity" v-if="columns[3].visible">
</el-table-column>
<el-table-column label="照度" align="center" prop="illuminance" v-if="columns[4].visible">
</el-table-column>
<el-table-column label="噪声" align="center" prop="noise" v-if="columns[5].visible">
</el-table-column>
<el-table-column label="硫化氢浓度" align="center" prop="concentration" v-if="columns[6].visible">
</el-table-column>
<el-table-column label="振动-速度(mm/s)" align="center" prop="vibrationSpeed" v-if="columns[7].visible">
</el-table-column>
<el-table-column label="振动-位移(um)" align="center" prop="vibrationDisplacement" v-if="columns[8].visible">
</el-table-column>
<el-table-column label="振动-加速度(g)" align="center" prop="vibrationAcceleration" v-if="columns[9].visible">
</el-table-column>
<el-table-column label="振动-温度(℃)" align="center" prop="vibrationTemp" v-if="columns[10].visible">
</el-table-column>
<el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[11].visible">
</el-table-column>
<el-table-column label="记录时间" align="center" prop="recodeTime" width="180" v-if="columns[12].visible">
</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
@ -208,22 +234,22 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['ems/record:recordIOTInstant:edit']"
v-hasPermi="['ems/record:recordIotenvInstant:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['ems/record:recordIOTInstant:remove']"
v-hasPermi="['ems/record:recordIotenvInstant:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
<pagination
v-show="total>0"
:total="total"
@ -232,30 +258,14 @@
@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="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="monitorName">
<el-input v-model="form.monitorName" 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="请选择采集时间">
</el-date-picker>
</el-form-item>
<el-form-item label="温度" prop="tempreture">
<el-input v-model="form.tempreture" placeholder="请输入温度" />
<el-form-item label="温度" prop="temperature">
<el-input v-model="form.temperature" placeholder="请输入温度" />
</el-form-item>
<el-form-item label="湿度" prop="humidity">
<el-input v-model="form.humidity" placeholder="请输入湿度" />
@ -269,6 +279,26 @@
<el-form-item label="硫化氢浓度" prop="concentration">
<el-input v-model="form.concentration" placeholder="请输入硫化氢浓度" />
</el-form-item>
<el-form-item label="振动-速度(mm/s)" prop="vibrationSpeed">
<el-input v-model="form.vibrationSpeed" placeholder="请输入振动-速度(mm/s)" />
</el-form-item>
<el-form-item label="振动-位移(um)" prop="vibrationDisplacement">
<el-input v-model="form.vibrationDisplacement" placeholder="请输入振动-位移(um)" />
</el-form-item>
<el-form-item label="振动-加速度(g)" prop="vibrationAcceleration">
<el-input v-model="form.vibrationAcceleration" placeholder="请输入振动-加速度(g)" />
</el-form-item>
<el-form-item label="振动-温度(℃)" prop="vibrationTemp">
<el-input v-model="form.vibrationTemp" 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="请选择采集时间">
</el-date-picker>
</el-form-item>
<el-form-item label="记录时间" prop="recodeTime">
<el-date-picker clearable
v-model="form.recodeTime"
@ -277,20 +307,6 @@
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>
@ -301,23 +317,15 @@
</template>
<script>
import {
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'
export default {
name: "RecordIOTInstant",
components: {
Treeselect
},
import { listRecordIotenvInstant, getRecordIotenvInstant, delRecordIotenvInstant, addRecordIotenvInstant, updateRecordIotenvInstant } from "@/api/ems/record/recordIotenvInstant";
import {parseTime} from "@/utils/ruoyi";
import {getMonitorInfoTree, listBaseMonitorInfo} from "@/api/ems/base/baseMonitorInfo";
export default {
name: "RecordIotenvInstant",
data() {
return {
workUnitName:null,
//下拉树List
baseMonitorInfoOptions: [],
@ -329,10 +337,10 @@
children: 'children',
label: 'label'
},
// 记录时间时间范围
daterangeCollectTime: [],
// 记录时间时间范围
daterangeRecordTime: [],
// 遮罩层
loading: true,
// 选中数组
@ -345,8 +353,8 @@
showSearch: true,
// 总条数
total: 0,
// 物联网实时数据表格数据
recordIOTInstantList: [],
// 物联网数据表格数据
recordIotenvInstantList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
@ -357,60 +365,66 @@
pageNum: 1,
pageSize: 10,
monitorId: null,
monitorName: null,
collectTime: null,
tempreture: null,
temperature: null,
humidity: null,
illuminance: null,
noise: null,
concentration: null,
vibrationSpeed: null,
vibrationDisplacement: null,
vibrationAcceleration: null,
vibrationTemp: null,
collectTime: null,
recodeTime: null,
alarmType: null,
confirmPersonID: null,
confirmTime: null,
confirmFlag: null
monitorIds: [],
},
// 表单参数
form: {},
// 表单校验
rules: {
objid: [
{ required: true, message: "主键标识不能为空", trigger: "blur" }
],
},
columns: [
{ key: 0, label: `主键标识`, visible: true },
{ 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: true },
{ key: 8, label: `硫化氢浓度`, visible: true },
{ key: 9, label: `记录时间`, visible: true },
{ key: 10, 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: `振动-速度(mm/s)`, visible: false },
{ key: 8, label: `振动-位移(um)`, visible: false },
{ key: 9, label: `振动-加速度(g)`, visible: false },
{ key: 10, label: `振动-温度(℃)`, visible: false },
{ key: 11, label: `采集时间`, visible: false },
{ key: 12, label: `记录时间`, visible: true },
]
};
},
created() {
// const nowDate = this.parseTime(new Date(), '{y}-{m}-{d}')
// this.daterangeCollectTime[0] = nowDate + ' 00:00:00'
// this.daterangeCollectTime[1] = nowDate + ' 23:59:59'
const nowDate = new Date();
const today = parseTime(new Date(), '{y}-{m}-{d}')
const lastDate = new Date();
lastDate.setDate(nowDate.getDate() - 1)
const yesterday = parseTime(lastDate, '{y}-{m}-{d}')
this.daterangeRecordTime[0] = yesterday+ ' 08:00:00'
this.daterangeRecordTime[1] = today + ' 08:00:00'
// this.daterangeRecordTime[0] = nowDate + ' 00:00:00'
// this.daterangeRecordTime[1] = nowDate + ' 23:59:59'
this.getList();
this.getTreeselect()
this.getTreeMonitorInfo()
this.getTreeselect()
this.getList();
},
watch: {
// 根据名称筛选计量设备树
workUnitName(val) {
this.$refs.tree.filter(val)
}
},
methods: {
/** 转换计量设备信息数据结构 */
normalizer(node) {
if (node.children && !node.children.length) {
@ -431,9 +445,42 @@
this.baseMonitorInfoOptions.push(data)
})
},
/** 查询物联网实时数据列表 */
// 递归获取树中所有节点的monitorId
getAllMonitorIds(nodes) {
let ids = [];
if (!nodes || nodes.length === 0) return ids;
nodes.forEach(node => {
if (node.id) {
ids.push(node.id);
}
if (node.children && node.children.length > 0) {
ids = ids.concat(this.getAllMonitorIds(node.children));
}
});
console.log(ids)
return ids;
},
// 筛选节点
filterNode(value, data) {
if (!value) return true
return data.label.indexOf(value) !== -1
},
// 节点单击事件
handleNodeClick(data) {
// 点击节点时清空monitorIds，只使用选中的monitorId
this.queryParams.monitorIds = [];
this.queryParams.monitorId = data.code
this.handleQuery()
},
/** 查询物联网数据列表 */
getList() {
this.loading = true;
if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) {
this.queryParams.params['beginCollectTime'] = this.daterangeCollectTime[0]
this.queryParams.params['endCollectTime'] = this.daterangeCollectTime[1]
@ -442,8 +489,15 @@
this.queryParams.params['beginRecordTime'] = this.daterangeRecordTime[0]
this.queryParams.params['endRecordTime'] = this.daterangeRecordTime[1]
}
listRecordIOTInstant(this.queryParams).then(response => {
this.recordIOTInstantList = response.rows;
// 如果没有选中节点，则获取所有设备ID
if (!this.queryParams.monitorId) {
this.queryParams.monitorIds = this.getAllMonitorIds(this.monitorInfoOptions);
}
listRecordIotenvInstant(this.queryParams).then(response => {
this.recordIotenvInstantList = response.rows;
this.total = response.total;
this.loading = false;
});
@ -458,66 +512,33 @@
this.form = {
objid: null,
monitorId: null,
monitorName: null,
collectTime: null,
tempreture: null,
temperature: null,
humidity: null,
illuminance: null,
noise: null,
concentration: null,
recodeTime: null,
alarmType: null,
confirmPersonID: null,
confirmTime: null,
confirmFlag: null
vibrationSpeed: null,
vibrationDisplacement: null,
vibrationAcceleration: null,
vibrationTemp: null,
collectTime: null,
recodeTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
console.log('查询参数:', this.daterangeRecordTime);
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.daterangeCollectTime = [];
this.daterangeRecordTime = [];
this.queryParams = {
params:{},
pageNum: 1,
pageSize: 10,
monitorId: null,
monitorName: null,
collectTime: null,
tempreture: null,
humidity: null,
illuminance: null,
noise: null,
concentration: null,
recodeTime: null,
alarmType: null,
confirmPersonID: null,
confirmTime: null,
confirmFlag: null
},
this.handleQuery();
},
/** 查询计量设备信息下拉树结构 */
getTreeselect() {
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.monitorId = data.code
this.handleQuery()
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.objid)
@ -528,16 +549,16 @@
handleAdd() {
this.reset();
this.open = true;
this.title = "添加物联网实时数据";
this.title = "添加物联网数据";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const objid = row.objid || this.ids
getRecordIOTInstant(objid).then(response => {
getRecordIotenvInstant(objid).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改物联网实时数据";
this.title = "修改物联网数据";
});
},
/** 提交按钮 */
@ -545,13 +566,13 @@
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.objid != null) {
updateRecordIOTInstant(this.form).then(response => {
updateRecordIotenvInstant(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addRecordIOTInstant(this.form).then(response => {
addRecordIotenvInstant(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
@ -563,8 +584,8 @@
/** 删除按钮操作 */
handleDelete(row) {
const objids = row.objid || this.ids;
this.$modal.confirm('是否确认删除物联网实时数据编号为"' + objids + '"的数据项？').then(function() {
return delRecordIOTInstant(objids);
this.$modal.confirm('是否确认删除物联网数据编号为"' + objids + '"的数据项？').then(function() {
return delRecordIotenvInstant(objids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
@ -572,10 +593,17 @@
},
/** 导出按钮操作 */
handleExport() {
this.download('ems/record/recordIOTInstant/export', {
this.download('ems/record/recordIotenvInstant/export', {
...this.queryParams
}, `recordIOTInstant_${new Date().getTime()}.xlsx`)
}, `recordIotenvInstant_${new Date().getTime()}.xlsx`)
},
getTreeselect() {
getMonitorInfoTree({ monitorTypeList: [5,6,7,8,9]}).then(response => {
this.monitorInfoOptions = response.data
})
},
}
}
};
};
</script>

1
src/views/ems/record/recordIotenvInstant/index.vue
Unescape Escape View File

@ -495,7 +495,6 @@
if (!this.queryParams.monitorId) {
this.queryParams.monitorIds = this.getAllMonitorIds(this.monitorInfoOptions);
}
console.log(this.queryParams.monitorIds)
listRecordIotenvInstant(this.queryParams).then(response => {
this.recordIotenvInstantList = response.rows;

568
src/views/ems/record/recordVibrationInstant/index.vue
Unescape Escape View File

@ -1,12 +1,11 @@
<template>
<div class="app-container">
<el-row :gutter="28">
<el-col :span="3" :xs="24">
<el-col :span="5" :xs="24">
<div class="head-container">
<el-input
v-model="workUnitName"
placeholder="请输入计量设备名称"
placeholder="请输入物联网设备名称"
clearable
size="small"
prefix-icon="el-icon-search"
@ -27,92 +26,114 @@
/>
</div>
</el-col>
<el-col :span="21" :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-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="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="振动传感器编号" prop="sensorId">
<!-- <el-form-item label="计量设备编号" prop="monitorId">
<el-input
v-model="queryParams.sensorId"
placeholder="请输入振动传感器编号"
v-model="queryParams.monitorId"
placeholder="请输入计量设备编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<!-- <el-form-item label="速度(mm/s)" prop="speed">
<el-input
v-model="queryParams.speed"
placeholder="请输入速度(mm/s)"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<!-- <el-form-item label="位移(um)" prop="displacement">
<el-input
v-model="queryParams.displacement"
placeholder="请输入位移(um)"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<!-- <el-form-item label="加速度(g)" prop="acceleration">
<el-input
v-model="queryParams.acceleration"
placeholder="请输入加速度(g)"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<!-- <el-form-item label="温度(℃)" prop="temperature">
</el-form-item>
<el-form-item label="温度" prop="temperature">
<el-input
v-model="queryParams.temperature"
placeholder="请输入温度(℃)"
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="振动-速度(mm/s)" prop="vibrationSpeed">
<el-input
v-model="queryParams.vibrationSpeed"
placeholder="请输入振动-速度(mm/s)"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="振动-位移(um)" prop="vibrationDisplacement">
<el-input
v-model="queryParams.vibrationDisplacement"
placeholder="请输入振动-位移(um)"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="振动-加速度(g)" prop="vibrationAcceleration">
<el-input
v-model="queryParams.vibrationAcceleration"
placeholder="请输入振动-加速度(g)"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="振动-温度(℃)" prop="vibrationTemp">
<el-input
v-model="queryParams.vibrationTemp"
placeholder="请输入振动-温度(℃)"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<!-- <el-form-item label="记录时间">
<el-date-picker
v-model="daterangeRecodeTime"
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="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="记录时间">
<el-date-picker
v-model="daterangeRecodeTime"
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>
end-placeholder="结束时间"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@ -128,7 +149,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['ems/record:recordVibrationInstant:add']"
v-hasPermi="['ems/record:recordIotenvInstant:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
@ -139,7 +160,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['ems/record:recordVibrationInstant:edit']"
v-hasPermi="['ems/record:recordIotenvInstant:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
@ -150,7 +171,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['ems/record:recordVibrationInstant:remove']"
v-hasPermi="['ems/record:recordIotenvInstant:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
@ -160,46 +181,67 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['ems/record:recordVibrationInstant:export']"
v-hasPermi="['ems/record:recordIotenvInstant:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="recordVibrationInstantList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="recordIotenvInstantList" @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="collectTime" width="180" v-if="columns[1].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
<!-- <el-table-column label="主键标识" align="center" prop="objid" v-if="columns[0].visible"/>-->
<el-table-column label="序号" type="index" width="55" align="center" v-if="columns[0].visible" />
<el-table-column label="计量设备编号" align="center" prop="monitorId" v-if="columns[1].visible">
</el-table-column>
<el-table-column label="振动传感器编号" align="center" prop="sensorId" v-if="columns[2].visible"/>
<el-table-column label="振动传感器名称" align="center" prop="monitorName" v-if="columns[3].visible"/>
<el-table-column label="速度(mm/s)" align="center" prop="speed" v-if="columns[4].visible"/>
<el-table-column label="位移(um)" align="center" prop="displacement" v-if="columns[5].visible"/>
<el-table-column label="加速度(g)" align="center" prop="acceleration" 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="recodeTime" width="180" v-if="columns[8].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.recodeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
<el-table-column label="温度" align="center" prop="temperature" v-if="columns[2].visible">
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" v-if="columns[9].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="133">
<el-table-column label="湿度" align="center" prop="humidity" v-if="columns[3].visible">
</el-table-column>
<el-table-column label="照度" align="center" prop="illuminance" v-if="columns[4].visible">
</el-table-column>
<el-table-column label="噪声" align="center" prop="noise" v-if="columns[5].visible">
</el-table-column>
<el-table-column label="硫化氢浓度" align="center" prop="concentration" v-if="columns[6].visible">
</el-table-column>
<el-table-column label="振动-速度(mm/s)" align="center" prop="vibrationSpeed" v-if="columns[7].visible">
</el-table-column>
<el-table-column label="振动-位移(um)" align="center" prop="vibrationDisplacement" v-if="columns[8].visible">
</el-table-column>
<el-table-column label="振动-加速度(g)" align="center" prop="vibrationAcceleration" v-if="columns[9].visible">
</el-table-column>
<el-table-column label="振动-温度(℃)" align="center" prop="vibrationTemp" v-if="columns[10].visible">
</el-table-column>
<el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[11].visible">
</el-table-column>
<el-table-column label="记录时间" align="center" prop="recodeTime" width="180" v-if="columns[12].visible">
</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:recordVibrationInstant:edit']"
v-hasPermi="['ems/record:recordIotenvInstant:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['ems/record:recordVibrationInstant:remove']"
v-hasPermi="['ems/record:recordIotenvInstant:remove']"
>删除</el-button>
</template>
</el-table-column>
@ -208,8 +250,6 @@
</el-col>
</el-row>
<pagination
v-show="total>0"
:total="total"
@ -218,59 +258,54 @@
@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="collectTime">
<el-date-picker clearable
v-model="form.collectTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择采集时间">
</el-date-picker>
</el-form-item>-->
<el-form-item label="计量设备编号" prop="monitorId">
<el-input v-model="form.monitorId" placeholder="请输入计量设备编号" />
</el-form-item>
<el-form-item label="温度" prop="temperature">
<el-input v-model="form.temperature" placeholder="请输入温度" />
</el-form-item>
<el-form-item label="湿度" prop="humidity">
<el-input v-model="form.humidity" placeholder="请输入湿度" />
</el-form-item>
<el-form-item label="照度" prop="illuminance">
<el-input v-model="form.illuminance" placeholder="请输入照度" />
</el-form-item>
<el-form-item label="噪声" prop="noise">
<el-input v-model="form.noise" placeholder="请输入噪声" />
</el-form-item>
<el-form-item label="硫化氢浓度" prop="concentration">
<el-input v-model="form.concentration" placeholder="请输入硫化氢浓度" />
</el-form-item>
<el-form-item label="振动-速度(mm/s)" prop="vibrationSpeed">
<el-input v-model="form.vibrationSpeed" placeholder="请输入振动-速度(mm/s)" />
</el-form-item>
<el-form-item label="振动-位移(um)" prop="vibrationDisplacement">
<el-input v-model="form.vibrationDisplacement" placeholder="请输入振动-位移(um)" />
</el-form-item>
<el-form-item label="振动-加速度(g)" prop="vibrationAcceleration">
<el-input v-model="form.vibrationAcceleration" placeholder="请输入振动-加速度(g)" />
</el-form-item>
<el-form-item label="振动-温度(℃)" prop="vibrationTemp">
<el-input v-model="form.vibrationTemp" placeholder="请输入振动-温度(℃)" />
</el-form-item>
<el-form-item label="采集时间" prop="collectTime">
<el-date-picker
<el-date-picker clearable
v-model="form.collectTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择采集时间">
</el-date-picker>
</el-form-item>
<el-form-item label="振动传感器编号" prop="sensorId">
<el-input v-model="form.sensorId" placeholder="请输入振动传感器编号" />
</el-form-item>
<el-form-item label="速度(mm/s)" prop="speed">
<el-input v-model="form.speed" placeholder="请输入速度(mm/s)" />
</el-form-item>
<el-form-item label="位移(um)" prop="displacement">
<el-input v-model="form.displacement" placeholder="请输入位移(um)" />
</el-form-item>
<el-form-item label="加速度(g)" prop="acceleration">
<el-input v-model="form.acceleration" placeholder="请输入加速度(g)" />
</el-form-item>
<el-form-item label="温度(℃)" prop="temperature">
<el-input v-model="form.temperature" placeholder="请输入温度(℃)" />
</el-form-item>
<!-- <el-form-item label="记录时间" prop="recodeTime">
<el-form-item label="记录时间" prop="recodeTime">
<el-date-picker clearable
v-model="form.recodeTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd"
placeholder="请选择记录时间">
</el-date-picker>
</el-form-item>-->
<el-form-item label="记录时间" prop="recodeTime">
<el-date-picker
v-model="form.recodeTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择记录时间">
</el-date-picker>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -282,24 +317,30 @@
</template>
<script>
import {
listRecordVibrationInstant,
getRecordVibrationInstant,
delRecordVibrationInstant,
addRecordVibrationInstant,
updateRecordVibrationInstant,
vibrationInstantList
} from "@/api/ems/record/recordVibrationInstant";
import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import { listRecordIotenvInstant, getRecordIotenvInstant, delRecordIotenvInstant, addRecordIotenvInstant, updateRecordIotenvInstant } from "@/api/ems/record/recordIotenvInstant";
import {parseTime} from "@/utils/ruoyi";
import {getMonitorInfoTree, listBaseMonitorInfo} from "@/api/ems/base/baseMonitorInfo";
export default {
name: "RecordVibrationInstant",
name: "RecordIotenvInstant",
data() {
return {
workUnitName: undefined,
workUnitName:null,
//下拉树List
baseMonitorInfoOptions: [],
//左侧树结构List
monitorInfoOptions: [],
//能原类型信息
baseMonitorInfoList: [],
monitorProps: {
children: 'children',
label: 'label'
},
// 记录时间时间范围
daterangeRecordTime: [],
// 遮罩层
loading: true,
// 选中数组
@ -312,70 +353,67 @@ export default {
showSearch: true,
// 总条数
total: 0,
// 振动实时数据表格数据
recordVibrationInstantList: [],
// 物联网数据表格数据
recordIotenvInstantList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 备注时间范围
daterangeCollectTime: [],
// 备注时间范围
daterangeRecodeTime: [],
// 查询参数
queryParams: {
params:{},
pageNum: 1,
pageSize: 10,
collectTime: null,
sensorId: null,
speed: null,
displacement: null,
acceleration: null,
monitorId: null,
temperature: null,
humidity: null,
illuminance: null,
noise: null,
concentration: null,
vibrationSpeed: null,
vibrationDisplacement: null,
vibrationAcceleration: null,
vibrationTemp: null,
collectTime: null,
recodeTime: null,
monitorName: null,
remark: null
monitorIds: [],
},
// 表单参数
form: {},
monitorProps: {
children: 'children',
label: 'label'
},
// 表单校验
rules: {
sensorId: [
{required: true, message: "振动传感器编号不能为空", trigger: "blur"}
],
recodeTime: [
{required: true, message: "记录时间不能为空", trigger: "blur"}
],
collectTime: [
{required: true, message: "采集时间不能为空", trigger: "blur"}
],
},
columns: [
{ key: 0, label: `主键标识`, visible: true },
{ key: 1, label: `采集时间`, visible: true },
{ key: 2, label: `振动传感器编号`, visible: true },
{ key: 3, label: `振动传感器名称`, visible: true },
{ key: 4, label: `速度(mm/s)`, visible: true },
{ key: 5, label: `位移(um)`, visible: true },
{ key: 6, label: `加速度(g)`, visible: true },
{ key: 7, label: `温度(℃)`, visible: true },
{ key: 8, label: `记录时间`, visible: true },
{ key: 9, label: `备注`, visible: true },
{ 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: `振动-速度(mm/s)`, visible: true },
{ key: 8, label: `振动-位移(um)`, visible: true },
{ key: 9, label: `振动-加速度(g)`, visible: true },
{ key: 10, label: `振动-温度(℃)`, visible: true },
{ key: 11, label: `采集时间`, visible: false },
{ key: 12, label: `记录时间`, visible: true },
]
};
},
created() {
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()
const nowDate = new Date();
const today = parseTime(new Date(), '{y}-{m}-{d}')
const lastDate = new Date();
lastDate.setDate(nowDate.getDate() - 1)
const yesterday = parseTime(lastDate, '{y}-{m}-{d}')
this.daterangeRecordTime[0] = yesterday+ ' 08:00:00'
this.daterangeRecordTime[1] = today + ' 08:00:00'
this.getTreeMonitorInfo()
this.getList()
this.getTreeselect()
this.getList();
},
watch: {
@ -387,7 +425,26 @@ export default {
methods: {
/** 转换计量设备信息数据结构 */
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children
}
return {
id: node.monitorId,
label: node.monitorName,
children: node.children
}
},
/** 查询计量设备信息下拉树结构 新增用*/
// getTreeMonitorInfo() {
// 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)
// })
// },
getTreeMonitorInfo() {
listBaseMonitorInfo({ monitorType: 10 }).then(response => {
this.baseMonitorInfoOptions = []
@ -395,26 +452,60 @@ export default {
data.children = this.handleTree(response.data, 'objId', 'parentId')
this.baseMonitorInfoOptions.push(data)
})
},
// 递归获取树中所有节点的monitorId
getAllMonitorIds(nodes) {
let ids = [];
if (!nodes || nodes.length === 0) return ids;
nodes.forEach(node => {
if (node.id) {
ids.push(node.id);
}
if (node.children && node.children.length > 0) {
ids = ids.concat(this.getAllMonitorIds(node.children));
}
});
console.log(ids)
return ids;
},
/** 查询振动实时数据列表 */
// 筛选节点
filterNode(value, data) {
if (!value) return true
return data.label.indexOf(value) !== -1
},
// 节点单击事件
handleNodeClick(data) {
// 点击节点时清空monitorIds，只使用选中的monitorId
this.queryParams.monitorIds = [];
this.queryParams.monitorId = data.code
this.handleQuery()
},
/** 查询物联网数据列表 */
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];
this.queryParams.params['beginCollectTime'] = this.daterangeCollectTime[0]
this.queryParams.params['endCollectTime'] = this.daterangeCollectTime[1]
}
if (null != this.daterangeRecodeTime && '' != this.daterangeRecodeTime) {
this.queryParams.params["beginRecodeTime"] = this.daterangeRecodeTime[0];
this.queryParams.params["endRecodeTime"] = this.daterangeRecodeTime[1];
if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) {
this.queryParams.params['beginRecordTime'] = this.daterangeRecordTime[0]
this.queryParams.params['endRecordTime'] = this.daterangeRecordTime[1]
}
// 将monitorCode改为sensorId
if (this.queryParams.sensorId !== null) {
this.queryParams.params['sensorId'] = this.queryParams.sensorId;
// 如果没有选中节点，则获取所有设备ID
if (!this.queryParams.monitorId) {
this.queryParams.monitorIds = this.getAllMonitorIds(this.monitorInfoOptions);
}
listRecordVibrationInstant(this.queryParams).then(response => {
this.recordVibrationInstantList = response.rows;
listRecordIotenvInstant(this.queryParams).then(response => {
this.recordIotenvInstantList = response.rows;
this.total = response.total;
this.loading = false;
});
@ -427,32 +518,38 @@ export default {
// 表单重置
reset() {
this.form = {
objId: null,
collectTime: null,
sensorId: null,
speed: null,
displacement: null,
acceleration: null,
objid: null,
monitorId: null,
temperature: null,
recodeTime: null,
humidity: null,
illuminance: null,
noise: null,
concentration: null,
vibrationSpeed: null,
vibrationDisplacement: null,
vibrationAcceleration: null,
vibrationTemp: null,
collectTime: null,
recodeTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
console.log('查询参数:', this.daterangeRecordTime);
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.daterangeCollectTime = [];
this.daterangeRecodeTime = [];
this.resetForm("queryForm");
this.daterangeCollectTime = [];
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.objId)
this.ids = selection.map(item => item.objid)
this.single = selection.length!==1
this.multiple = !selection.length
},
@ -460,30 +557,30 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加振动实时数据";
this.title = "添加物联网数据";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const objId = row.objId || this.ids
getRecordVibrationInstant(objId).then(response => {
const objid = row.objid || this.ids
getRecordIotenvInstant(objid).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改振动实时数据";
this.title = "修改物联网数据";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.objId != null) {
updateRecordVibrationInstant(this.form).then(response => {
if (this.form.objid != null) {
updateRecordIotenvInstant(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addRecordVibrationInstant(this.form).then(response => {
addRecordIotenvInstant(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
@ -494,39 +591,26 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
const objIds = row.objId || this.ids;
this.$modal.confirm('是否确认删除振动实时数据编号为"' + objIds + '"的数据项？').then(function() {
return delRecordVibrationInstant(objIds);
const objids = row.objid || this.ids;
this.$modal.confirm('是否确认删除物联网数据编号为"' + objids + '"的数据项？').then(function() {
return delRecordIotenvInstant(objids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('ems/record/recordIotenvInstant/export', {
...this.queryParams
}, `recordIotenvInstant_${new Date().getTime()}.xlsx`)
},
/** 查询计量设备信息下拉树结构 */
getTreeselect() {
getMonitorInfoTree({ monitorType: 10 }).then(response => {
this.monitorInfoOptions = response.data
})
},
// 筛选节点
filterNode(value, data) {
if (!value) return true
return data.label.indexOf(value) !== -1
},
// 节点单击事件
handleNodeClick(data) {
this.queryParams.sensorId = data.code
this.selectMonitorName = data.label
this.handleQuery()
},
/** 导出按钮操作 */
handleExport() {
this.download('ems/record/recordVibrationInstant/export', {
...this.queryParams
}, `recordVibrationInstant_${new Date().getTime()}.xlsx`)
}
}
};

760
src/views/ems/report/currentIOTCurve/index.vue
Unescape Escape View File

@ -5,7 +5,7 @@
<div class="head-container">
<el-input
v-model="workUnitName"
placeholder="请输入物联网设备名称"
placeholder="请输入计量设备名称"
clearable
size="small"
prefix-icon="el-icon-search"
@ -56,7 +56,10 @@
</el-form>
<Chart ref="Chart1" class="chart1"/>
<!-- <Chart ref="Chart2" class="chart2"/> -->
<Chart ref="Chart2" class="chart2"/>
<Chart ref="Chart3" class="chart3"/>
<Chart ref="Chart4" class="chart4"/>
<Chart ref="Chart5" class="chart5"/>
</el-col>
</el-row>
@ -65,19 +68,18 @@
</template>
<script>
import {
listRecordIOTInstant,
getRecordIOTInstant, iotInstantList
} from '@/api/ems/record/recordIOTInstant'
import {getMonitorInfoTree} from '@/api/ems/base/baseMonitorInfo'
import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import {parseTime} from '@/utils/ruoyi'
import { parseTime } from '@/utils/ruoyi'
import Chart from '@/components/Charts/Chart'
import * as echarts from 'echarts'
import { vibrationInstantList } from '@/api/ems/record/recordVibrationInstant'
import {getRecordIotenvInstantList} from "@/api/ems/record/recordIotenvInstant";
export default {
name: 'CurrentIOTCurve',
name: 'currentVibrationCurve',
dicts: ['collect_type'],
components: {
Chart,
@ -116,19 +118,16 @@ export default {
open: false,
// 查询参数
queryParams: {
monitorId: null,
objId: null,
collectTime: null,
tempreture: null,
humidity: null,
illuminance: null,
noise: null,
concentration: null,
recordTime: null,
glys: null,
zxyg: null,
activePower: null,
reactivePower: null,
collectType: null
sensorId: null,
speed: null,
displacement: null,
acceleration: null,
temperature: null,
recodeTime: null,
remark: null,
monitorIds: [],
},
// 表单参数
form: {},
@ -139,26 +138,20 @@ export default {
// 表单校验
rules: {
objId: [
{required: true, message: '编号不能为空', trigger: 'blur'}
{ 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: 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: false},
{key: 12, label: ``, visible: false},
{key: 13, label: ``, visible: true},
{key: 14, label: ``, visible: true}
]
// columns: [
// { key: 0, label: `主键标识`, visible: false },
// { key: 1, label: `采集时间`, visible: true },
// { key: 2, label: `振动传感器编号编号`, visible: true },
// { key: 3, label: `速度(mm/s)`, visible: true },
// { key: 4, label: `位移(um)`, visible: true },
// { key: 5, label: `加速度(g)`, visible: true },
// { key: 6, label: `温度(℃)`, visible: true },
// { key: 7, label: `记录时间`, visible: true },
// { key: 8, label: `备注`, visible: true },
// ]
}
},
created() {
@ -181,11 +174,26 @@ export default {
delete node.children
}
return {
id: node.monitorId,
id: node.monitorCode,
label: node.monitorName,
children: node.children
}
},
// 递归获取树中所有节点的monitorId
getAllMonitorIds(nodes) {
let ids = [];
if (!nodes || nodes.length === 0) return ids;
nodes.forEach(node => {
if (node.id) {
ids.push(node.id);
}
if (node.children && node.children.length > 0) {
ids = ids.concat(this.getAllMonitorIds(node.children));
}
});
return ids;
},
/** 查询电实时数据列表 */
getList() {
this.loading = true
@ -194,7 +202,16 @@ export default {
this.queryParams.params['beginRecordTime'] = this.daterangeRecordTime[0]
this.queryParams.params['endRecordTime'] = this.daterangeRecordTime[1]
}
console.log(this.monitorInfoOptions)
// 将monitorCode改为sensorId
if (this.queryParams.sensorId !== null) {
this.queryParams.params['sensorId'] = this.queryParams.sensorId;
}
// 如果没有选中节点，则获取所有设备ID
if (!this.queryParams.monitorId) {
this.queryParams.monitorIds = this.getAllMonitorIds(this.monitorInfoOptions);
}
this.getChart()
},
@ -208,10 +225,13 @@ export default {
reset() {
this.form = {
objId: null,
monitorId: null,
collectTime: null,
recordTime: null,
collectType: 1
sensorId: null,
speed: null,
displacement: null,
acceleration: null,
temperature: null,
recodeTime: null,
remark: null
}
this.resetForm('form')
},
@ -223,16 +243,16 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.queryParams.monitorId = null
this.queryParams.monitorCode = null
this.resetForm('queryForm')
this.handleQuery()
},
/** 导出按钮操作 */
handleExport() {
this.download('ems/record/recordIOTInstant/export', {
this.download('ems/record/recordVibrationInstant/export', {
...this.queryParams
}, `recordIOTInstant_${new Date().getTime()}.xlsx`)
}, `recordVibrationInstant_${new Date().getTime()}.xlsx`)
},
/** 查询计量设备信息下拉树结构 */
@ -249,74 +269,76 @@ export default {
},
/** 节点单击事件 */
handleNodeClick(data, type, a) {
console.log(type.parent.data)
console.log(a)
// this.queryParams.monitorTypeList = type
this.queryParams.monitorId = data.code
handleNodeClick(data) {
// 点击节点时清空monitorIds，只使用选中的monitorId
this.queryParams.monitorIds = [];
/* this.queryParams.monitorCode = data.code*/
this.queryParams.sensorId = data.code
console.log("this.queryParams.sensorId"+this.queryParams.sensorId)
this.selectMonitorName = data.label
this.handleQuery()
},
/** 物联网设备曲线 */
/** 振动曲线 */
async getChart() {
if (this.queryParams.monitorId == null) {
if (this.queryParams.sensorId == null) {
return
}
let query = JSON.parse(JSON.stringify(this.queryParams))
const {data} = await iotInstantList(query)
// const {data} = await vibrationInstantList(query)
const {data} = await getRecordIotenvInstantList(query)
let option1 = {
title: {
text: '物联网设备曲线',
// this.selectMonitorName
text: this.selectMonitorName + ' 湿度曲线',
x: 'center'
},
legend: {
data: data.monitorTypeArr,
right: 0,
},
grid: {
top: '15%',
bottom: '10%',
left: '3%',
left: '10%',
right: '3%'
},
tooltip: {
trigger: 'axis',
// axisPointer: {
// type: 'shadow',
// label: {
// show: true
// }
// }
axisPointer: {
type: 'shadow',
label: {
show: true
}
}
},
dataZoom: [{
type: 'slider'
}],
legend: {
right: 0
},
xAxis: {
data: data.dataList.map(e => e.collectTime),
data: data.map(e => e.recodeTime),
axisLine: {
show: true, //隐藏X轴轴线
lineStyle: {
color: '#000'
color: '#000000'
}
},
// axisTick: {
// show: true //隐藏X轴刻度
// },
axisTick: {
show: true //隐藏X轴刻度
},
axisLabel: {
show: true,
textStyle: {
color: '#000' //X轴文字颜色
color: '#000000' //X轴文字颜色
}
}
},
yAxis: [
{
type: 'value',
name: '数值',
name: '湿度',
nameTextStyle: {
color: '#000'
color: '#000000'
},
splitLine: {
show: false
@ -327,50 +349,25 @@ export default {
axisLine: {
show: true,
lineStyle: {
color: '#000'
color: '#000000'
}
},
axisLabel: {
show: true,
textStyle: {
color: '#000'
color: '#000000'
}
}
}
],
series: [
{
tooltip: {
show: data.monitorTypeArr.includes('温度') ? true : false
},
name: '温度',
type: data.type,
smooth: data.smooth, //平滑曲线显示
showAllSymbol: data.showAllSymbol, //显示所有图形。
symbol: data.symbol, //标记的图形为实心圆
symbolSize: data.symbolSize, //标记的大小
// itemStyle: {
// //折线拐点标志的样式
// color: "#058cff",
// },
// lineStyle: {
// color: "#058cff",
// },
// areaStyle: {
// color: "rgba(5,140,255, 0.2)",
// },
data: data.monitorTypeArr.includes('温度') ? data.dataList.map(e => e.tempreture) : []
},
{
tooltip: {
show: data.monitorTypeArr.includes('湿度') ? true : false
},
name: '湿度',
type: data.type,
smooth: data.smooth, //平滑曲线显示
showAllSymbol: data.showAllSymbol, //显示所有图形。
symbol: data.symbol, //标记的图形为实心圆
symbolSize: data.symbolSize, //标记的大小
type: 'line',
smooth: true, //平滑曲线显示
showAllSymbol: true, //显示所有图形。
symbol: 'circle', //标记的图形为实心圆
symbolSize: 10, //标记的大小
// itemStyle: {
// //折线拐点标志的样式
// color: "#058cff",
@ -381,103 +378,488 @@ export default {
// areaStyle: {
// color: "rgba(5,140,255, 0.2)",
// },
data: data.monitorTypeArr.includes('湿度') ? data.dataList.map(e => e.humidity) : []
data: data.map(e => e.humidity)
},
{
tooltip: {
show: data.monitorTypeArr.includes('噪声') ? true : false
},
name: '噪声',
type: data.type,
smooth: data.smooth, //平滑曲线显示
showAllSymbol: data.showAllSymbol, //显示所有图形。
symbol: data.symbol, //标记的图形为实心圆
symbolSize: data.symbolSize, //标记的大小
// itemStyle: {
// //折线拐点标志的样式
// color: "#058cff",
// },
// lineStyle: {
// color: "#058cff",
// },
// areaStyle: {
// color: "rgba(5,140,255, 0.2)",
// },
data: data.monitorTypeArr.includes('噪声') ? data.dataList.map(e => e.noise) : []
},
{
tooltip: {
show: data.monitorTypeArr.includes('照度') ? true : false
},
name: '照度',
type: data.type,
smooth: data.smooth, //平滑曲线显示
showAllSymbol: data.showAllSymbol, //显示所有图形。
symbol: data.symbol, //标记的图形为实心圆
symbolSize: data.symbolSize, //标记的大小
// itemStyle: {
// //折线拐点标志的样式
// color: "#058cff",
// },
// lineStyle: {
// color: "#058cff",
// },
// areaStyle: {
// color: "rgba(5,140,255, 0.2)",
// },
data: data.monitorTypeArr.includes('照度') ? data.dataList.map(e => e.illuminance) : []
},
{
tooltip: {
show: data.monitorTypeArr.includes('气体浓度') ? true : false
},
name: '气体浓度',
type: data.type,
smooth: data.smooth, //平滑曲线显示
showAllSymbol: data.showAllSymbol, //显示所有图形。
symbol: data.symbol, //标记的图形为实心圆
symbolSize: data.symbolSize, //标记的大小
// itemStyle: {
// //折线拐点标志的样式
// color: "#058cff",
// },
// lineStyle: {
// color: "#058cff",
// },
// areaStyle: {
// color: "rgba(5,140,255, 0.2)",
// },
data: data.monitorTypeArr.includes('气体浓度') ? data.dataList.map(e => e.concentration) : []
}
]
}
console.log(option1)
this.$refs.Chart1.setData(option1)
let option2 = {
title: {
text: this.selectMonitorName + ' 温度曲线',
x: 'center'
},
grid: {
top: '15%',
bottom: '10%',
left: '10%',
right: '3%'
},
echarts.connect(this.$refs.Chart1.chart)
// , this.$refs.Chart2.chart
dataZoom: [{
type: 'slider'
}],
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'shadow',
label: {
show: true
}
}
},
legend: {
right: 0
},
xAxis: {
data: data.map(e => e.recodeTime),
axisLine: {
show: true, //隐藏X轴轴线
lineStyle: {
color: '#000000'
}
},
axisTick: {
show: true //隐藏X轴刻度
},
axisLabel: {
show: true,
textStyle: {
color: '#000000' //X轴文字颜色
}
}
},
yAxis: [
{
type: 'value',
name: '温度(℃)',
nameTextStyle: {
color: '#000000'
},
splitLine: {
show: false
},
axisTick: {
show: true
},
axisLine: {
show: true,
lineStyle: {
color: '#000000'
}
},
axisLabel: {
show: true,
textStyle: {
color: '#000000'
}
}
}
],
series: [
{
name: '温度(℃)',
type: 'line',
smooth: true, //平滑曲线显示
showAllSymbol: true, //显示所有图形。
symbol: 'circle', //标记的图形为实心圆
symbolSize: 10, //标记的大小
// itemStyle: {
// //折线拐点标志的样式
// color: "#058cff",
// },
// lineStyle: {
// color: "#058cff",
// },
// areaStyle: {
// color: "rgba(5,140,255, 0.2)",
// },
data: data.map(e => e.temperature)
},
]
}
let option3 = {
title: {
text: this.selectMonitorName + ' 照度曲线',
x: 'center'
},
grid: {
top: '15%',
bottom: '10%',
left: '10%',
right: '3%'
},
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'shadow',
label: {
show: true
}
}
},
dataZoom: [{
type: 'slider'
}],
legend: {
right: 0
},
xAxis: {
data: data.map(e => e.recodeTime),
axisLine: {
show: true, //隐藏X轴轴线
lineStyle: {
color: '#000000'
}
},
axisTick: {
show: true //隐藏X轴刻度
},
axisLabel: {
show: true,
textStyle: {
color: '#000000' //X轴文字颜色
}
}
},
yAxis: [
{
type: 'value',
name: '照度',
nameTextStyle: {
color: '#000000'
},
splitLine: {
show: false
},
axisTick: {
show: true
},
axisLine: {
show: true,
lineStyle: {
color: '#000000'
}
},
axisLabel: {
show: true,
textStyle: {
color: '#000000'
}
}
}
],
series: [
{
name: '照度',
type: 'line',
smooth: true, //平滑曲线显示
showAllSymbol: true, //显示所有图形。
symbol: 'circle', //标记的图形为实心圆
symbolSize: 10, //标记的大小
// itemStyle: {
// //折线拐点标志的样式
// color: "#058cff",
// },
// lineStyle: {
// color: "#058cff",
// },
// areaStyle: {
// color: "rgba(5,140,255, 0.2)",
// },
data: data.map(e => e.illuminance)
},
]
}
let option4 = {
title: {
text: this.selectMonitorName + ' 噪声曲线',
x: 'center'
},
grid: {
top: '15%',
bottom: '10%',
left: '10%',
right: '3%'
},
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'shadow',
label: {
show: true
}
}
},
dataZoom: [{
type: 'slider'
}],
legend: {
right: 0
},
xAxis: {
data: data.map(e => e.recodeTime),
axisLine: {
show: true, //隐藏X轴轴线
lineStyle: {
color: '#000000'
}
},
axisTick: {
show: true //隐藏X轴刻度
},
axisLabel: {
show: true,
textStyle: {
color: '#000000' //X轴文字颜色
}
}
},
yAxis: [
{
type: 'value',
name: '噪声',
nameTextStyle: {
color: '#000000'
},
splitLine: {
show: false
},
axisTick: {
show: true
},
axisLine: {
show: true,
lineStyle: {
color: '#000000'
}
},
axisLabel: {
show: true,
textStyle: {
color: '#000000'
}
}
}
],
series: [
{
name: '噪声',
type: 'line',
smooth: true, //平滑曲线显示
showAllSymbol: true, //显示所有图形。
symbol: 'circle', //标记的图形为实心圆
symbolSize: 10, //标记的大小
// itemStyle: {
// color: "#058cff",
// },
// lineStyle: {
// color: "#058cff",
// },
// areaStyle: {
// color: "rgba(5,140,255, 0.2)",
// },
data: data.map(e => e.noise)
},
]
}
let option5 = {
title: {
text: this.selectMonitorName + ' 硫化氢浓度曲线',
x: 'center'
},
grid: {
top: '15%',
bottom: '10%',
left: '10%',
right: '3%'
},
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'shadow',
label: {
show: true
}
}
},
dataZoom: [{
type: 'slider'
}],
legend: {
right: 0
},
xAxis: {
data: data.map(e => e.recodeTime),
axisLine: {
show: true, //隐藏X轴轴线
lineStyle: {
color: '#000000'
}
},
axisTick: {
show: true //隐藏X轴刻度
},
axisLabel: {
show: true,
textStyle: {
color: '#000000' //X轴文字颜色
}
}
},
yAxis: [
{
type: 'value',
name: '硫化氢浓度',
nameTextStyle: {
color: '#000000'
},
splitLine: {
show: false
},
axisTick: {
show: true
},
axisLine: {
show: true,
lineStyle: {
color: '#000000'
}
},
axisLabel: {
show: true,
textStyle: {
color: '#000000'
}
}
}
],
series: [
{
name: '硫化氢浓度',
type: 'line',
smooth: true, //平滑曲线显示
showAllSymbol: true, //显示所有图形。
symbol: 'circle', //标记的图形为实心圆
symbolSize: 10, //标记的大小
// itemStyle: {
// color: "#058cff",
// },
// lineStyle: {
// color: "#058cff",
// },
// areaStyle: {
// color: "rgba(5,140,255, 0.2)",
// },
data: data.map(e => e.concentration)
},
]
}
this.$refs.Chart1.setData(option1)
this.$refs.Chart2.setData(option2)
this.$refs.Chart3.setData(option3)
this.$refs.Chart4.setData(option4)
this.$refs.Chart5.setData(option5)
echarts.connect(this.$refs.Chart1.chart, this.$refs.Chart2.chart, this.$refs.Chart3.chart, this.$refs.Chart4.chart, this.$refs.Chart5.chart)
this.$refs.Chart1.chart.on('datazoom', (e) => {
option2.dataZoom[0].start = e.start
option2.dataZoom[0].end = e.end
this.$refs.Chart2.setData(option2)
option3.dataZoom[0].start = e.start
option3.dataZoom[0].end = e.end
this.$refs.Chart3.setData(option3)
option4.dataZoom[0].start = e.start
option4.dataZoom[0].end = e.end
this.$refs.Chart4.setData(option4)
option5.dataZoom[0].start = e.start
option5.dataZoom[0].end = e.end
this.$refs.Chart5.setData(option5)
})
this.$refs.Chart2.chart.on('datazoom', (e) => {
option1.dataZoom[0].start = e.start
option1.dataZoom[0].end = e.end
this.$refs.Chart1.setData(option1)
option3.dataZoom[0].start = e.start
option3.dataZoom[0].end = e.end
this.$refs.Chart3.setData(option3)
option4.dataZoom[0].start = e.start
option4.dataZoom[0].end = e.end
this.$refs.Chart4.setData(option4)
option5.dataZoom[0].start = e.start
option5.dataZoom[0].end = e.end
this.$refs.Chart5.setData(option5)
})
this.$refs.Chart3.chart.on('datazoom', (e) => {
option2.dataZoom[0].start = e.start
option2.dataZoom[0].end = e.end
this.$refs.Chart2.setData(option2)
option1.dataZoom[0].start = e.start
option1.dataZoom[0].end = e.end
this.$refs.Chart1.setData(option1)
option4.dataZoom[0].start = e.start
option4.dataZoom[0].end = e.end
this.$refs.Chart4.setData(option4)
option5.dataZoom[0].start = e.start
option5.dataZoom[0].end = e.end
this.$refs.Chart5.setData(option5)
})
this.$refs.Chart4.chart.on('datazoom', (e) => {
option2.dataZoom[0].start = e.start
option2.dataZoom[0].end = e.end
this.$refs.Chart2.setData(option2)
option3.dataZoom[0].start = e.start
option3.dataZoom[0].end = e.end
this.$refs.Chart3.setData(option3)
option1.dataZoom[0].start = e.start
option1.dataZoom[0].end = e.end
this.$refs.Chart4.setData(option1)
option5.dataZoom[0].start = e.start
option5.dataZoom[0].end = e.end
this.$refs.Chart5.setData(option5)
})
this.$refs.Chart5.chart.on('datazoom', (e) => {
option2.dataZoom[0].start = e.start
option2.dataZoom[0].end = e.end
this.$refs.Chart2.setData(option2)
option3.dataZoom[0].start = e.start
option3.dataZoom[0].end = e.end
this.$refs.Chart3.setData(option3)
option4.dataZoom[0].start = e.start
option4.dataZoom[0].end = e.end
this.$refs.Chart4.setData(option4)
option1.dataZoom[0].start = e.start
option1.dataZoom[0].end = e.end
this.$refs.Chart1.setData(option1)
})
// this.$refs.Chart2.chart.on('datazoom', (e) => {
// option1.dataZoom[0].start = e.start
// option1.dataZoom[0].end = e.end
// this.$refs.Chart1.setData(option1)
// })
}
}
}
</script>
<style scoped>
.chart1 {
width: 100%;
height: 75vh;
width: 50%;
height: 40vh;
display: inline-block;
}
.chart2 {
width: 100%;
width: 50%;
height: 40vh;
display: inline-block;
}
.chart3 {
width: 50%;
height: 40vh;
display: inline-block;
}
.chart4 {
width: 50%;
display: inline-block;
height: 40vh;
}
.chart5 {
width: 50%;
display: inline-block;
height: 40vh;
}
</style>

48
src/views/ems/report/currentVibrationCurve/index.vue
Unescape Escape View File

@ -75,6 +75,7 @@ import { parseTime } from '@/utils/ruoyi'
import Chart from '@/components/Charts/Chart'
import * as echarts from 'echarts'
import { vibrationInstantList } from '@/api/ems/record/recordVibrationInstant'
import {getRecordIotenvInstantList} from "@/api/ems/record/recordIotenvInstant";
export default {
name: 'currentVibrationCurve',
@ -124,7 +125,8 @@ export default {
acceleration: null,
temperature: null,
recodeTime: null,
remark: null
remark: null,
monitorIds: [],
},
// 表单参数
form: {},
@ -176,6 +178,21 @@ export default {
children: node.children
}
},
// 递归获取树中所有节点的monitorId
getAllMonitorIds(nodes) {
let ids = [];
if (!nodes || nodes.length === 0) return ids;
nodes.forEach(node => {
if (node.id) {
ids.push(node.id);
}
if (node.children && node.children.length > 0) {
ids = ids.concat(this.getAllMonitorIds(node.children));
}
});
return ids;
},
/** 查询电实时数据列表 */
getList() {
this.loading = true
@ -188,6 +205,12 @@ export default {
if (this.queryParams.sensorId !== null) {
this.queryParams.params['sensorId'] = this.queryParams.sensorId;
}
// 如果没有选中节点，则获取所有设备ID
if (!this.queryParams.monitorId) {
this.queryParams.monitorIds = this.getAllMonitorIds(this.monitorInfoOptions);
}
this.getChart()
},
@ -201,7 +224,6 @@ export default {
reset() {
this.form = {
objId: null,
collectTime: null,
sensorId: null,
speed: null,
displacement: null,
@ -247,6 +269,9 @@ export default {
/** 节点单击事件 */
handleNodeClick(data) {
// 点击节点时清空monitorIds，只使用选中的monitorId
this.queryParams.monitorIds = [];
/* this.queryParams.monitorCode = data.code*/
this.queryParams.sensorId = data.code
console.log("this.queryParams.sensorId"+this.queryParams.sensorId)
@ -261,7 +286,8 @@ export default {
return
}
let query = JSON.parse(JSON.stringify(this.queryParams))
const {data} = await vibrationInstantList(query)
// const {data} = await vibrationInstantList(query)
const {data} = await getRecordIotenvInstantList(query)
let option1 = {
title: {
text: this.selectMonitorName + ' 速度曲线',
@ -289,7 +315,7 @@ export default {
right: 0
},
xAxis: {
data: data.map(e => e.collectTime),
data: data.map(e => e.recodeTime),
axisLine: {
show: true, //隐藏X轴轴线
lineStyle: {
@ -351,7 +377,7 @@ export default {
// areaStyle: {
// color: "rgba(5,140,255, 0.2)",
// },
data: data.map(e => e.speed)
data: data.map(e => e.vibrationSpeed)
},
]
}
@ -383,7 +409,7 @@ export default {
right: 0
},
xAxis: {
data: data.map(e => e.collectTime),
data: data.map(e => e.recodeTime),
axisLine: {
show: true, //隐藏X轴轴线
lineStyle: {
@ -445,7 +471,7 @@ export default {
// areaStyle: {
// color: "rgba(5,140,255, 0.2)",
// },
data: data.map(e => e.temperature)
data: data.map(e => e.vibrationTemp)
},
]
}
@ -476,7 +502,7 @@ export default {
right: 0
},
xAxis: {
data: data.map(e => e.collectTime),
data: data.map(e => e.recodeTime),
axisLine: {
show: true, //隐藏X轴轴线
lineStyle: {
@ -538,7 +564,7 @@ export default {
// areaStyle: {
// color: "rgba(5,140,255, 0.2)",
// },
data: data.map(e => e.displacement)
data: data.map(e => e.vibrationDisplacement)
},
]
}
@ -569,7 +595,7 @@ export default {
right: 0
},
xAxis: {
data: data.map(e => e.collectTime),
data: data.map(e => e.recodeTime),
axisLine: {
show: true, //隐藏X轴轴线
lineStyle: {
@ -630,7 +656,7 @@ export default {
// areaStyle: {
// color: "rgba(5,140,255, 0.2)",
// },
data: data.map(e => e.acceleration)
data: data.map(e => e.vibrationAcceleration)
},
]
}

Write Preview
Loading…
Cancel
Save