gaosp
2024-01-21 b91c71780549b06f0729b50cf7b94a1c037968b9
update
已修改2个文件
33 ■■■■ 文件已修改
src/container/mapPreview/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/container/workshop/device.vue 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/container/mapPreview/index.vue
@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-01-05 22:26:22
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-21 22:43:32
 * @LastEditTime: 2024-01-21 22:58:11
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/mapPreview/index.vue
-->
<template>
src/container/workshop/device.vue
@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-01-13 20:46:33
 * @LastEditors: Sneed
 * @LastEditTime: 2024-01-21 22:33:42
 * @LastEditTime: 2024-01-21 22:53:27
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/workshop/device.vue
-->
<template>
@@ -87,15 +87,9 @@
            return this.info.cycleCount || 0
        },
        machineName() {
            debugger
            let machineName = ''
            if (this.info.machineName) return this.info.machineName
            if (this.deviceList.length > 0) {
                try {
                    machineName = this.deviceList.find(item => item.machineId === this.id).machineName
                } catch (error) {
                    // console.info(error)
                }
            }
            if (this.plantDeviceList.length > 0) {
                try {
                    machineName = this.plantDeviceList.find(item => item.machineId === this.id).machineName
@@ -103,6 +97,14 @@
                    // console.info(error) 
                }
            }
            if (this.deviceList.length > 0) {
                try {
                    machineName = this.deviceList.find(item => item.machineId === this.id).machineName
                } catch (error) {
                    // console.info(error)
                }
            }
            if (machineName) {
                return machineName
@@ -112,18 +114,19 @@
        pic() {
            let pic = ''
            if (this.info.pic) return this.info.pic
            if (this.deviceList.length > 0) {
                try {
                    pic = this.deviceList.find(item => item.machineId === this.id).pic
                } catch (error) {
                }
            }
            if (this.plantDeviceList.length > 0) {
                try {
                    pic = this.plantDeviceList.find(item => item.machineId === this.id).pic
                } catch (error) {
                }
            }
            if (this.deviceList.length > 0) {
                try {
                    pic = this.deviceList.find(item => item.machineId === this.id).pic
                } catch (error) {
                }
            }
            if (pic) {
                return pic
            }