Merge remote-tracking branch 'origin/boardTest' into boardTest
commit
d0cdf0ddf0
@ -0,0 +1,44 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询物联网数据列表
|
||||
export function listRecordIotenvInstant(query) {
|
||||
return request({
|
||||
url: '/ems/record/recordIotenvInstant/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询物联网数据详细
|
||||
export function getRecordIotenvInstant(objid) {
|
||||
return request({
|
||||
url: '/ems/record/recordIotenvInstant/' + objid,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 新增物联网数据
|
||||
export function addRecordIotenvInstant(data) {
|
||||
return request({
|
||||
url: '/ems/record/recordIotenvInstant',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改物联网数据
|
||||
export function updateRecordIotenvInstant(data) {
|
||||
return request({
|
||||
url: '/ems/record/recordIotenvInstant',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 删除物联网数据
|
||||
export function delRecordIotenvInstant(objid) {
|
||||
return request({
|
||||
url: '/ems/record/recordIotenvInstant/' + objid,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
@ -0,0 +1,488 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
|
||||
<!-- <el-form-item label="计量设备编号" prop="monitorId">
|
||||
<el-input
|
||||
v-model="queryParams.monitorId"
|
||||
placeholder="请输入计量设备编号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="温度" prop="temperature">
|
||||
<el-input
|
||||
v-model="queryParams.temperature"
|
||||
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="采集时间" 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"
|
||||
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>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['ems/record:recordIotenvInstant:add']"
|
||||
>新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
v-hasPermi="['ems/record:recordIotenvInstant:edit']"
|
||||
>修改</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
v-hasPermi="['ems/record:recordIotenvInstant:remove']"
|
||||
>删除</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['ems/record: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="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>
|
||||
<el-table-column label="温度" align="center" prop="temperature" v-if="columns[2].visible">
|
||||
|
||||
</el-table-column>
|
||||
<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:recordIotenvInstant:edit']"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['ems/record:recordIotenvInstant:remove']"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
<!-- 添加或修改物联网数据对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
||||
<el-form-item label="计量设备编号" prop="monitorId">
|
||||
<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 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"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择记录时间">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listRecordIotenvInstant, getRecordIotenvInstant, delRecordIotenvInstant, addRecordIotenvInstant, updateRecordIotenvInstant } from "@/api/ems/record/recordIotenvInstant";
|
||||
import {parseTime} from "@/utils/ruoyi";
|
||||
|
||||
export default {
|
||||
name: "RecordIotenvInstant",
|
||||
data() {
|
||||
return {
|
||||
// 记录时间时间范围
|
||||
daterangeRecordTime: [],
|
||||
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 物联网数据表格数据
|
||||
recordIotenvInstantList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
params:{},
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
monitorId: null,
|
||||
temperature: null,
|
||||
humidity: null,
|
||||
illuminance: null,
|
||||
noise: null,
|
||||
concentration: null,
|
||||
vibrationSpeed: null,
|
||||
vibrationDisplacement: null,
|
||||
vibrationAcceleration: null,
|
||||
vibrationTemp: null,
|
||||
collectTime: null,
|
||||
recodeTime: null,
|
||||
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
},
|
||||
columns: [
|
||||
{ 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: true },
|
||||
{ key: 12, label: `记录时间`, visible: true },
|
||||
]
|
||||
};
|
||||
},
|
||||
created() {
|
||||
// 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}')
|
||||
//
|
||||
// console.log(today,yesterday)
|
||||
// this.daterangeRecordTime[0] = yesterday+ ' 08:00:00'
|
||||
// this.daterangeRecordTime[1] = today + ' 08:00:00'
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
/** 查询物联网数据列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
|
||||
|
||||
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]
|
||||
}
|
||||
|
||||
listRecordIotenvInstant(this.queryParams).then(response => {
|
||||
this.recordIotenvInstantList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
objid: 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
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
console.log('查询参数:', this.daterangeRecordTime);
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
|
||||
this.resetForm("queryForm");
|
||||
this.daterangeCollectTime = [];
|
||||
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 = "添加物联网数据";
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset();
|
||||
const objid = row.objid || this.ids
|
||||
getRecordIotenvInstant(objid).then(response => {
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "修改物联网数据";
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.form.objid != null) {
|
||||
updateRecordIotenvInstant(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
} else {
|
||||
addRecordIotenvInstant(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 delRecordIotenvInstant(objids);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('ems/record/recordIotenvInstant/export', {
|
||||
...this.queryParams
|
||||
}, `recordIotenvInstant_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
Loading…
Reference in New Issue