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

update 压缩空气、氮气实时数据优化

Browse Source
master
yinq 8 months ago
parent 261fbe0e0a
commit 83b78a8adf
2 changed files with 921 additions and 784 deletions
Show Stats Download Patch File Download Diff File

383
src/views/ems/record/recordAirInstant/index.vue
Unescape Escape View File

@ -1,14 +1,43 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px"> <el-row :gutter="28">
<el-form-item label="计量设备编号" prop="monitorCode"> <el-col :span="5" :xs="24">
<div class="head-container">
<el-input <el-input
v-model="queryParams.monitorCode" v-model="workUnitName"
placeholder="请输入计量设备编号" placeholder="请输入计量设备名称"
clearable clearable
@keyup.enter.native="handleQuery" size="small"
prefix-icon="el-icon-search"
style="margin-bottom: 20px"
/> />
</el-form-item> </div>
<div class="head-container">
<el-tree
:data="monitorInfoOptions"
:props="monitorProps"
:expand-on-click-node="false"
:filter-node-method="filterNode"
ref="tree"
node-key="id"
default-expand-all
highlight-current
@node-click="handleNodeClick"
/>
</div>
</el-col>
<el-col :span="19" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="100px"
>
<!-- <el-form-item label="计量设备编号" prop="monitorCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.monitorCode"-->
<!-- placeholder="请输入计量设备编号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="采集时间"> <el-form-item label="采集时间">
<el-date-picker <el-date-picker
v-model="daterangeCollectTime" v-model="daterangeCollectTime"
@ -20,65 +49,17 @@
end-placeholder="结束时间" end-placeholder="结束时间"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="瞬时流量" prop="fluxFlow"> <!-- <el-form-item label="记录时间">-->
<el-input <!-- <el-date-picker-->
v-model="queryParams.fluxFlow" <!-- v-model="daterangeRecordTime"-->
placeholder="请输入瞬时流量" <!-- style="width: 340px"-->
clearable <!-- value-format="yyyy-MM-dd HH:mm:ss"-->
@keyup.enter.native="handleQuery" <!-- type="datetimerange"-->
/> <!-- range-separator="-"-->
</el-form-item> <!-- start-placeholder="开始时间"-->
<el-form-item label="累计流量" prop="steamFlow"> <!-- end-placeholder="结束时间"-->
<el-input <!-- ></el-date-picker>-->
v-model="queryParams.steamFlow" <!-- </el-form-item>-->
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="press">
<el-input
v-model="queryParams.press"
placeholder="请输入压力"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="密度" prop="density">
<el-input
v-model="queryParams.density"
placeholder="请输入密度"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="压力差值" prop="differencePress">
<el-input
v-model="queryParams.differencePress"
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>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -94,7 +75,8 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['ems/record:recordAirInstant:add']" v-hasPermi="['ems/record:recordAirInstant:add']"
>新增</el-button> >新增
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -105,7 +87,8 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['ems/record:recordAirInstant:edit']" v-hasPermi="['ems/record:recordAirInstant:edit']"
>修改</el-button> >修改
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -116,7 +99,8 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['ems/record:recordAirInstant:remove']" v-hasPermi="['ems/record:recordAirInstant:remove']"
>删除</el-button> >删除
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -126,15 +110,17 @@
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['ems/record:recordAirInstant:export']" v-hasPermi="['ems/record:recordAirInstant:export']"
>导出</el-button> >导出
</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="recordAirInstantList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="recordAirInstantList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="自增标识" align="center" prop="objId" v-if="columns[0].visible"/> <el-table-column label="自增标识" align="center" prop="objId" v-if="columns[0].visible"/>
<el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[1].visible"/> <el-table-column label="计量设备编号" align="center" prop="monitorCode" width="120" v-if="columns[1].visible"/>
<el-table-column label="计量设备名称" align="center" prop="monitorName" width="100" v-if="columns[10].visible"/>
<el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[2].visible"> <el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[2].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@ -151,25 +137,29 @@
<span>{{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100"> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
@click="handleUpdate(scope.row)" <!-- @click="handleUpdate(scope.row)"-->
v-hasPermi="['ems/record:recordAirInstant:edit']" <!-- v-hasPermi="['ems/record:recordAirInstant:edit']"-->
>修改</el-button> <!-- >修改-->
<el-button <!-- </el-button>-->
size="mini" <!-- <el-button-->
type="text" <!-- size="mini"-->
icon="el-icon-delete" <!-- type="text"-->
@click="handleDelete(scope.row)" <!-- icon="el-icon-delete"-->
v-hasPermi="['ems/record:recordAirInstant:remove']" <!-- @click="handleDelete(scope.row)"-->
>删除</el-button> <!-- v-hasPermi="['ems/record:recordAirInstant:remove']"-->
</template> <!-- >删除-->
</el-table-column> <!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table> </el-table>
</el-col>
</el-row>
<pagination <pagination
v-show="total>0" v-show="total>0"
@ -181,42 +171,46 @@
<!-- 添加或修改压缩空气实时数据对话框 --> <!-- 添加或修改压缩空气实时数据对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="计量设备编号" prop="monitorCode"> <el-form-item label="计量设备名称" prop="monitorCode">
<el-input v-model="form.monitorCode" placeholder="请输入计量设备编号" /> <treeselect v-model="form.monitorCode" :options="baseMonitorInfoOptions" :normalizer="normalizer"
placeholder="请选择计量设备名称"
/>
</el-form-item> </el-form-item>
<el-form-item label="采集时间" prop="collectTime"> <el-form-item label="采集时间" prop="collectTime">
<el-date-picker clearable <el-date-picker clearable
v-model="form.collectTime" v-model="form.collectTime"
type="date" type="datetime"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择采集时间"> placeholder="请选择采集时间"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="瞬时流量" prop="fluxFlow"> <el-form-item label="瞬时流量" prop="fluxFlow">
<el-input v-model="form.fluxFlow" placeholder="请输入瞬时流量" /> <el-input-number v-model="form.fluxFlow" placeholder="请输入瞬时流量"/>
</el-form-item> </el-form-item>
<el-form-item label="累计流量" prop="steamFlow"> <el-form-item label="累计流量" prop="steamFlow">
<el-input v-model="form.steamFlow" placeholder="请输入累计流量" /> <el-input-number v-model="form.steamFlow" placeholder="请输入累计流量"/>
</el-form-item> </el-form-item>
<el-form-item label="露点温度" prop="temperature"> <el-form-item label="露点温度" prop="temperature">
<el-input v-model="form.temperature" placeholder="请输入露点温度" /> <el-input-number v-model="form.temperature" placeholder="请输入露点温度"/>
</el-form-item> </el-form-item>
<el-form-item label="压力" prop="press"> <el-form-item label="压力" prop="press">
<el-input v-model="form.press" placeholder="请输入压力" /> <el-input-number v-model="form.press" placeholder="请输入压力"/>
</el-form-item> </el-form-item>
<el-form-item label="密度" prop="density"> <el-form-item label="密度" prop="density">
<el-input v-model="form.density" placeholder="请输入密度" /> <el-input-number v-model="form.density" placeholder="请输入密度"/>
</el-form-item> </el-form-item>
<el-form-item label="压力差值" prop="differencePress"> <el-form-item label="压力差值" prop="differencePress">
<el-input v-model="form.differencePress" placeholder="请输入压力差值" /> <el-input-number v-model="form.differencePress" placeholder="请输入压力差值"/>
</el-form-item> </el-form-item>
<el-form-item label="记录时间" prop="recordTime"> <el-form-item label="记录时间" prop="recordTime">
<el-date-picker clearable <el-date-picker clearable
v-model="form.recordTime" v-model="form.recordTime"
type="date" type="datetime"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择记录时间"> placeholder="请选择记录时间"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -229,12 +223,36 @@
</template> </template>
<script> <script>
import { listRecordAirInstant, getRecordAirInstant, delRecordAirInstant, addRecordAirInstant, updateRecordAirInstant } from "@/api/ems/record/recordAirInstant"; import {
listRecordAirInstant,
getRecordAirInstant,
delRecordAirInstant,
addRecordAirInstant,
updateRecordAirInstant
} from '@/api/ems/record/recordAirInstant'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import { parseTime } from '@/utils/ruoyi'
import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
export default { export default {
name: "RecordAirInstant", name: 'RecordAirInstant',
components: {
Treeselect
},
data() { data() {
return { return {
//下拉树List
baseMonitorInfoOptions: [],
//左侧树结构List
monitorInfoOptions: [],
workUnitName: undefined,
//计量设备信息
baseMonitorInfoList: [],
monitorProps: {
children: 'children',
label: 'label'
},
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
@ -250,7 +268,7 @@
// 压缩空气实时数据表格数据 // 压缩空气实时数据表格数据
recordAirInstantList: [], recordAirInstantList: [],
// 弹出层标题 // 弹出层标题
title: "", title: '',
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 记录时间时间范围 // 记录时间时间范围
@ -275,12 +293,12 @@
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
objId: [ monitorCode: [
{ required: true, message: "自增标识不能为空", trigger: "blur" } { required: true, message: '计量设备名称不能为空', trigger: 'blur' }
], ]
}, },
columns: [ columns: [
{ key: 0, label: `自增标识`, visible: true }, { key: 0, label: `自增标识`, visible: false },
{ key: 1, label: `计量设备编号`, visible: true }, { key: 1, label: `计量设备编号`, visible: true },
{ key: 2, label: `采集时间`, visible: true }, { key: 2, label: `采集时间`, visible: true },
{ key: 3, label: `瞬时流量`, visible: true }, { key: 3, label: `瞬时流量`, visible: true },
@ -290,35 +308,61 @@
{ key: 7, label: `密度`, visible: true }, { key: 7, label: `密度`, visible: true },
{ key: 8, label: `压力差值`, visible: true }, { key: 8, label: `压力差值`, visible: true },
{ key: 9, label: `记录时间`, visible: true }, { key: 9, label: `记录时间`, visible: true },
{ key: 10, label: `计量设备名称`, visible: true }
] ]
}; }
}, },
created() { 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()
this.getTreeMonitorInfo()
this.getList()
}, },
methods: { methods: {
/** 转换计量设备信息数据结构 */
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children
}
return {
id: node.monitorCode,
label: node.monitorName,
children: node.children
}
},
/** 查询计量设备信息下拉树结构 新增用*/
getTreeMonitorInfo() {
listBaseMonitorInfo({ monitorType: 5 }).then(response => {
this.baseMonitorInfoOptions = []
const data = { objId: 0, monitorName: '顶级节点', children: [] }
data.children = this.handleTree(response.data, 'objId', 'parentId')
this.baseMonitorInfoOptions.push(data)
})
},
/** 查询压缩空气实时数据列表 */ /** 查询压缩空气实时数据列表 */
getList() { getList() {
this.loading = true; this.loading = true
this.queryParams.params = {}; this.queryParams.params = {}
if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) { if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) {
this.queryParams.params["beginCollectTime"] = this.daterangeCollectTime[0]; this.queryParams.params['beginCollectTime'] = this.daterangeCollectTime[0]
this.queryParams.params["endCollectTime"] = this.daterangeCollectTime[1]; this.queryParams.params['endCollectTime'] = this.daterangeCollectTime[1]
} }
if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) { if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) {
this.queryParams.params["beginRecordTime"] = this.daterangeRecordTime[0]; this.queryParams.params['beginRecordTime'] = this.daterangeRecordTime[0]
this.queryParams.params["endRecordTime"] = this.daterangeRecordTime[1]; this.queryParams.params['endRecordTime'] = this.daterangeRecordTime[1]
} }
listRecordAirInstant(this.queryParams).then(response => { listRecordAirInstant(this.queryParams).then(response => {
this.recordAirInstantList = response.rows; this.recordAirInstantList = response.rows
this.total = response.total; this.total = response.total
this.loading = false; this.loading = false
}); })
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false
this.reset(); this.reset()
}, },
// 表单重置 // 表单重置
reset() { reset() {
@ -333,72 +377,93 @@
density: null, density: null,
differencePress: null, differencePress: null,
recordTime: null recordTime: null
}; }
this.resetForm("form"); this.resetForm('form')
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1
this.getList(); this.getList()
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.daterangeCollectTime = []; this.daterangeCollectTime = []
this.daterangeRecordTime = []; this.daterangeRecordTime = []
this.resetForm("queryForm"); this.resetForm('queryForm')
this.handleQuery(); this.handleQuery()
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.objId) this.ids = selection.map(item => item.objId)
this.single = selection.length!==1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 查询计量设备信息下拉树结构 */
getTreeselect() {
getMonitorInfoTree({ monitorType: 5 }).then(response => {
this.monitorInfoOptions = response.data
})
},
// 筛选节点
filterNode(value, data) {
if (!value) return true
return data.label.indexOf(value) !== -1
},
// 节点单击事件
handleNodeClick(data) {
this.queryParams.monitorCode = data.code
this.handleQuery()
},
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset()
this.open = true; this.open = true
this.title = "添加压缩空气实时数据"; this.title = '添加压缩空气实时数据'
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset()
const objId = row.objId || this.ids const objId = row.objId || this.ids
getRecordAirInstant(objId).then(response => { getRecordAirInstant(objId).then(response => {
this.form = response.data; this.form = response.data
this.open = true; this.open = true
this.title = "修改压缩空气实时数据"; this.title = '修改压缩空气实时数据'
}); })
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs['form'].validate(valid => {
if (valid) { if (valid) {
if (this.form.objId != null) { if (this.form.objId != null) {
updateRecordAirInstant(this.form).then(response => { updateRecordAirInstant(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess('修改成功')
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} else { } else {
addRecordAirInstant(this.form).then(response => { addRecordAirInstant(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess('新增成功')
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} }
} }
}); })
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const objIds = row.objId || this.ids; const objIds = row.objId || this.ids
this.$modal.confirm('是否确认删除压缩空气实时数据编号为"' + objIds + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除压缩空气实时数据编号为"' + objIds + '"的数据项？').then(function() {
return delRecordAirInstant(objIds); return delRecordAirInstant(objIds)
}).then(() => { }).then(() => {
this.getList(); this.getList()
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess('删除成功')
}).catch(() => {}); }).catch(() => {
})
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
@ -407,5 +472,5 @@
}, `recordAirInstant_${new Date().getTime()}.xlsx`) }, `recordAirInstant_${new Date().getTime()}.xlsx`)
} }
} }
}; }
</script> </script>

