From b7eedb41516a6ab02526e64177331a9669f4d3cb Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 15:54:23 +0800
Subject: [PATCH] 修改冲突
---
src/components/do/a6-facilities-environment/facilities-environmental-conditions/power-supply-stability.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/components/do/a6-facilities-environment/facilities-environmental-conditions/power-supply-stability.vue b/src/components/do/a6-facilities-environment/facilities-environmental-conditions/power-supply-stability.vue
index c28e752..857a47c 100644
--- a/src/components/do/a6-facilities-environment/facilities-environmental-conditions/power-supply-stability.vue
+++ b/src/components/do/a6-facilities-environment/facilities-environmental-conditions/power-supply-stability.vue
@@ -255,7 +255,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