diff --git a/src/views/cs/index2.vue b/src/views/cs/index2.vue index 14d0f05..856c798 100644 --- a/src/views/cs/index2.vue +++ b/src/views/cs/index2.vue @@ -66,13 +66,12 @@
- -
- 烘房{{ k + 1 }} (产量:{{ i.quantity }}车) + 烘房{{ k + 1 }} (产量:{{ ((hfData.find(v=>v&&v.equCode===`H${k+1}`))||{}).quantity ||0 }}车) -
+
-
{{ (i||{}).equName }}
+
{{ ((hfData.find(v=> v&&v.equCode===`H${k+1}`))||{}).equName }}
设备产量: {{ (i||{}).quantity }}
设备状态: {{ - parseFloat((i||{}).quantity) > 0 ? '运行' : '停机' + parseFloat(((hfData.find(v=> v&&v.equCode===`H${k+1}`))||{}).quantity) > 0 ? '运行' : '停机' }}
@@ -96,10 +95,10 @@ :style="`top: ${equipmentLocation[k].top}%;left: ${equipmentLocation[k].left}%;`">
-
{{ (i||{}).equName }}
-
设备产量: {{ (i||{}).quantity }}
+
{{ ((equipmentData.find(v=>v&&v.equCode===`C${k+1}`))||{}).equName }}
+
设备产量: {{ ((equipmentData.find(v=>v&&v.equCode===`C${k+1}`))||{}).quantity }}
设备状态: {{ - parseFloat((i||{}).quantity) > 0 ? '运行' : '停机' + parseFloat(((equipmentData.find(v=>v&&v.equCode===`C${k+1}`))||{}).quantity) > 0 ? '运行' : '停机' }}
@@ -384,8 +383,7 @@ export default { } this.hfData = hfArr this.equipmentData = equipmentArr - console.log(this.hfData) - console.log(this.equipmentData) + // console.log(this.hfData) }) } },