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

change-震动实时数据页面显示震动传感器名称（计量设备名称）

Browse Source
boardTest
zangch 10 months ago
parent 5ee8b399f4
commit 8e2d2edee3
2 changed files with 16 additions and 87 deletions
Show Stats Download Patch File Download Diff File

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

@ -165,7 +165,6 @@
</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-column type="selection" width="55" align="center" />
<!-- <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>-->
@ -175,16 +174,17 @@
</template>
</el-table-column>
<el-table-column label="震动传感器编号" align="center" prop="sensorId" v-if="columns[2].visible"/>
<el-table-column label="速度(mm/s)" align="center" prop="speed" v-if="columns[3].visible"/>
<el-table-column label="位移(um)" align="center" prop="displacement" v-if="columns[4].visible"/>
<el-table-column label="加速度(g)" align="center" prop="acceleration" v-if="columns[5].visible"/>
<el-table-column label="温度(℃)" align="center" prop="temperature" v-if="columns[6].visible"/>
<el-table-column label="记录时间" align="center" prop="recodeTime" width="180" v-if="columns[7].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>
<el-table-column label="备注" align="center" prop="remark" v-if="columns[8].visible"/>
<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">
<template slot-scope="scope">
<el-button
@ -298,10 +298,8 @@ export default {
name: "RecordVibrationInstant",
data() {
return {
workUnitName: undefined,
monitorInfoOptions: [],
// 遮罩层
loading: true,
// 选中数组
@ -335,15 +333,14 @@ export default {
acceleration: null,
temperature: null,
recodeTime: null,
monitorName: null,
},
// 表单参数
form: {},
monitorProps: {
children: 'children',
label: 'label'
},
// 表单校验
rules: {
sensorId: [
@ -360,12 +357,13 @@ export default {
{ key: 0, label: `主键标识`, visible: true },
{ 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 },
{ 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 },
]
};
},
@ -436,7 +434,6 @@ export default {
acceleration: null,
temperature: null,
recodeTime: null,
remark: null
};
this.resetForm("form");
},

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

@ -148,13 +148,6 @@ export default {
{ key: 6, label: `温度(℃)`, visible: true },
{ key: 7, label: `记录时间`, visible: true },
{ key: 8, label: `备注`, visible: true },
/* { key: 9, label: `记录时间`, visible: true },
{ key: 10, label: `功率因数`, visible: true },
{ key: 11, label: `正向有功`, visible: true },
{ key: 12, label: `有功功率`, visible: false },
{ key: 13, label: `无功功率`, visible: false },
{ key: 14, label: `采集方式`, visible: true },
{ key: 15, label: `计量设备名称`, visible: true }*/
]
}
},
@ -191,16 +184,10 @@ export default {
this.queryParams.params['beginCollectTime'] = this.daterangeCollectTime[0]
this.queryParams.params['endCollectTime'] = this.daterangeCollectTime[1]
}
// 将monitorCode改为sensorId
if (this.queryParams.sensorId !== null) {
this.queryParams.params['sensorId'] = this.queryParams.sensorId;
}
console.log("this.sensorId"+this.sensorId)
console.log("this.queryParams.sensorId"+this.queryParams.sensorId)
this.getChart()
},
@ -268,7 +255,7 @@ export default {
this.handleQuery()
},
/** 电流电压曲线 */
/** 震动曲线 */
async getChart() {
if (this.queryParams.sensorId == null) {
return
@ -366,43 +353,6 @@ export default {
// },
data: data.map(e => e.speed)
},
/*{
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.displacement)
},
{
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.acceleration)
}*/
]
}
let option2 = {
@ -590,24 +540,6 @@ export default {
// },
data: data.map(e => e.displacement)
},
/* {
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.acceleration)
}*/
]
}
let option4 = {

Write Preview
Loading…
Cancel
Save