From 11334b031f803aa3623137f130f4d1a3c5fc9999 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期五, 08 三月 2024 09:02:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/a6-device-management.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index 9793aaf..6e6d2e8 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -226,7 +226,7 @@
<el-form-item label="鍑嗙‘搴﹂噺鍊�:" >
<el-input :disabled="isUp" v-model="formData.accurateMeasurement" size="small"></el-input>
</el-form-item>
- <el-form-item label="澶囨敞:" >
+ <el-form-item label="澶囨敞:" v-show="!isUp" >
<el-input :disabled="isUp" v-model="formData.notes" size="small"></el-input>
</el-form-item>
</el-form>
@@ -376,7 +376,8 @@
},
linkEvent:{
deviceName:{
- method:'selectAllByOne'
+ id: 'delete',
+ method:'selectAllByOne',
}
},
selectField: {},
--
Gitblit v1.9.3