386
src/views/ems/record/recordNitrogenInstant/index.vue
Unescape Escape View File

@ -1,14 +1,43 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px"> <el-row :gutter="28">
<el-form-item label="计量设备编号" prop="monitorCode"> <el-col :span="5" :xs="24">
<div class="head-container">
<el-input <el-input
v-model="queryParams.monitorCode" v-model="workUnitName"
placeholder="请输入计量设备编号" placeholder="请输入计量设备名称"
clearable clearable
@keyup.enter.native="handleQuery" size="small"
prefix-icon="el-icon-search"
style="margin-bottom: 20px"
/> />
</el-form-item> </div>
<div class="head-container">
<el-tree
:data="monitorInfoOptions"
:props="monitorProps"
:expand-on-click-node="false"
:filter-node-method="filterNode"
ref="tree"
node-key="id"
default-expand-all
highlight-current
@node-click="handleNodeClick"
/>
</div>
</el-col>
<el-col :span="19" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="100px"
>
<!-- <el-form-item label="计量设备编号" prop="monitorCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.monitorCode"-->
<!-- placeholder="请输入计量设备编号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="采集时间"> <el-form-item label="采集时间">
<el-date-picker <el-date-picker
v-model="daterangeCollectTime" v-model="daterangeCollectTime"
@ -20,71 +49,22 @@
end-placeholder="结束时间" end-placeholder="结束时间"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="瞬时流量" prop="fluxFlow"> <!-- <el-form-item label="记录时间">-->
<el-input <!-- <el-date-picker-->
v-model="queryParams.fluxFlow" <!-- v-model="daterangeRecordTime"-->
placeholder="请输入瞬时流量" <!-- style="width: 340px"-->
clearable <!-- value-format="yyyy-MM-dd HH:mm:ss"-->
@keyup.enter.native="handleQuery" <!-- type="datetimerange"-->
/> <!-- range-separator="-"-->
</el-form-item> <!-- start-placeholder="开始时间"-->
<el-form-item label="累计流量" prop="steamFlow"> <!-- end-placeholder="结束时间"-->
<el-input <!-- ></el-date-picker>-->
v-model="queryParams.steamFlow" <!-- </el-form-item>-->
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="press">
<el-input
v-model="queryParams.press"
placeholder="请输入压力"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="纯度" prop="purity">
<el-input
v-model="queryParams.purity"
placeholder="请输入纯度"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="压力差值" prop="differencePress">
<el-input
v-model="queryParams.differencePress"
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>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -94,7 +74,8 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['ems/record:recordNitrogenInstant:add']" v-hasPermi="['ems/record:recordNitrogenInstant:add']"
>新增</el-button> >新增
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -105,7 +86,8 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['ems/record:recordNitrogenInstant:edit']" v-hasPermi="['ems/record:recordNitrogenInstant:edit']"
>修改</el-button> >修改
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -116,7 +98,8 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['ems/record:recordNitrogenInstant:remove']" v-hasPermi="['ems/record:recordNitrogenInstant:remove']"
>删除</el-button> >删除
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -126,15 +109,17 @@
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['ems/record:recordNitrogenInstant:export']" v-hasPermi="['ems/record:recordNitrogenInstant:export']"
>导出</el-button> >导出
</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="recordNitrogenInstantList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="recordNitrogenInstantList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="自增标识" align="center" prop="objId" v-if="columns[0].visible"/> <el-table-column label="自增标识" align="center" prop="objId" v-if="columns[0].visible"/>
<el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[1].visible"/> <el-table-column label="计量设备编号" align="center" prop="monitorCode" width="120" v-if="columns[1].visible"/>
<el-table-column label="计量设备名称" align="center" prop="monitorName" width="100" v-if="columns[10].visible"/>
<el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[2].visible"> <el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[2].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@ -151,25 +136,29 @@
<span>{{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100"> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
@click="handleUpdate(scope.row)" <!-- @click="handleUpdate(scope.row)"-->
v-hasPermi="['ems/record:recordNitrogenInstant:edit']" <!-- v-hasPermi="['ems/record:recordNitrogenInstant:edit']"-->
>修改</el-button> <!-- >修改-->
<el-button <!-- </el-button>-->
size="mini" <!-- <el-button-->
type="text" <!-- size="mini"-->
icon="el-icon-delete" <!-- type="text"-->
@click="handleDelete(scope.row)" <!-- icon="el-icon-delete"-->
v-hasPermi="['ems/record:recordNitrogenInstant:remove']" <!-- @click="handleDelete(scope.row)"-->
>删除</el-button> <!-- v-hasPermi="['ems/record:recordNitrogenInstant:remove']"-->
</template> <!-- >删除-->
</el-table-column> <!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table> </el-table>
</el-col>
</el-row>
<pagination <pagination
v-show="total>0" v-show="total>0"
@ -181,42 +170,46 @@
<!-- 添加或修改氮气实时数据对话框 --> <!-- 添加或修改氮气实时数据对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="计量设备编号" prop="monitorCode"> <el-form-item label="计量设备名称" prop="monitorCode">
<el-input v-model="form.monitorCode" placeholder="请输入计量设备编号" /> <treeselect v-model="form.monitorCode" :options="baseMonitorInfoOptions" :normalizer="normalizer"
placeholder="请选择计量设备名称"
/>
</el-form-item> </el-form-item>
<el-form-item label="采集时间" prop="collectTime"> <el-form-item label="采集时间" prop="collectTime">
<el-date-picker clearable <el-date-picker clearable
v-model="form.collectTime" v-model="form.collectTime"
type="date" type="datetime"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择采集时间"> placeholder="请选择采集时间"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="瞬时流量" prop="fluxFlow"> <el-form-item label="瞬时流量" prop="fluxFlow">
<el-input v-model="form.fluxFlow" placeholder="请输入瞬时流量" /> <el-input-number v-model="form.fluxFlow" placeholder="请输入瞬时流量"/>
</el-form-item> </el-form-item>
<el-form-item label="累计流量" prop="steamFlow"> <el-form-item label="累计流量" prop="steamFlow">
<el-input v-model="form.steamFlow" placeholder="请输入累计流量" /> <el-input-number v-model="form.steamFlow" placeholder="请输入累计流量"/>
</el-form-item> </el-form-item>
<el-form-item label="露点温度" prop="temperature"> <el-form-item label="露点温度" prop="temperature">
<el-input v-model="form.temperature" placeholder="请输入露点温度" /> <el-input-number v-model="form.temperature" placeholder="请输入露点温度"/>
</el-form-item> </el-form-item>
<el-form-item label="压力" prop="press"> <el-form-item label="压力" prop="press">
<el-input v-model="form.press" placeholder="请输入压力" /> <el-input-number v-model="form.press" placeholder="请输入压力"/>
</el-form-item> </el-form-item>
<el-form-item label="纯度" prop="purity"> <el-form-item label="纯度" prop="purity">
<el-input v-model="form.purity" placeholder="请输入纯度" /> <el-input-number v-model="form.purity" placeholder="请输入纯度"/>
</el-form-item> </el-form-item>
<el-form-item label="压力差值" prop="differencePress"> <el-form-item label="压力差值" prop="differencePress">
<el-input v-model="form.differencePress" placeholder="请输入压力差值" /> <el-input-number v-model="form.differencePress" placeholder="请输入压力差值"/>
</el-form-item> </el-form-item>
<el-form-item label="记录时间" prop="recordTime"> <el-form-item label="记录时间" prop="recordTime">
<el-date-picker clearable <el-date-picker clearable
v-model="form.recordTime" v-model="form.recordTime"
type="date" type="datetime"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择记录时间"> placeholder="请选择记录时间"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -229,12 +222,36 @@
</template> </template>
<script> <script>
import { listRecordNitrogenInstant, getRecordNitrogenInstant, delRecordNitrogenInstant, addRecordNitrogenInstant, updateRecordNitrogenInstant } from "@/api/ems/record/recordNitrogenInstant"; import {
listRecordNitrogenInstant,
getRecordNitrogenInstant,
delRecordNitrogenInstant,
addRecordNitrogenInstant,
updateRecordNitrogenInstant
} from '@/api/ems/record/recordNitrogenInstant'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import { parseTime } from '@/utils/ruoyi'
import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
export default { export default {
name: "RecordNitrogenInstant", name: 'RecordNitrogenInstant',
components: {
Treeselect
},
data() { data() {
return { return {
//下拉树List
baseMonitorInfoOptions: [],
//左侧树结构List
monitorInfoOptions: [],
workUnitName: undefined,
//计量设备信息
baseMonitorInfoList: [],
monitorProps: {
children: 'children',
label: 'label'
},
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
@ -250,7 +267,7 @@
// 氮气实时数据表格数据 // 氮气实时数据表格数据
recordNitrogenInstantList: [], recordNitrogenInstantList: [],
// 弹出层标题 // 弹出层标题
title: "", title: '',
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 记录时间时间范围 // 记录时间时间范围
@ -275,9 +292,12 @@
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
monitorCode: [
{ required: true, message: '计量设备名称不能为空', trigger: 'blur' }
]
}, },
columns: [ columns: [
{ key: 0, label: `自增标识`, visible: true }, { key: 0, label: `自增标识`, visible: false },
{ key: 1, label: `计量设备编号`, visible: true }, { key: 1, label: `计量设备编号`, visible: true },
{ key: 2, label: `采集时间`, visible: true }, { key: 2, label: `采集时间`, visible: true },
{ key: 3, label: `瞬时流量`, visible: true }, { key: 3, label: `瞬时流量`, visible: true },
@ -287,35 +307,67 @@
{ key: 7, label: `纯度`, visible: true }, { key: 7, label: `纯度`, visible: true },
{ key: 8, label: `压力差值`, visible: true }, { key: 8, label: `压力差值`, visible: true },
{ key: 9, label: `记录时间`, visible: true }, { key: 9, label: `记录时间`, visible: true },
{ key: 10, label: `计量设备名称`, visible: true }
] ]
}; }
}, },
created() { 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()
this.getTreeMonitorInfo()
this.getList()
},
watch: {
// 根据名称筛选计量设备树
workUnitName(val) {
this.$refs.tree.filter(val)
}
}, },
methods: { methods: {
/** 转换计量设备信息数据结构 */
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children
}
return {
id: node.monitorCode,
label: node.monitorName,
children: node.children
}
},
/** 查询计量设备信息下拉树结构 新增用*/
getTreeMonitorInfo() {
listBaseMonitorInfo({ monitorType: 6 }).then(response => {
this.baseMonitorInfoOptions = []
const data = { objId: 0, monitorName: '顶级节点', children: [] }
data.children = this.handleTree(response.data, 'objId', 'parentId')
this.baseMonitorInfoOptions.push(data)
})
},
/** 查询氮气实时数据列表 */ /** 查询氮气实时数据列表 */
getList() { getList() {
this.loading = true; this.loading = true
this.queryParams.params = {}; this.queryParams.params = {}
if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) { if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) {
this.queryParams.params["beginCollectTime"] = this.daterangeCollectTime[0]; this.queryParams.params['beginCollectTime'] = this.daterangeCollectTime[0]
this.queryParams.params["endCollectTime"] = this.daterangeCollectTime[1]; this.queryParams.params['endCollectTime'] = this.daterangeCollectTime[1]
} }
if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) { if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) {
this.queryParams.params["beginRecordTime"] = this.daterangeRecordTime[0]; this.queryParams.params['beginRecordTime'] = this.daterangeRecordTime[0]
this.queryParams.params["endRecordTime"] = this.daterangeRecordTime[1]; this.queryParams.params['endRecordTime'] = this.daterangeRecordTime[1]
} }
listRecordNitrogenInstant(this.queryParams).then(response => { listRecordNitrogenInstant(this.queryParams).then(response => {
this.recordNitrogenInstantList = response.rows; this.recordNitrogenInstantList = response.rows
this.total = response.total; this.total = response.total
this.loading = false; this.loading = false
}); })
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false
this.reset(); this.reset()
}, },
// 表单重置 // 表单重置
reset() { reset() {
@ -330,72 +382,92 @@
purity: null, purity: null,
differencePress: null, differencePress: null,
recordTime: null recordTime: null
}; }
this.resetForm("form"); this.resetForm('form')
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1
this.getList(); this.getList()
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.daterangeCollectTime = []; this.daterangeCollectTime = []
this.daterangeRecordTime = []; this.daterangeRecordTime = []
this.resetForm("queryForm"); this.resetForm('queryForm')
this.handleQuery(); this.handleQuery()
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.objId) this.ids = selection.map(item => item.objId)
this.single = selection.length!==1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 查询计量设备信息下拉树结构 */
getTreeselect() {
getMonitorInfoTree({ monitorType: 6 }).then(response => {
this.monitorInfoOptions = response.data
})
},
// 筛选节点
filterNode(value, data) {
if (!value) return true
return data.label.indexOf(value) !== -1
},
// 节点单击事件
handleNodeClick(data) {
this.queryParams.monitorCode = data.code
this.handleQuery()
},
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset()
this.open = true; this.open = true
this.title = "添加氮气实时数据"; this.title = '添加氮气实时数据'
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset()
const objId = row.objId || this.ids const objId = row.objId || this.ids
getRecordNitrogenInstant(objId).then(response => { getRecordNitrogenInstant(objId).then(response => {
this.form = response.data; this.form = response.data
this.open = true; this.open = true
this.title = "修改氮气实时数据"; this.title = '修改氮气实时数据'
}); })
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs['form'].validate(valid => {
if (valid) { if (valid) {
if (this.form.objId != null) { if (this.form.objId != null) {
updateRecordNitrogenInstant(this.form).then(response => { updateRecordNitrogenInstant(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess('修改成功')
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} else { } else {
addRecordNitrogenInstant(this.form).then(response => { addRecordNitrogenInstant(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess('新增成功')
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} }
} }
}); })
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const objIds = row.objId || this.ids; const objIds = row.objId || this.ids
this.$modal.confirm('是否确认删除氮气实时数据编号为"' + objIds + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除氮气实时数据编号为"' + objIds + '"的数据项？').then(function() {
return delRecordNitrogenInstant(objIds); return delRecordNitrogenInstant(objIds)
}).then(() => { }).then(() => {
this.getList(); this.getList()
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess('删除成功')
}).catch(() => {}); }).catch(() => {
})
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
@ -404,5 +476,5 @@
}, `recordNitrogenInstant_${new Date().getTime()}.xlsx`) }, `recordNitrogenInstant_${new Date().getTime()}.xlsx`)
} }
} }
}; }
</script> </script>

Write Preview
Loading…
Cancel
Save