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/a6-facilities-environment/facilities-environmental-conditions/illuminance-recording.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/components/do/a6-facilities-environment/facilities-environmental-conditions/illuminance-recording.vue b/src/components/do/a6-facilities-environment/facilities-environmental-conditions/illuminance-recording.vue
index 36f763c..6b428c9 100644
--- a/src/components/do/a6-facilities-environment/facilities-environmental-conditions/illuminance-recording.vue
+++ b/src/components/do/a6-facilities-environment/facilities-environmental-conditions/illuminance-recording.vue
@@ -289,7 +289,7 @@
},
openDialog() {
this.$axios.get(this.$api.deviceScope.treeDevice).then(res => {
- this.cascaderList = res.data;
+ this.cascaderList = res.data
});
this.$nextTick(() => {
this.$refs['form'].clearValidate()
--
Gitblit v1.9.3