From 5b9a1d6cb3a7d59c8f2de83c495bba1a069b2723 Mon Sep 17 00:00:00 2001
From: gaosp <gaosp>
Date: 星期五, 19 一月 2024 00:23:15 +0800
Subject: [PATCH] update
---
src/container/workshop/device.vue | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/container/workshop/device.vue b/src/container/workshop/device.vue
index 00bf64d..37dc837 100644
--- a/src/container/workshop/device.vue
+++ b/src/container/workshop/device.vue
@@ -1,13 +1,13 @@
<!--
* @Date: 2024-01-13 20:46:33
* @LastEditors: Sneed
- * @LastEditTime: 2024-01-16 00:32:38
+ * @LastEditTime: 2024-01-17 23:06:46
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/workshop/device.vue
-->
<template>
<div class="device-item">
<el-checkbox class="care" v-model="care" @change="change"></el-checkbox>
- <p>{{ name }}</p>
+ <p>{{ machineName }}</p>
<div class="device-item-box">
<div class="img">
<span class="img-status" v-if="item.status === 'STOP'">鍋滄満</span>
@@ -68,18 +68,6 @@
}
}
},
- computed: {
- name () {
- let name = ''
- let arr = [...this.deviceList,...this.plantDeviceList]
- arr.find(item => {
- if(item.machineId=== this.id) {
- name = item.machineName
- }
- })
- return machineName
- }
- },
data () {
return {
care: false,
@@ -95,6 +83,19 @@
},
cycleCount () {
return this.info.cycleCount || 0
+ },
+ machineName () {
+ let machineName = ''
+ try {
+ machineName = this.deviceList.find(item => item.machineId=== this.id).machineName
+ } catch (error) {console.error(error)}
+ try {
+ machineName = this.plantDeviceList.find(item => item.machineId=== this.id).machineName
+ } catch (error) {console.error(error)}
+ if (machineName) {
+ return machineName
+ }
+ return ''
}
},
methods: {
--
Gitblit v1.9.3