diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 3edebf4..00cc7d0 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -88,25 +88,25 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="最大尝试次数">
-            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+            <el-input-number :min="1" :max="100" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
-            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="端口号" prop="port">
-            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
@@ -145,10 +145,10 @@
     }
     const validateCollectCycle = (rule, value, callback) => {
       if (value !== '') {
-        if (validateFloatPlus(value, 0, 100) === true) {
+        if (validateFloatPlus(value, 1, 96) === true) {
           callback()
         } else {
-          callback(new Error('请填写0到100数值'))
+          callback(new Error('请填写1到96数值'))
         }
       } else {
         callback(new Error('采集间隔不能为空'))
@@ -156,10 +156,10 @@
     }
     const validateThreshold = (rule, value, callback) => {
       if (value !== '') {
-        if (validateFloatPlus(value, 0, 100) === true) {
+        if (validateFloatPlus(value, 1, 37500) === true) {
           callback()
         } else {
-          callback(new Error('请填写0到100数值'))
+          callback(new Error('请填写1到37500数值'))
         }
       } else {
         callback(new Error('报警阈值不能为空'))
@@ -180,7 +180,7 @@
         deviceId: '', // 设备id
         collectInterval: '', // 采集间隔
         collectTime: '', // 采集时间
-        collectCount: '', // 采集时间
+        collectCount: '', // 采集次数
         sleepStartTime: '', // 睡眠时间
         threshold: '', // 报警阈值
         retryTimes: '3', // 重传次数
@@ -194,6 +194,7 @@
       }, // 表头显示标题
       devices: [], // 设备下拉选择列表
       loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
       rules: {
         collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
         threshold: [{ required: true, trigger: ['blur', 'change'], validator: validateThreshold }],
@@ -247,11 +248,11 @@
         this.configForm = {
           id: row.id,
           deviceId: row.deviceId, // 设备id
-          collectInterval: row.collectInterval, // 报警阈值
-          collectTime: row.collectTime, // 安装高度
-          collectCount: row.collectCount, // 安装高度
-          threshold: row.threshold, // 安装高度
-          sleepStartTime: row.sleepStartTime, // 安装高度
+          collectInterval: row.collectInterval, // 采集间隔
+          collectTime: row.collectTime, // 采集时间
+          collectCount: row.collectCount, // 采集次数
+          threshold: row.threshold, // 报警阈值
+          sleepStartTime: row.sleepStartTime, // 睡眠时间
           retryTimes: row.retryTimes, // 重传次数
           ip: row.ip, // ip地址
           port: row.port, // 端口号
@@ -282,11 +283,15 @@
     saveData: function() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
+          this.canEdit = false
           editDigConfig(this.configForm).then(response => {
             if (response.code === 200) {
               this.$message.success('配置成功')
+              this.canEdit = true
               this.$emit('watchChild')
               this.dialogFormVisible = false
+            } else {
+              this.canEdit = true
             }
           })
         }

diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 3edebf4..00cc7d0 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -88,25 +88,25 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="最大尝试次数">
-            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+            <el-input-number :min="1" :max="100" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
-            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="端口号" prop="port">
-            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
@@ -145,10 +145,10 @@
     }
     const validateCollectCycle = (rule, value, callback) => {
       if (value !== '') {
-        if (validateFloatPlus(value, 0, 100) === true) {
+        if (validateFloatPlus(value, 1, 96) === true) {
           callback()
         } else {
-          callback(new Error('请填写0到100数值'))
+          callback(new Error('请填写1到96数值'))
         }
       } else {
         callback(new Error('采集间隔不能为空'))
@@ -156,10 +156,10 @@
     }
     const validateThreshold = (rule, value, callback) => {
       if (value !== '') {
-        if (validateFloatPlus(value, 0, 100) === true) {
+        if (validateFloatPlus(value, 1, 37500) === true) {
           callback()
         } else {
-          callback(new Error('请填写0到100数值'))
+          callback(new Error('请填写1到37500数值'))
         }
       } else {
         callback(new Error('报警阈值不能为空'))
@@ -180,7 +180,7 @@
         deviceId: '', // 设备id
         collectInterval: '', // 采集间隔
         collectTime: '', // 采集时间
-        collectCount: '', // 采集时间
+        collectCount: '', // 采集次数
         sleepStartTime: '', // 睡眠时间
         threshold: '', // 报警阈值
         retryTimes: '3', // 重传次数
@@ -194,6 +194,7 @@
       }, // 表头显示标题
       devices: [], // 设备下拉选择列表
       loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
       rules: {
         collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
         threshold: [{ required: true, trigger: ['blur', 'change'], validator: validateThreshold }],
@@ -247,11 +248,11 @@
         this.configForm = {
           id: row.id,
           deviceId: row.deviceId, // 设备id
-          collectInterval: row.collectInterval, // 报警阈值
-          collectTime: row.collectTime, // 安装高度
-          collectCount: row.collectCount, // 安装高度
-          threshold: row.threshold, // 安装高度
-          sleepStartTime: row.sleepStartTime, // 安装高度
+          collectInterval: row.collectInterval, // 采集间隔
+          collectTime: row.collectTime, // 采集时间
+          collectCount: row.collectCount, // 采集次数
+          threshold: row.threshold, // 报警阈值
+          sleepStartTime: row.sleepStartTime, // 睡眠时间
           retryTimes: row.retryTimes, // 重传次数
           ip: row.ip, // ip地址
           port: row.port, // 端口号
@@ -282,11 +283,15 @@
     saveData: function() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
+          this.canEdit = false
           editDigConfig(this.configForm).then(response => {
             if (response.code === 200) {
               this.$message.success('配置成功')
+              this.canEdit = true
               this.$emit('watchChild')
               this.dialogFormVisible = false
+            } else {
+              this.canEdit = true
             }
           })
         }
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 12f5471..1f16f3e 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
-    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="100px">
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
@@ -42,7 +42,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
-            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+            <el-input-number :min="1" :max="9" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -53,31 +53,31 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="上传周期" prop="uploadPeriod">
+          <el-form-item label="上传周期(分)" prop="uploadPeriod">
             <el-input v-model.trim="configForm.uploadPeriod" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="最大尝试次数">
-            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+            <el-input-number :min="1" :max="100" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
-            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="端口号" prop="port">
-            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
@@ -116,10 +116,10 @@
     }
     const validateCollectCycle = (rule, value, callback) => {
       if (value !== '') {
-        if (validateFloatPlus(value, 0, 100) === true) {
+        if (validateFloatPlus(value, 5, 1440) === true) {
           callback()
         } else {
-          callback(new Error('请填写0到100数值'))
+          callback(new Error('请填写5到1440数值'))
         }
       } else {
         callback(new Error('采集间隔不能为空'))
@@ -127,10 +127,10 @@
     }
     const validateUpPeriod = (rule, value, callback) => {
       if (value !== '') {
-        if (validateFloatPlus(value, 0, 100) === true) {
+        if (validateFloatPlus(value, 0, 10080) === true) {
           callback()
         } else {
-          callback(new Error('请填写0到100数值'))
+          callback(new Error('请填写0到10080之间数值'))
         }
       } else {
         callback(new Error('上传周期不能为空'))
@@ -162,6 +162,7 @@
       }, // 表头显示标题
       devices: [], // 设备下拉选择列表
       loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
       rules: {
         collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
         uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
@@ -244,12 +245,14 @@
     saveData: function() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
+          this.canEdit = false
           editGasConfig(this.configForm).then(response => {
             if (response.code === 200) {
               this.$message.success('配置成功')
               this.$emit('watchChild')
               this.dialogFormVisible = false
             }
+            this.canEdit = false
           })
         }
       })

diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 3edebf4..00cc7d0 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -88,25 +88,25 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="最大尝试次数">
-            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+            <el-input-number :min="1" :max="100" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
-            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="端口号" prop="port">
-            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
@@ -145,10 +145,10 @@
     }
     const validateCollectCycle = (rule, value, callback) => {
       if (value !== '') {
-        if (validateFloatPlus(value, 0, 100) === true) {
+        if (validateFloatPlus(value, 1, 96) === true) {
           callback()
         } else {
-          callback(new Error('请填写0到100数值'))
+          callback(new Error('请填写1到96数值'))
         }
       } else {
         callback(new Error('采集间隔不能为空'))
@@ -156,10 +156,10 @@
     }
     const validateThreshold = (rule, value, callback) => {
       if (value !== '') {
-        if (validateFloatPlus(value, 0, 100) === true) {
+        if (validateFloatPlus(value, 1, 37500) === true) {
           callback()
         } else {
-          callback(new Error('请填写0到100数值'))
+          callback(new Error('请填写1到37500数值'))
         }
       } else {
         callback(new Error('报警阈值不能为空'))
@@ -180,7 +180,7 @@
         deviceId: '', // 设备id
         collectInterval: '', // 采集间隔
         collectTime: '', // 采集时间
-        collectCount: '', // 采集时间
+        collectCount: '', // 采集次数
         sleepStartTime: '', // 睡眠时间
         threshold: '', // 报警阈值
         retryTimes: '3', // 重传次数
@@ -194,6 +194,7 @@
       }, // 表头显示标题
       devices: [], // 设备下拉选择列表
       loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
       rules: {
         collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
         threshold: [{ required: true, trigger: ['blur', 'change'], validator: validateThreshold }],
@@ -247,11 +248,11 @@
         this.configForm = {
           id: row.id,
           deviceId: row.deviceId, // 设备id
-          collectInterval: row.collectInterval, // 报警阈值
-          collectTime: row.collectTime, // 安装高度
-          collectCount: row.collectCount, // 安装高度
-          threshold: row.threshold, // 安装高度
-          sleepStartTime: row.sleepStartTime, // 安装高度
+          collectInterval: row.collectInterval, // 采集间隔
+          collectTime: row.collectTime, // 采集时间
+          collectCount: row.collectCount, // 采集次数
+          threshold: row.threshold, // 报警阈值
+          sleepStartTime: row.sleepStartTime, // 睡眠时间
           retryTimes: row.retryTimes, // 重传次数
           ip: row.ip, // ip地址
           port: row.port, // 端口号
@@ -282,11 +283,15 @@
     saveData: function() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
+          this.canEdit = false
           editDigConfig(this.configForm).then(response => {
             if (response.code === 200) {
               this.$message.success('配置成功')
+              this.canEdit = true
               this.$emit('watchChild')
               this.dialogFormVisible = false
+            } else {
+              this.canEdit = true
             }
           })
         }
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 12f5471..1f16f3e 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
-    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="100px">
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
@@ -42,7 +42,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
-            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+            <el-input-number :min="1" :max="9" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -53,31 +53,31 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="上传周期" prop="uploadPeriod">
+          <el-form-item label="上传周期(分)" prop="uploadPeriod">
             <el-input v-model.trim="configForm.uploadPeriod" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="最大尝试次数">
-            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+            <el-input-number :min="1" :max="100" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
-            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="端口号" prop="port">
-            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
@@ -116,10 +116,10 @@
     }
     const validateCollectCycle = (rule, value, callback) => {
       if (value !== '') {
-        if (validateFloatPlus(value, 0, 100) === true) {
+        if (validateFloatPlus(value, 5, 1440) === true) {
           callback()
         } else {
-          callback(new Error('请填写0到100数值'))
+          callback(new Error('请填写5到1440数值'))
         }
       } else {
         callback(new Error('采集间隔不能为空'))
@@ -127,10 +127,10 @@
     }
     const validateUpPeriod = (rule, value, callback) => {
       if (value !== '') {
-        if (validateFloatPlus(value, 0, 100) === true) {
+        if (validateFloatPlus(value, 0, 10080) === true) {
           callback()
         } else {
-          callback(new Error('请填写0到100数值'))
+          callback(new Error('请填写0到10080之间数值'))
         }
       } else {
         callback(new Error('上传周期不能为空'))
@@ -162,6 +162,7 @@
       }, // 表头显示标题
       devices: [], // 设备下拉选择列表
       loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
       rules: {
         collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
         uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
@@ -244,12 +245,14 @@
     saveData: function() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
+          this.canEdit = false
           editGasConfig(this.configForm).then(response => {
             if (response.code === 200) {
               this.$message.success('配置成功')
               this.$emit('watchChild')
               this.dialogFormVisible = false
             }
+            this.canEdit = false
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index 685c36e..9b9b7c3 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -55,18 +55,18 @@
       <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
-            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="端口号" prop="port">
-            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
@@ -138,6 +138,7 @@
       }, // 表头显示标题
       devices: [], // 设备下拉选择列表
       loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
       rules: {
         uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
         deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
@@ -216,12 +217,14 @@
     saveData: function() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
+          this.canEdit = false
           editHarmfulConfig(this.configForm).then(response => {
             if (response.code === 200) {
               this.$message.success('配置成功')
               this.$emit('watchChild')
               this.dialogFormVisible = false
             }
+            this.canEdit = false
           })
         }
       })

diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 3edebf4..00cc7d0 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -88,25 +88,25 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="最大尝试次数">
-            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+            <el-input-number :min="1" :max="100" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
-            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="端口号" prop="port">
-            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
@@ -145,10 +145,10 @@
     }
     const validateCollectCycle = (rule, value, callback) => {
       if (value !== '') {
-        if (validateFloatPlus(value, 0, 100) === true) {
+        if (validateFloatPlus(value, 1, 96) === true) {
           callback()
         } else {
-          callback(new Error('请填写0到100数值'))
+          callback(new Error('请填写1到96数值'))
         }
       } else {
         callback(new Error('采集间隔不能为空'))
@@ -156,10 +156,10 @@
     }
     const validateThreshold = (rule, value, callback) => {
       if (value !== '') {
-        if (validateFloatPlus(value, 0, 100) === true) {
+        if (validateFloatPlus(value, 1, 37500) === true) {
           callback()
         } else {
-          callback(new Error('请填写0到100数值'))
+          callback(new Error('请填写1到37500数值'))
         }
       } else {
         callback(new Error('报警阈值不能为空'))
@@ -180,7 +180,7 @@
         deviceId: '', // 设备id
         collectInterval: '', // 采集间隔
         collectTime: '', // 采集时间
-        collectCount: '', // 采集时间
+        collectCount: '', // 采集次数
         sleepStartTime: '', // 睡眠时间
         threshold: '', // 报警阈值
         retryTimes: '3', // 重传次数
@@ -194,6 +194,7 @@
       }, // 表头显示标题
       devices: [], // 设备下拉选择列表
       loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
       rules: {
         collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
         threshold: [{ required: true, trigger: ['blur', 'change'], validator: validateThreshold }],
@@ -247,11 +248,11 @@
         this.configForm = {
           id: row.id,
           deviceId: row.deviceId, // 设备id
-          collectInterval: row.collectInterval, // 报警阈值
-          collectTime: row.collectTime, // 安装高度
-          collectCount: row.collectCount, // 安装高度
-          threshold: row.threshold, // 安装高度
-          sleepStartTime: row.sleepStartTime, // 安装高度
+          collectInterval: row.collectInterval, // 采集间隔
+          collectTime: row.collectTime, // 采集时间
+          collectCount: row.collectCount, // 采集次数
+          threshold: row.threshold, // 报警阈值
+          sleepStartTime: row.sleepStartTime, // 睡眠时间
           retryTimes: row.retryTimes, // 重传次数
           ip: row.ip, // ip地址
           port: row.port, // 端口号
@@ -282,11 +283,15 @@
     saveData: function() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
+          this.canEdit = false
           editDigConfig(this.configForm).then(response => {
             if (response.code === 200) {
               this.$message.success('配置成功')
+              this.canEdit = true
               this.$emit('watchChild')
               this.dialogFormVisible = false
+            } else {
+              this.canEdit = true
             }
           })
         }
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 12f5471..1f16f3e 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
-    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="100px">
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
@@ -42,7 +42,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
-            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+            <el-input-number :min="1" :max="9" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -53,31 +53,31 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="上传周期" prop="uploadPeriod">
+          <el-form-item label="上传周期(分)" prop="uploadPeriod">
             <el-input v-model.trim="configForm.uploadPeriod" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="最大尝试次数">
-            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+            <el-input-number :min="1" :max="100" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
-            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="端口号" prop="port">
-            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
@@ -116,10 +116,10 @@
     }
     const validateCollectCycle = (rule, value, callback) => {
       if (value !== '') {
-        if (validateFloatPlus(value, 0, 100) === true) {
+        if (validateFloatPlus(value, 5, 1440) === true) {
           callback()
         } else {
-          callback(new Error('请填写0到100数值'))
+          callback(new Error('请填写5到1440数值'))
         }
       } else {
         callback(new Error('采集间隔不能为空'))
@@ -127,10 +127,10 @@
     }
     const validateUpPeriod = (rule, value, callback) => {
       if (value !== '') {
-        if (validateFloatPlus(value, 0, 100) === true) {
+        if (validateFloatPlus(value, 0, 10080) === true) {
           callback()
         } else {
-          callback(new Error('请填写0到100数值'))
+          callback(new Error('请填写0到10080之间数值'))
         }
       } else {
         callback(new Error('上传周期不能为空'))
@@ -162,6 +162,7 @@
       }, // 表头显示标题
       devices: [], // 设备下拉选择列表
       loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
       rules: {
         collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
         uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
@@ -244,12 +245,14 @@
     saveData: function() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
+          this.canEdit = false
           editGasConfig(this.configForm).then(response => {
             if (response.code === 200) {
               this.$message.success('配置成功')
               this.$emit('watchChild')
               this.dialogFormVisible = false
             }
+            this.canEdit = false
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index 685c36e..9b9b7c3 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -55,18 +55,18 @@
       <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
-            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="端口号" prop="port">
-            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
@@ -138,6 +138,7 @@
       }, // 表头显示标题
       devices: [], // 设备下拉选择列表
       loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
       rules: {
         uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
         deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
@@ -216,12 +217,14 @@
     saveData: function() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
+          this.canEdit = false
           editHarmfulConfig(this.configForm).then(response => {
             if (response.code === 200) {
               this.$message.success('配置成功')
               this.$emit('watchChild')
               this.dialogFormVisible = false
             }
+            this.canEdit = false
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index cd2bcba..3729f5a 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -67,18 +67,18 @@
       <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
-            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="端口号" prop="port">
-            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
@@ -162,6 +162,7 @@
       }, // 表头显示标题
       devices: [], // 设备下拉选择列表
       loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
       rules: {
         percent: [{ required: true, trigger: ['blur', 'change'], validator: validatePercent }],
         installHeight: [{ required: true, trigger: ['blur', 'change'], validator: validateInstallHeight }],
@@ -244,12 +245,14 @@
     saveData: function() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
+          this.canEdit = false
           editLiquidConfig(this.configForm).then(response => {
             if (response.code === 200) {
               this.$message.success('配置成功')
               this.$emit('watchChild')
               this.dialogFormVisible = false
             }
+            this.canEdit = false
           })
         }
       })

diff --git a/src/views/deviceConfig/components/editDigConfig.vue b/src/views/deviceConfig/components/editDigConfig.vue
index 3edebf4..00cc7d0 100644
--- a/src/views/deviceConfig/components/editDigConfig.vue
+++ b/src/views/deviceConfig/components/editDigConfig.vue
@@ -88,25 +88,25 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="最大尝试次数">
-            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+            <el-input-number :min="1" :max="100" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
-            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="端口号" prop="port">
-            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
@@ -145,10 +145,10 @@
     }
     const validateCollectCycle = (rule, value, callback) => {
       if (value !== '') {
-        if (validateFloatPlus(value, 0, 100) === true) {
+        if (validateFloatPlus(value, 1, 96) === true) {
           callback()
         } else {
-          callback(new Error('请填写0到100数值'))
+          callback(new Error('请填写1到96数值'))
         }
       } else {
         callback(new Error('采集间隔不能为空'))
@@ -156,10 +156,10 @@
     }
     const validateThreshold = (rule, value, callback) => {
       if (value !== '') {
-        if (validateFloatPlus(value, 0, 100) === true) {
+        if (validateFloatPlus(value, 1, 37500) === true) {
           callback()
         } else {
-          callback(new Error('请填写0到100数值'))
+          callback(new Error('请填写1到37500数值'))
         }
       } else {
         callback(new Error('报警阈值不能为空'))
@@ -180,7 +180,7 @@
         deviceId: '', // 设备id
         collectInterval: '', // 采集间隔
         collectTime: '', // 采集时间
-        collectCount: '', // 采集时间
+        collectCount: '', // 采集次数
         sleepStartTime: '', // 睡眠时间
         threshold: '', // 报警阈值
         retryTimes: '3', // 重传次数
@@ -194,6 +194,7 @@
       }, // 表头显示标题
       devices: [], // 设备下拉选择列表
       loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
       rules: {
         collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
         threshold: [{ required: true, trigger: ['blur', 'change'], validator: validateThreshold }],
@@ -247,11 +248,11 @@
         this.configForm = {
           id: row.id,
           deviceId: row.deviceId, // 设备id
-          collectInterval: row.collectInterval, // 报警阈值
-          collectTime: row.collectTime, // 安装高度
-          collectCount: row.collectCount, // 安装高度
-          threshold: row.threshold, // 安装高度
-          sleepStartTime: row.sleepStartTime, // 安装高度
+          collectInterval: row.collectInterval, // 采集间隔
+          collectTime: row.collectTime, // 采集时间
+          collectCount: row.collectCount, // 采集次数
+          threshold: row.threshold, // 报警阈值
+          sleepStartTime: row.sleepStartTime, // 睡眠时间
           retryTimes: row.retryTimes, // 重传次数
           ip: row.ip, // ip地址
           port: row.port, // 端口号
@@ -282,11 +283,15 @@
     saveData: function() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
+          this.canEdit = false
           editDigConfig(this.configForm).then(response => {
             if (response.code === 200) {
               this.$message.success('配置成功')
+              this.canEdit = true
               this.$emit('watchChild')
               this.dialogFormVisible = false
+            } else {
+              this.canEdit = true
             }
           })
         }
diff --git a/src/views/deviceConfig/components/editGasConfig.vue b/src/views/deviceConfig/components/editGasConfig.vue
index 12f5471..1f16f3e 100644
--- a/src/views/deviceConfig/components/editGasConfig.vue
+++ b/src/views/deviceConfig/components/editGasConfig.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
-    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="100px">
+    <el-form ref="dataForm" :rules="rules" :model="configForm" label-well-code="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
@@ -42,7 +42,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
-            <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
+            <el-input-number :min="1" :max="9" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -53,31 +53,31 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="上传周期" prop="uploadPeriod">
+          <el-form-item label="上传周期(分)" prop="uploadPeriod">
             <el-input v-model.trim="configForm.uploadPeriod" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="最大尝试次数">
-            <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
+            <el-input-number :min="1" :max="100" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
-            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="端口号" prop="port">
-            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
@@ -116,10 +116,10 @@
     }
     const validateCollectCycle = (rule, value, callback) => {
       if (value !== '') {
-        if (validateFloatPlus(value, 0, 100) === true) {
+        if (validateFloatPlus(value, 5, 1440) === true) {
           callback()
         } else {
-          callback(new Error('请填写0到100数值'))
+          callback(new Error('请填写5到1440数值'))
         }
       } else {
         callback(new Error('采集间隔不能为空'))
@@ -127,10 +127,10 @@
     }
     const validateUpPeriod = (rule, value, callback) => {
       if (value !== '') {
-        if (validateFloatPlus(value, 0, 100) === true) {
+        if (validateFloatPlus(value, 0, 10080) === true) {
           callback()
         } else {
-          callback(new Error('请填写0到100数值'))
+          callback(new Error('请填写0到10080之间数值'))
         }
       } else {
         callback(new Error('上传周期不能为空'))
@@ -162,6 +162,7 @@
       }, // 表头显示标题
       devices: [], // 设备下拉选择列表
       loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
       rules: {
         collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
         uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateUpPeriod }],
@@ -244,12 +245,14 @@
     saveData: function() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
+          this.canEdit = false
           editGasConfig(this.configForm).then(response => {
             if (response.code === 200) {
               this.$message.success('配置成功')
               this.$emit('watchChild')
               this.dialogFormVisible = false
             }
+            this.canEdit = false
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editHarmfulConfig.vue b/src/views/deviceConfig/components/editHarmfulConfig.vue
index 685c36e..9b9b7c3 100644
--- a/src/views/deviceConfig/components/editHarmfulConfig.vue
+++ b/src/views/deviceConfig/components/editHarmfulConfig.vue
@@ -55,18 +55,18 @@
       <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
-            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="端口号" prop="port">
-            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
@@ -138,6 +138,7 @@
       }, // 表头显示标题
       devices: [], // 设备下拉选择列表
       loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
       rules: {
         uploadPeriod: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
         deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
@@ -216,12 +217,14 @@
     saveData: function() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
+          this.canEdit = false
           editHarmfulConfig(this.configForm).then(response => {
             if (response.code === 200) {
               this.$message.success('配置成功')
               this.$emit('watchChild')
               this.dialogFormVisible = false
             }
+            this.canEdit = false
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index cd2bcba..3729f5a 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -67,18 +67,18 @@
       <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
-            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="端口号" prop="port">
-            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
@@ -162,6 +162,7 @@
       }, // 表头显示标题
       devices: [], // 设备下拉选择列表
       loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
       rules: {
         percent: [{ required: true, trigger: ['blur', 'change'], validator: validatePercent }],
         installHeight: [{ required: true, trigger: ['blur', 'change'], validator: validateInstallHeight }],
@@ -244,12 +245,14 @@
     saveData: function() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
+          this.canEdit = false
           editLiquidConfig(this.configForm).then(response => {
             if (response.code === 200) {
               this.$message.success('配置成功')
               this.$emit('watchChild')
               this.dialogFormVisible = false
             }
+            this.canEdit = false
           })
         }
       })
diff --git a/src/views/deviceConfig/components/editTempConfig.vue b/src/views/deviceConfig/components/editTempConfig.vue
index 48ce6c9..b054bea 100644
--- a/src/views/deviceConfig/components/editTempConfig.vue
+++ b/src/views/deviceConfig/components/editTempConfig.vue
@@ -72,25 +72,25 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="采集次数" prop="collectCount">
-            <el-input-number :min="1" :max="100" v-model="configForm.collectCount" type="text" placeholder="必填"/>
+            <el-input-number :min="1" :max="24" v-model="configForm.collectCount" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
-            <el-input v-model.trim="configForm.ip" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="端口号" prop="port">
-            <el-input v-model.trim="configForm.port" type="text" placeholder="非集中器设备必填"/>
+            <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
       <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
@@ -129,10 +129,10 @@
     }
     const validateCollectCycle = (rule, value, callback) => {
       if (value !== '') {
-        if (validateFloatPlus(value, 0, 100) === true) {
+        if (validateFloatPlus(value, 60, 1440) === true) {
           callback()
         } else {
-          callback(new Error('请填写0到100数值'))
+          callback(new Error('请填写60到1440数值'))
         }
       } else {
         callback(new Error('采集间隔不能为空'))
@@ -165,6 +165,7 @@
       }, // 表头显示标题
       devices: [], // 设备下拉选择列表
       loading: false, // 加载动画是否显示
+      canEdit: true, // 是否允许点击保存按钮
       rules: {
         collectInterval: [{ required: true, trigger: ['blur', 'change'], validator: validateCollectCycle }],
         collectTime: [{ required: true, message: '采集时间不能为空', trigger: ['blur', 'change'] }],
@@ -250,12 +251,21 @@
     saveData: function() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
+          // 验证采集间隔与采集次数乘积不得超过1440
+          const collectInterval = parseFloat(this.configForm.collectInterval)
+          const collectCount = this.configForm.collectCount
+          if (collectInterval * collectCount > 1440) {
+            this.$message.warning('采集间隔与采集次数乘积不得超过1440')
+            return
+          }
+          this.canEdit = false
           editTempConfig(this.configForm).then(response => {
             if (response.code === 200) {
               this.$message.success('配置成功')
               this.$emit('watchChild')
               this.dialogFormVisible = false
             }
+            this.canEdit = false
           })
         }
       })