From ce46ebeae31f1774d0cfd8ce291c573611ad882a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Sat, 16 Dec 2023 13:11:52 +0800 Subject: [PATCH 1/3] 1 --- src/views/page/realTime.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue index a350952..2854778 100644 --- a/src/views/page/realTime.vue +++ b/src/views/page/realTime.vue @@ -698,10 +698,18 @@ export default { // }else{ num = el.environmentData + el1.unit // } - if (el.equipmentNumber == 0) { + if (el.equipmentNumber == 0) { + if (el.targetValue == 1) { + name = '1#目标' + el.environmentDataId + } else { name = '1#平均' + el.environmentDataId + } } else if (el.equipmentNumber == 15) { + if (el.targetValue == 1) { + name = '2#目标' + el.environmentDataId + } else { name = '2#平均' + el.environmentDataId + } } else { name = el.equipmentNumber + '#' + el.environmentDataId } -- 2.40.1 From 2295d61251857a340befcacaff0aff1c9589a9fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Sat, 16 Dec 2023 13:36:54 +0800 Subject: [PATCH 2/3] 1 --- src/views/page/realTime.vue | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue index 2854778..eaa486e 100644 --- a/src/views/page/realTime.vue +++ b/src/views/page/realTime.vue @@ -698,22 +698,38 @@ export default { // }else{ num = el.environmentData + el1.unit // } - if (el.equipmentNumber == 0) { - if (el.targetValue == 1) { - name = '1#目标' + el.environmentDataId - } else { + // if (el.equipmentNumber == 0) { + // if (el.targetValue == 1) { + // name = '1#目标' + el.environmentDataId + // } else { + // name = '1#平均' + el.environmentDataId + // } + // } else if (el.equipmentNumber == 15) { + // if (el.targetValue == 1) { + // name = '2#目标' + el.environmentDataId + // } else { + // name = '2#平均' + el.environmentDataId + // } + // } else { + // name = el.equipmentNumber + '#' + el.environmentDataId + // } + if (el.equipmentNumber == 0) { + name = '1#平均' + el.environmentDataId - } + } else if (el.equipmentNumber == 15) { - if (el.targetValue == 1) { - name = '2#目标' + el.environmentDataId - } else { + name = '2#平均' + el.environmentDataId - } + } else { + if (el.targetValue == 1) { + name = '1#目标' + el.environmentDataId + } else{ name = el.equipmentNumber + '#' + el.environmentDataId + } } + this.list.push({ ...el, name: name, -- 2.40.1 From 18c8159b0b1bce8cb8fcd59b810ffddaefe5f5cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Sat, 16 Dec 2023 13:40:10 +0800 Subject: [PATCH 3/3] 1 --- src/views/page/realTime.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue index eaa486e..7cf1e81 100644 --- a/src/views/page/realTime.vue +++ b/src/views/page/realTime.vue @@ -794,14 +794,21 @@ export default { // }else{ num = el.environmentData + el1.unit // } - if (el.equipmentNumber == 0) { + if (el.equipmentNumber == 0) { + name = '1#平均' + el.environmentDataId + } else if (el.equipmentNumber == 15) { + name = '2#平均' + el.environmentDataId + } else { + if (el.targetValue == 1) { + name = '1#目标' + el.environmentDataId + } else{ name = el.equipmentNumber + '#' + el.environmentDataId + } } - this.list.push({ ...el, name: name, -- 2.40.1