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-09-20 15:21:54 +08:00
parent 6603fc3acb
commit 6a19cccaef
2 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
imt-ui/src/views/system/alarm/equipalarmdata/index.vue
View File

@ -10,13 +10,17 @@
label-width="68px"
style="text-align:right"
>
<el-form-item label="机床设备" prop="equipId">
<el-form-item
label="机床设备"
prop="equipId"
>
<el-cascader
v-model="cascaderValue"
:options="equipCascader"
:props="{ value: 'id',label: 'name',children: 'children'}"
clearable
@change="cascaderChange"></el-cascader>
@change="cascaderChange"
></el-cascader>
</el-form-item>
<!-- <el-form-item
label="机床组件id"
@ -284,7 +288,10 @@
<script>
import * as EquipAlarmDataApi from "@/api/system/alarm/equipalarmdata";
import EquipAlarmDataForm from "./EquipAlarmDataForm.vue";
import {getEquipCascader, getEquipSelection} from "@/api/system/equip/equipInfo";
import {
getEquipCascader,
getEquipSelection,
} from "@/api/system/equip/equipInfo";
export default {
name: "EquipAlarmData",
components: {
@ -321,6 +328,7 @@ export default {
latestAlarmTime: [],
status: null,
equipAnalyseStatus: null,
alarmType: 0,
},
equipSelection: [],
};
@ -343,14 +351,14 @@ export default {
const res = await EquipAlarmDataApi.getEquipAlarmDataPage(
this.queryParams
);
await getEquipCascader().then(res=>{
res.forEach(item=>{
await getEquipCascader().then((res) => {
res.forEach((item) => {
if (item.children == null) {
item.disabled = true;
}
})
});
this.equipCascader = res;
})
});
this.list = res.data.list;
this.total = res.data.total;
} finally {

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

@ -10,13 +10,17 @@
label-width="68px"
style="text-align:right"
>
<el-form-item label="机床设备" prop="equipId">
<el-form-item
label="机床设备"
prop="equipId"
>
<el-cascader
v-model="cascaderValue"
:options="equipCascader"
:props="{ value: 'id',label: 'name',children: 'children'}"
clearable
@change="cascaderChange"></el-cascader>
@change="cascaderChange"
></el-cascader>
</el-form-item>
<!-- <el-form-item
label="机床组件id"
@ -202,7 +206,7 @@
<span>{{ parseTime(scope.row.latestAlarmTime) }}</span>
</template>
</el-table-column>
<el-table-column
<!-- <el-table-column
label="状态"
align="center"
prop="status"
@ -213,7 +217,7 @@
:value="scope.row.status"
/>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column
label="状态"
align="center"
@ -275,7 +279,10 @@
<script>
import * as EquipAlarmDataApi from "@/api/system/alarm/equipalarmdata";
import EquipAlarmDataForm from "./EquipAlarmDataForm.vue";
import {getEquipCascader, getEquipSelection} from "@/api/system/equip/equipInfo";
import {
getEquipCascader,
getEquipSelection,
} from "@/api/system/equip/equipInfo";
export default {
name: "EquipAlarmData",
components: {
@ -335,14 +342,14 @@ export default {
const res = await EquipAlarmDataApi.getEquipAlarmDataPage(
this.queryParams
);
await getEquipCascader().then(res=>{
res.forEach(item=>{
await getEquipCascader().then((res) => {
res.forEach((item) => {
if (item.children == null) {
item.disabled = true;
}
})
});
this.equipCascader = res;
})
});
this.list = res.data.list;
this.total = res.data.total;
} finally {