From 06eee0ff7bafacad972f24d6716e46ad2ba09ff0 Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Mon, 23 Oct 2023 16:41:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95bug=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=AC=AC7=E6=B3=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/model/alert/policy.vue | 8 +++++---
 src/views/model/device/index.vue | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/model/alert/policy.vue b/src/views/model/alert/policy.vue
index ed4c3ae..7886554 100644
--- a/src/views/model/alert/policy.vue
+++ b/src/views/model/alert/policy.vue
@@ -482,7 +482,7 @@ function getMethodName(methodIds){
         if(methodNameTable != ""){
           methodNameTable += ",";
         }
-        methodNameTable = item.methodName;
+        methodNameTable = methodNameTable + item.methodName;
       };
     })
   })
@@ -535,8 +535,10 @@ function toggleCollapse() {
 }
 
 function getBoolValueDic(bool) {
-  if(bool){
-    return "1";
+  if(bool == null || bool == undefined){
+    return;
+  }else if(bool){
+    return "1"
   }
   return "0";
 }
diff --git a/src/views/model/device/index.vue b/src/views/model/device/index.vue
index 2417c8d..ad9a2df 100644
--- a/src/views/model/device/index.vue
+++ b/src/views/model/device/index.vue
@@ -289,7 +289,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="主键" prop="uuid">
-              <el-input disabled v-model="form.uuid" placeholder="请输入主键" />
+              <el-input v-model="form.uuid" placeholder="请输入主键" />
             </el-form-item>
           </el-col>
           <el-col :span="12">