diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index e3d838f..95491e8 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -40,8 +40,6 @@
             <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
             <el-input-number v-model="configForm.retryTimes" :min="1" :max="10" type="text" placeholder="必填" />
@@ -52,8 +50,6 @@
             <el-input v-model.trim="configForm.percent" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="安装高度(m)" prop="installHeight">
             <el-input v-model.trim="configForm.installHeight" type="text" placeholder="必填" />
@@ -61,19 +57,17 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="采集间隔(分钟)" prop="collectCycle">
-            <el-input-number v-model="configForm.collectCycle" :min="1" :max="10" type="text" placeholder="必填" />
+            <el-input v-model="configForm.collectCycle" :min="1" :max="10" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="采集次数" prop="collectCnt">
-            <el-input v-model.trim="configForm.collectCnt" type="text" placeholder="必填" />
+            <el-input v-model.trim="configForm.collectCnt" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="最大尝试次数" prop="installDate">
-            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="10" type="text" placeholder="必填" />
+          <el-form-item label="边界阈值" prop="dataThreshold">
+            <el-input v-model.trim="configForm.dataThreshold" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -89,6 +83,13 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数" prop="installDate">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="10" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button :disabled="!canEdit" type="primary" @click="saveData">
@@ -153,6 +154,7 @@
         callback(new Error('安装高度不能为空'))
       }
     }
+    // 采集间隔校验
     const validateCollectCycle = (rule, value, callback) => {
       if (value !== '') {
         if (validateFloatPlus(value, 5, 1440) === true) {
@@ -164,6 +166,7 @@
         callback(new Error('采集间隔不能为空'))
       }
     }
+    // 采集次数校验
     const validateCollectCnt = (rule, value, callback) => {
       if (value !== '') {
         if (validateFloatPlus(value, 0, 10080) === true) {
@@ -172,7 +175,16 @@
           callback(new Error('请填写0到10080之间数值'))
         }
       } else {
-        callback(new Error('采集次数不能为空'))
+        callback()
+      }
+    }
+    const validateDataThreshold = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
       }
     }
     return {
@@ -210,6 +222,7 @@
         installHeight: [{ required: true, trigger: ['blur', 'change'], validator: validateInstallHeight }],
         collectInterval: [{ required: false, trigger: ['blur', 'change'], validator: validateCollectCycle }],
         collectCnt: [{ required: false, trigger: ['blur', 'change'], validator: validateCollectCnt }],
+        dataThreshold: [{ required: false, trigger: ['blur', 'change'], validator: validateDataThreshold }],
         deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
         ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
         port: [{ trigger: ['blur', 'change'], validator: validatePort }]
@@ -264,6 +277,9 @@
           percent: row.percent, // 报警阈值
           installHeight: row.installHeight, // 安装高度
           retryTimes: row.retryTimes, // 重传次数
+          collectCycle: row.collectCycle, // 采集间隔
+          collectCnt: row.collectCnt, // 采集次数，数据上报间隔
+          dataThreshold: row.dataThreshold, // 边界阈值
           ip: row.ip, // ip地址
           port: row.port, // 端口号
           attemptsMax: row.attemptsMax // 最大尝试次数
@@ -283,6 +299,9 @@
         percent: '', // 报警阈值
         installHeight: '', // 安装高度
         retryTimes: '3', // 重传次数
+        collectCycle:'', // 采集间隔
+        collectCnt:'', // 采集次数，数据上报间隔
+        dataThreshold:'', // 边界阈值
         ip: '', // ip地址
         port: '', // 端口号
         attemptsMax: '3' // 最大尝试次数

diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index e3d838f..95491e8 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -40,8 +40,6 @@
             <el-input v-model="deviceForm.deptName" type="text" placeholder="未知" disabled />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
             <el-input-number v-model="configForm.retryTimes" :min="1" :max="10" type="text" placeholder="必填" />
@@ -52,8 +50,6 @@
             <el-input v-model.trim="configForm.percent" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="安装高度(m)" prop="installHeight">
             <el-input v-model.trim="configForm.installHeight" type="text" placeholder="必填" />
@@ -61,19 +57,17 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="采集间隔(分钟)" prop="collectCycle">
-            <el-input-number v-model="configForm.collectCycle" :min="1" :max="10" type="text" placeholder="必填" />
+            <el-input v-model="configForm.collectCycle" :min="1" :max="10" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="采集次数" prop="collectCnt">
-            <el-input v-model.trim="configForm.collectCnt" type="text" placeholder="必填" />
+            <el-input v-model.trim="configForm.collectCnt" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="最大尝试次数" prop="installDate">
-            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="10" type="text" placeholder="必填" />
+          <el-form-item label="边界阈值" prop="dataThreshold">
+            <el-input v-model.trim="configForm.dataThreshold" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -89,6 +83,13 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="最大尝试次数" prop="installDate">
+            <el-input-number v-model="configForm.attemptsMax" :min="1" :max="10" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button :disabled="!canEdit" type="primary" @click="saveData">
@@ -153,6 +154,7 @@
         callback(new Error('安装高度不能为空'))
       }
     }
