From d5a26ba2eab0a966c1754ef1d9918bfcb6e1e289 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 26 二月 2025 15:07:23 +0800
Subject: [PATCH] 合并冲突
---
src/components/do/b6-device-management/b6-data-acquisition-config.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/do/b6-device-management/b6-data-acquisition-config.vue b/src/components/do/b6-device-management/b6-data-acquisition-config.vue
index a1c0f07..5696dcd 100644
--- a/src/components/do/b6-device-management/b6-data-acquisition-config.vue
+++ b/src/components/do/b6-device-management/b6-data-acquisition-config.vue
@@ -573,14 +573,14 @@
});
this.domains.forEach((i, index) => {
let isIncludes = false
- if (this.configForm.formula && this.configForm.formula != "") {
+ if (this.configForm.formula && this.configForm.formula !== "") {
for (let formula in this.formulas) {
if (this.configForm.formula.includes(this.formulas[formula].label)) {
isIncludes = true
}
}
}
- if (isIncludes === false) {
+ if (isIncludes === false && this.configForm.formula !== "") {
i.formula = "(" + this.configForm.formula + ")";
} else {
i.formula = this.configForm.formula;
--
Gitblit v1.9.3