TuringsMachine/imt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备信息分页查询查询顺序和轴承状态展示

Browse Source
This commit is contained in:
zhangjunwen 2024-11-01 14:43:16 +08:00
parent 738d691042
commit 16e282a20a
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
imt-ui/src/views/system/alarm/equiptrendalarm/index.vue
View File

@ -164,17 +164,22 @@
align="center" align="center"
prop="modelName" prop="modelName"
/> />
<el-table-column
label="机床名称"
align="center"
prop="equipName"
/>
<el-table-column <el-table-column
label="机床编号" label="机床编号"
align="center" align="center"
prop="equipNo" prop="equipNo"
/> />
<el-table-column <!-- <el-table-column
label="机床组件" label="机床组件"
align="center" align="center"
prop="componentName" prop="componentName"
/> /> -->
<el-table-column <!-- <el-table-column
label="报警等级" label="报警等级"
align="center" align="center"
prop="alarmLevel" prop="alarmLevel"
@ -185,8 +190,8 @@
:value="scope.row.alarmLevel" :value="scope.row.alarmLevel"
/> />
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column <!-- <el-table-column
label="首次报警时间" label="首次报警时间"
align="center" align="center"
prop="firstAlarmTime" prop="firstAlarmTime"
@ -205,7 +210,7 @@
<template v-slot="scope"> <template v-slot="scope">
<span>{{ parseTime(scope.row.latestAlarmTime) }}</span> <span>{{ parseTime(scope.row.latestAlarmTime) }}</span>
</template> </template>
</el-table-column> </el-table-column> -->
<!-- <el-table-column <!-- <el-table-column
label="状态" label="状态"
align="center" align="center"
@ -219,14 +224,14 @@
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column <el-table-column
label="状态" label="轴承状态"
align="center" align="center"
prop="equipAnalyseStatus" prop="status"
> >
<template v-slot="scope"> <template v-slot="scope">
<dict-tag <dict-tag
:type="DICT_TYPE.TREND_ANALY_STATUS" :type="DICT_TYPE.TREND_ANALY_STATUS"
:value="scope.row.equipAnalyseStatus" :value="scope.row.status"
/> />
</template> </template>
</el-table-column> </el-table-column>
@ -279,6 +284,7 @@
<script> <script>
import * as EquipAlarmDataApi from "@/api/system/alarm/equipalarmdata"; import * as EquipAlarmDataApi from "@/api/system/alarm/equipalarmdata";
import EquipAlarmDataForm from "./EquipAlarmDataForm.vue"; import EquipAlarmDataForm from "./EquipAlarmDataForm.vue";
import * as EquipInfoApi from "@/api/system/equip/equipInfo";
import { import {
getEquipCascader, getEquipCascader,
getEquipSelection, getEquipSelection,
@ -339,9 +345,10 @@ export default {
async getList() { async getList() {
try { try {
this.loading = true; this.loading = true;
const res = await EquipAlarmDataApi.getEquipAlarmDataPage( // const res = await EquipAlarmDataApi.getEquipAlarmDataPage(
this.queryParams // this.queryParams
); // );
const res = await EquipInfoApi.getEquipInfoPage(this.queryParams);
await getEquipCascader().then((res) => { await getEquipCascader().then((res) => {
res.forEach((item) => { res.forEach((item) => {
if (item.children == null) { if (item.children == null) {