+    // 采集间隔校验
     const validateCollectCycle = (rule, value, callback) => {
       if (value !== '') {
         if (validateFloatPlus(value, 5, 1440) === true) {
@@ -164,6 +166,7 @@
         callback(new Error('采集间隔不能为空'))
       }
     }
+    // 采集次数校验
     const validateCollectCnt = (rule, value, callback) => {
       if (value !== '') {
         if (validateFloatPlus(value, 0, 10080) === true) {
@@ -172,7 +175,16 @@
           callback(new Error('请填写0到10080之间数值'))
         }
       } else {
-        callback(new Error('采集次数不能为空'))
+        callback()
+      }
+    }
+    const validateDataThreshold = (rule, value, callback) => {
+      if (value !== '') {
+        if (validateFloatPlus(value, 0, 100) === true) {
+          callback()
+        } else {
+          callback(new Error('请填写0到100数值'))
+        }
       }
     }
     return {
@@ -210,6 +222,7 @@
         installHeight: [{ required: true, trigger: ['blur', 'change'], validator: validateInstallHeight }],
         collectInterval: [{ required: false, trigger: ['blur', 'change'], validator: validateCollectCycle }],
         collectCnt: [{ required: false, trigger: ['blur', 'change'], validator: validateCollectCnt }],
+        dataThreshold: [{ required: false, trigger: ['blur', 'change'], validator: validateDataThreshold }],
         deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
         ip: [{ trigger: ['blur', 'change'], validator: validateIp }],
         port: [{ trigger: ['blur', 'change'], validator: validatePort }]
@@ -264,6 +277,9 @@
           percent: row.percent, // 报警阈值
           installHeight: row.installHeight, // 安装高度
           retryTimes: row.retryTimes, // 重传次数
+          collectCycle: row.collectCycle, // 采集间隔
+          collectCnt: row.collectCnt, // 采集次数，数据上报间隔
+          dataThreshold: row.dataThreshold, // 边界阈值
           ip: row.ip, // ip地址
           port: row.port, // 端口号
           attemptsMax: row.attemptsMax // 最大尝试次数
@@ -283,6 +299,9 @@
         percent: '', // 报警阈值
         installHeight: '', // 安装高度
         retryTimes: '3', // 重传次数
+        collectCycle:'', // 采集间隔
+        collectCnt:'', // 采集次数，数据上报间隔
+        dataThreshold:'', // 边界阈值
         ip: '', // ip地址
         port: '', // 端口号
         attemptsMax: '3' // 最大尝试次数
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index 7155542..b1208a4 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -121,6 +121,21 @@
           align: 'center'
         },
         {
+          text: '采集间隔(分钟)',
+          value: 'collectCycle',
+          align: 'center'
+        },
+        {
+          text: '采集次数',
+          value: 'collectCnt',
+          align: 'center'
+        },
+        {
+          text: '边界阈值',
+          value: 'dataThreshold',
+          align: 'center'
+        },
+        {
           text: 'IP地址',
           value: 'ip',
           align: 'center'