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

refactor(ems): 优化数据查询和展示

Browse Source 
- 修改为记录时间查询框，调整日期选择器的显示和使用
- 统一排序方式，使用 objId 进行排序
boardTest
zch 2 months ago
parent 0577d123b3
commit 2c770d2db4
4 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File

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

@ -28,15 +28,15 @@
</el-col> </el-col>
<el-col :span="19" :xs="24"> <el-col :span="19" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="计量设备编号" prop="monitorId"> <!-- <el-form-item label="计量设备编号" prop="monitorId">
<el-input <el-input
v-model="queryParams.monitorId" v-model="queryParams.monitorId"
placeholder="请输入计量设备编号" placeholder="请输入计量设备编号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>-->
<el-form-item label="采集时间"> <!-- <el-form-item label="采集时间">
<el-date-picker <el-date-picker
v-model="daterangeCollectTime" v-model="daterangeCollectTime"
style="width: 340px" style="width: 340px"
@ -46,7 +46,7 @@
start-placeholder="开始时间" start-placeholder="开始时间"
end-placeholder="结束时间" end-placeholder="结束时间"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>-->
<!-- <el-form-item label="温度" prop="tempreture"> <!-- <el-form-item label="温度" prop="tempreture">
<el-input <el-input
v-model="queryParams.tempreture" v-model="queryParams.tempreture"
@ -220,9 +220,9 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-col> </el-col>
</el-row> </el-row>
<pagination <pagination
v-show="total>0" v-show="total>0"
@ -301,12 +301,12 @@
</template> </template>
<script> <script>
import { import {
listRecordIOTInstant, listRecordIOTInstant,
getRecordIOTInstant, getRecordIOTInstant,
delRecordIOTInstant, delRecordIOTInstant,
addRecordIOTInstant, addRecordIOTInstant,
updateRecordIOTInstant } updateRecordIOTInstant }
from "@/api/ems/record/recordIOTInstant"; from "@/api/ems/record/recordIOTInstant";
import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo' import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
import Treeselect from '@riophae/vue-treeselect' import Treeselect from '@riophae/vue-treeselect'
@ -397,7 +397,7 @@
// const nowDate = this.parseTime(new Date(), '{y}-{m}-{d}') // const nowDate = this.parseTime(new Date(), '{y}-{m}-{d}')
// this.daterangeCollectTime[0] = nowDate + ' 00:00:00' // this.daterangeCollectTime[0] = nowDate + ' 00:00:00'
// this.daterangeCollectTime[1] = nowDate + ' 23:59:59' // this.daterangeCollectTime[1] = nowDate + ' 23:59:59'
// this.daterangeRecordTime[0] = nowDate + ' 00:00:00' // this.daterangeRecordTime[0] = nowDate + ' 00:00:00'
// this.daterangeRecordTime[1] = nowDate + ' 23:59:59' // this.daterangeRecordTime[1] = nowDate + ' 23:59:59'
this.getList(); this.getList();

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

@ -41,7 +41,7 @@
end-placeholder="结束时间" end-placeholder="结束时间"
></el-date-picker> ></el-date-picker>
</el-form-item>--> </el-form-item>-->
<el-form-item label="采集时间"> <!-- <el-form-item label="采集时间">
<el-date-picker <el-date-picker
v-model="daterangeCollectTime" v-model="daterangeCollectTime"
style="width: 340px" style="width: 340px"
@ -51,15 +51,15 @@
start-placeholder="开始时间" start-placeholder="开始时间"
end-placeholder="结束时间"> end-placeholder="结束时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>-->
<el-form-item label="振动传感器编号" prop="sensorId"> <!-- <el-form-item label="振动传感器编号" prop="sensorId">
<el-input <el-input
v-model="queryParams.sensorId" v-model="queryParams.sensorId"
placeholder="请输入振动传感器编号" placeholder="请输入振动传感器编号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>-->
<!-- <el-form-item label="速度(mm/s)" prop="speed"> <!-- <el-form-item label="速度(mm/s)" prop="speed">
<el-input <el-input
v-model="queryParams.speed" v-model="queryParams.speed"

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

@ -38,9 +38,9 @@
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="采集时间"> <el-form-item label="记录时间">
<el-date-picker <el-date-picker
v-model="daterangeCollectTime" v-model="daterangeRecordTime"
style="width: 340px" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" type="datetimerange"
@ -95,7 +95,7 @@ export default {
//计量设备信息 //计量设备信息
baseMonitorInfoList: [], baseMonitorInfoList: [],
// 采集方式时间范围 // 采集方式时间范围
daterangeCollectTime: [], daterangeRecordTime: [],
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
@ -163,8 +163,8 @@ export default {
}, },
created() { created() {
const nowDate = parseTime(new Date(), '{y}-{m}-{d}') const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
this.daterangeCollectTime[0] = nowDate + ' 00:00:00' this.daterangeRecordTime[0] = nowDate + ' 00:00:00'
this.daterangeCollectTime[1] = nowDate + ' 23:59:59' this.daterangeRecordTime[1] = nowDate + ' 23:59:59'
this.getTreeselect() this.getTreeselect()
this.getList() this.getList()
}, },
@ -190,9 +190,9 @@ export default {
getList() { getList() {
this.loading = true this.loading = true
this.queryParams.params = {} this.queryParams.params = {}
if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) { if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) {
this.queryParams.params['beginCollectTime'] = this.daterangeCollectTime[0] this.queryParams.params['beginRecordTime'] = this.daterangeRecordTime[0]
this.queryParams.params['endCollectTime'] = this.daterangeCollectTime[1] this.queryParams.params['endRecordTime'] = this.daterangeRecordTime[1]
} }
console.log(this.monitorInfoOptions) console.log(this.monitorInfoOptions)
this.getChart() this.getChart()

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

@ -38,9 +38,9 @@
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="采集时间"> <el-form-item label="记录时间">
<el-date-picker <el-date-picker
v-model="daterangeCollectTime" v-model="daterangeRecordTime"
style="width: 340px" style="width: 340px"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" type="datetimerange"
@ -95,7 +95,7 @@ export default {
//计量设备信息 //计量设备信息
baseMonitorInfoList: [], baseMonitorInfoList: [],
// 采集方式时间范围 // 采集方式时间范围
daterangeCollectTime: [], daterangeRecordTime: [],
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
@ -153,8 +153,8 @@ export default {
}, },
created() { created() {
const nowDate = parseTime(new Date(), '{y}-{m}-{d}') const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
this.daterangeCollectTime[0] = nowDate + ' 00:00:00' this.daterangeRecordTime[0] = nowDate + ' 00:00:00'
this.daterangeCollectTime[1] = nowDate + ' 23:59:59' this.daterangeRecordTime[1] = nowDate + ' 23:59:59'
this.getTreeselect() this.getTreeselect()
this.getList() this.getList()
}, },
@ -180,9 +180,9 @@ export default {
getList() { getList() {
this.loading = true this.loading = true
this.queryParams.params = {} this.queryParams.params = {}
if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) { if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) {
this.queryParams.params['beginCollectTime'] = this.daterangeCollectTime[0] this.queryParams.params['beginRecordTime'] = this.daterangeRecordTime[0]
this.queryParams.params['endCollectTime'] = this.daterangeCollectTime[1] this.queryParams.params['endRecordTime'] = this.daterangeRecordTime[1]
} }
// 将monitorCode改为sensorId // 将monitorCode改为sensorId
if (this.queryParams.sensorId !== null) { if (this.queryParams.sensorId !== null) {

Write Preview
Loading…
Cancel
Save