diff --git a/src/components/EUpdateTable/EFailMessage.vue b/src/components/EUpdateTable/EFailMessage.vue
index a9213349..8ad5a40c 100644
--- a/src/components/EUpdateTable/EFailMessage.vue
+++ b/src/components/EUpdateTable/EFailMessage.vue
@@ -30,7 +30,7 @@ export default {
     handleVerification() {
       this.$emit("verification", this.form, (msg) => {
         this.message = msg;
-        return;
+        return msg ? true : false;
       });
     },
   },
diff --git a/src/components/EUpdateTable/ETableInput.vue b/src/components/EUpdateTable/ETableInput.vue
index cb7741e7..15a130a6 100644
--- a/src/components/EUpdateTable/ETableInput.vue
+++ b/src/components/EUpdateTable/ETableInput.vue
@@ -45,7 +45,7 @@ export default {
         this.$forceUpdate()
     },
     handleVerification(e, callback) {
-        this.$emit('handleVerification', this.form, callback);
+      this.$emit('handleVerification', this.form, callback);
     }
   }
 };
diff --git a/src/views/profile/DeviceAlarmConfig/DeviceAlarmConfig.vue b/src/views/profile/DeviceAlarmConfig/DeviceAlarmConfig.vue
index 4ab9d528..e4a266b0 100644
--- a/src/views/profile/DeviceAlarmConfig/DeviceAlarmConfig.vue
+++ b/src/views/profile/DeviceAlarmConfig/DeviceAlarmConfig.vue
@@ -27,7 +27,8 @@
         </el-popover>
       </el-col>
     </el-row>
-    <el-table
+    <!-- <el-form class="base-form" ref="baseForm" :model="baseForm" :rules="rules" auto-complete="on"> -->
+      <el-table
       border
       :loading="loading"
       :data="list"
@@ -94,6 +95,9 @@
       >
       <template slot-scope="scope">
         <e-table-input  @handleVerification="alarmValueTableCallback" :disabled="!scope.row.alarmSta" :form="scope.row" pops="alarmValue" />
+        <!-- <el-form-item :prop="'demoList.'+scope.$index+'.alarmValue'" :rules="tableFormRules.alarmValue" class="all">
+          <el-input v-model="scope.row.alarmValue" placeholder="请输入" clearable @focus="$refs.baseForm.clearValidate(`demoList.${scope.$index}.alarmValue`)"></el-input>
+        </el-form-item> -->
       </template>
     
     </el-table-column>
@@ -122,7 +126,7 @@
         align="center"
       >
         <template slot-scope="scope">
-          <e-table-input  @handleVerification="warnValueTableCallback" :disabled="!scope.row.warnSta" :form="scope.row" pops="warnValue" />
+          <e-table-input  @handleVerification="warnValueTableCallback"  :disabled="!scope.row.warnSta" :form="scope.row" pops="warnValue" />
         </template>
       </el-table-column>
       <el-table-column
@@ -142,6 +146,8 @@
         </template>
       </el-table-column>
     </el-table>
+    <!-- </el-form> -->
+    
 
     <dialog-template
       :title="title"
@@ -269,6 +275,9 @@ export default {
       title: "修改",
       open: false,
       form: {},
+      baseForm: {
+        list: []
+      },
       updateIndex: null,
       isAck: false,
       disabledAck: false,
@@ -304,6 +313,7 @@ export default {
           },
         ],
       },
+      ackList: [],
     };
   },
   created() {
@@ -316,35 +326,45 @@ export default {
     deviceKey() {
       this.getList();
     },
+    list: {
+      deep: true,
+      handler: function () {
+          this.disabledAck = false;
+      }
+    }
   },
   methods: {
     handleAlarmSta(v) {
       console.log(v)
     },
 
+    handleDisableAce(status) {
+      if(status && this.disabledAck === false) {
+        this.disabledAck = status;
+      }
+    },
     alarmValueTableCallback(row, callback) {
-      console.log(row)
       if (!row.alarmSta) {
-        callback();
+        this.handleDisableAce(callback());
         return
       }
 
       if(!row.alarmValue || row.alarmValue === 0) {
-        callback('告警值不能为空！')
-        return
+        this.handleDisableAce(callback('告警值不能为空！'));
+        return;
       }
 
       const isExp =
         /^((\-)*([1-9][0-9]*)|(\-)*(([0]\.\d{1,}|[1-9][0-9]*\.\d{1,})))$/;
 
       if (row.alarmValue && !isExp.test(row.alarmValue)) {
-        callback("只可以输入大于0的数字类型！");
-        return
+        this.handleDisableAce(callback("只可以输入大于0的数字类型！"));
+        return;
       }
 
       if (!row.warnSta) {
-        callback();
-        return
+        this.handleDisableAce(callback());
+        return;
       }
 
       /*if (this.uvpList.indexOf(row.type) >= 0) {
@@ -364,17 +384,18 @@ export default {
           return
         }
       }*/
-      callback();
+      this.handleDisableAce(callback());
+      return;
     },
 
     warnValueMaxTableCallback(row, callback) {
       if (!row.warnSta) {
-        callback();
+        this.handleDisableAce(callback());
         return
       }
       
       if (!row.warnValueMax && row.warnValueMax !== 0) {
-        callback();
+        this.handleDisableAce(callback());
         return
       }
 
@@ -382,7 +403,7 @@ export default {
         /^((\-)*([1-9][0-9]*)|(\-)*([0-9]*)|(\-)*(([0]\.\d{1,}|[1-9][0-9]*\.\d{1,})))$/;
 
       if (row.warnValueMax && !isExp.test(row.warnValueMax)) {
-        callback("只可以输入数字类型！");
+        this.handleDisableAce(callback("只可以输入数字类型！"));
         return
       }
 
@@ -390,10 +411,10 @@ export default {
         (row.warnValueMin || row.warnValueMin === 0) &&
         +row.warnValueMax < +row.warnValueMin
       ) {
-        callback("需要大于最小预警值！");
+        this.handleDisableAce(callback("需要大于最小预警值！"));
         return
       }
-      callback();
+      this.handleDisableAce(callback());
     },
 
     warnValueMinTableCallback(row, callback) {
@@ -426,23 +447,23 @@ export default {
     },
     warnValueTableCallback(row, callback) {
       if (!row.warnSta) {
-        callback();
+        this.handleDisableAce(callback());
         return
       }
 
       if (!row.warnValue || row.warnValue === 0) {
-        callback("预警值不能为空！");
+        this.handleDisableAce(callback('预警值不能为空！'));
         return
       }
       const isExp =
         /^((\-)*([1-9][0-9]*)|(\-)*(([0]\.\d{1,}|[1-9][0-9]*\.\d{1,})))$/;
 
       if (row.warnValue && !isExp.test(row.warnValue)) {
-        callback("只可以输入大于0的数字类型！");
+        this.handleDisableAce(callback("只可以输入大于0的数字类型！"));
         return
       }
 
-      callback();
+      this.handleDisableAce(callback());
     },
     alarmValue(rule, value, callback) {
       if (!this.form.alarmSta) {