diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 95491e8..1c992fc 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -56,8 +56,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="采集间隔(分钟)" prop="collectCycle">
-            <el-input v-model="configForm.collectCycle" :min="1" :max="10" type="text" placeholder="必填" />
+          <el-form-item label="采集间隔(分钟)" prop="collectInterval">
+            <el-input v-model="configForm.collectInterval" :min="1" :max="10" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -155,7 +155,7 @@
       }
     }
     // 采集间隔校验
-    const validateCollectCycle = (rule, value, callback) => {
+    const validatecollectInterval = (rule, value, callback) => {
       if (value !== '') {
         if (validateFloatPlus(value, 5, 1440) === true) {
           callback()
@@ -163,7 +163,7 @@
           callback(new Error('请填写5到1440数值'))
         }
       } else {
-        callback(new Error('采集间隔不能为空'))
+        callback()
       }
     }
     // 采集次数校验
@@ -185,6 +185,8 @@
         } else {
           callback(new Error('请填写0到100数值'))
         }
+      } else {
+        callback()
       }
     }
     return {
@@ -202,9 +204,9 @@
         deviceId: '', // 设备id
         percent: '', // 报警阈值
         installHeight: '', // 安装高度
-        collectCycle:'', // 采集间隔
-        collectCnt:'', // 采集次数，数据上报间隔
-        dataThreshold:'', // 边界阈值
+        collectInterval: '', // 采集间隔
+        collectCnt: '', // 采集次数，数据上报间隔
+        dataThreshold: '', // 边界阈值
         retryTimes: '3', // 重传次数
         ip: '', // ip地址
         port: '', // 端口号
@@ -220,7 +222,7 @@
       rules: {
         percent: [{ required: true, trigger: ['blur', 'change'], validator: validatePercent }],
         installHeight: [{ required: true, trigger: ['blur', 'change'], validator: validateInstallHeight }],
-        collectInterval: [{ required: false, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        collectInterval: [{ required: false, trigger: ['blur', 'change'], validator: validatecollectInterval }],
         collectCnt: [{ required: false, trigger: ['blur', 'change'], validator: validateCollectCnt }],
         dataThreshold: [{ required: false, trigger: ['blur', 'change'], validator: validateDataThreshold }],
         deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
@@ -277,9 +279,9 @@
           percent: row.percent, // 报警阈值
           installHeight: row.installHeight, // 安装高度
           retryTimes: row.retryTimes, // 重传次数
-          collectCycle: row.collectCycle, // 采集间隔
-          collectCnt: row.collectCnt, // 采集次数，数据上报间隔
-          dataThreshold: row.dataThreshold, // 边界阈值
+          collectInterval: row.collectInterval, // 采集间隔
+          collectCnt: row.collectCnt || '', // 采集次数，数据上报间隔
+          dataThreshold: row.dataThreshold || '', // 边界阈值
           ip: row.ip, // ip地址
           port: row.port, // 端口号
           attemptsMax: row.attemptsMax // 最大尝试次数
@@ -299,9 +301,9 @@
         percent: '', // 报警阈值
         installHeight: '', // 安装高度
         retryTimes: '3', // 重传次数
-        collectCycle:'', // 采集间隔
-        collectCnt:'', // 采集次数，数据上报间隔
-        dataThreshold:'', // 边界阈值
+        collectInterval: '', // 采集间隔
+        collectCnt: '', // 采集次数，数据上报间隔
+        dataThreshold: '', // 边界阈值
         ip: '', // ip地址
         port: '', // 端口号
         attemptsMax: '3' // 最大尝试次数

diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 95491e8..1c992fc 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -56,8 +56,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="采集间隔(分钟)" prop="collectCycle">
-            <el-input v-model="configForm.collectCycle" :min="1" :max="10" type="text" placeholder="必填" />
+          <el-form-item label="采集间隔(分钟)" prop="collectInterval">
+            <el-input v-model="configForm.collectInterval" :min="1" :max="10" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -155,7 +155,7 @@
       }
     }
     // 采集间隔校验
-    const validateCollectCycle = (rule, value, callback) => {
+    const validatecollectInterval = (rule, value, callback) => {
       if (value !== '') {
         if (validateFloatPlus(value, 5, 1440) === true) {
           callback()
@@ -163,7 +163,7 @@
           callback(new Error('请填写5到1440数值'))
         }
       } else {
-        callback(new Error('采集间隔不能为空'))
+        callback()
       }
     }
     // 采集次数校验
@@ -185,6 +185,8 @@
         } else {
           callback(new Error('请填写0到100数值'))
         }
+      } else {
+        callback()
       }
     }
     return {
@@ -202,9 +204,9 @@
         deviceId: '', // 设备id
         percent: '', // 报警阈值
         installHeight: '', // 安装高度
-        collectCycle:'', // 采集间隔
-        collectCnt:'', // 采集次数，数据上报间隔
-        dataThreshold:'', // 边界阈值
+        collectInterval: '', // 采集间隔
+        collectCnt: '', // 采集次数，数据上报间隔
+        dataThreshold: '', // 边界阈值
         retryTimes: '3', // 重传次数
         ip: '', // ip地址
         port: '', // 端口号
@@ -220,7 +222,7 @@
       rules: {
         percent: [{ required: true, trigger: ['blur', 'change'], validator: validatePercent }],
         installHeight: [{ required: true, trigger: ['blur', 'change'], validator: validateInstallHeight }],
-        collectInterval: [{ required: false, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        collectInterval: [{ required: false, trigger: ['blur', 'change'], validator: validatecollectInterval }],
         collectCnt: [{ required: false, trigger: ['blur', 'change'], validator: validateCollectCnt }],
         dataThreshold: [{ required: false, trigger: ['blur', 'change'], validator: validateDataThreshold }],
         deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
@@ -277,9 +279,9 @@
           percent: row.percent, // 报警阈值
           installHeight: row.installHeight, // 安装高度
           retryTimes: row.retryTimes, // 重传次数
-          collectCycle: row.collectCycle, // 采集间隔
-          collectCnt: row.collectCnt, // 采集次数，数据上报间隔
-          dataThreshold: row.dataThreshold, // 边界阈值
+          collectInterval: row.collectInterval, // 采集间隔
+          collectCnt: row.collectCnt || '', // 采集次数，数据上报间隔
+          dataThreshold: row.dataThreshold || '', // 边界阈值
           ip: row.ip, // ip地址
           port: row.port, // 端口号
           attemptsMax: row.attemptsMax // 最大尝试次数
@@ -299,9 +301,9 @@
         percent: '', // 报警阈值
         installHeight: '', // 安装高度
         retryTimes: '3', // 重传次数
-        collectCycle:'', // 采集间隔
-        collectCnt:'', // 采集次数，数据上报间隔
-        dataThreshold:'', // 边界阈值
+        collectInterval: '', // 采集间隔
+        collectCnt: '', // 采集次数，数据上报间隔
+        dataThreshold: '', // 边界阈值
         ip: '', // ip地址
         port: '', // 端口号
         attemptsMax: '3' // 最大尝试次数
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index b1208a4..8ba85bc 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -122,7 +122,7 @@
         },
         {
           text: '采集间隔(分钟)',
-          value: 'collectCycle',
+          value: 'collectInterval',
           align: 'center'
         },
         {

diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue
index 95491e8..1c992fc 100644
--- a/src/views/deviceConfig/components/editLiquidConfig.vue
+++ b/src/views/deviceConfig/components/editLiquidConfig.vue
@@ -56,8 +56,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="采集间隔(分钟)" prop="collectCycle">
-            <el-input v-model="configForm.collectCycle" :min="1" :max="10" type="text" placeholder="必填" />
+          <el-form-item label="采集间隔(分钟)" prop="collectInterval">
+            <el-input v-model="configForm.collectInterval" :min="1" :max="10" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -155,7 +155,7 @@
       }
     }
     // 采集间隔校验
-    const validateCollectCycle = (rule, value, callback) => {
+    const validatecollectInterval = (rule, value, callback) => {
       if (value !== '') {
         if (validateFloatPlus(value, 5, 1440) === true) {
           callback()
@@ -163,7 +163,7 @@
           callback(new Error('请填写5到1440数值'))
         }
       } else {
-        callback(new Error('采集间隔不能为空'))
+        callback()
       }
     }
     // 采集次数校验
@@ -185,6 +185,8 @@
         } else {
           callback(new Error('请填写0到100数值'))
         }
+      } else {
+        callback()
       }
     }
     return {
@@ -202,9 +204,9 @@
         deviceId: '', // 设备id
         percent: '', // 报警阈值
         installHeight: '', // 安装高度
-        collectCycle:'', // 采集间隔
-        collectCnt:'', // 采集次数，数据上报间隔
-        dataThreshold:'', // 边界阈值
+        collectInterval: '', // 采集间隔
+        collectCnt: '', // 采集次数，数据上报间隔
+        dataThreshold: '', // 边界阈值
         retryTimes: '3', // 重传次数
         ip: '', // ip地址
         port: '', // 端口号
@@ -220,7 +222,7 @@
       rules: {
         percent: [{ required: true, trigger: ['blur', 'change'], validator: validatePercent }],
         installHeight: [{ required: true, trigger: ['blur', 'change'], validator: validateInstallHeight }],
-        collectInterval: [{ required: false, trigger: ['blur', 'change'], validator: validateCollectCycle }],
+        collectInterval: [{ required: false, trigger: ['blur', 'change'], validator: validatecollectInterval }],
         collectCnt: [{ required: false, trigger: ['blur', 'change'], validator: validateCollectCnt }],
         dataThreshold: [{ required: false, trigger: ['blur', 'change'], validator: validateDataThreshold }],
         deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
@@ -277,9 +279,9 @@
           percent: row.percent, // 报警阈值
           installHeight: row.installHeight, // 安装高度
           retryTimes: row.retryTimes, // 重传次数
-          collectCycle: row.collectCycle, // 采集间隔
-          collectCnt: row.collectCnt, // 采集次数，数据上报间隔
-          dataThreshold: row.dataThreshold, // 边界阈值
+          collectInterval: row.collectInterval, // 采集间隔
+          collectCnt: row.collectCnt || '', // 采集次数，数据上报间隔
+          dataThreshold: row.dataThreshold || '', // 边界阈值
           ip: row.ip, // ip地址
           port: row.port, // 端口号
           attemptsMax: row.attemptsMax // 最大尝试次数
@@ -299,9 +301,9 @@
         percent: '', // 报警阈值
         installHeight: '', // 安装高度
         retryTimes: '3', // 重传次数
-        collectCycle:'', // 采集间隔
-        collectCnt:'', // 采集次数，数据上报间隔
-        dataThreshold:'', // 边界阈值
+        collectInterval: '', // 采集间隔
+        collectCnt: '', // 采集次数，数据上报间隔
+        dataThreshold: '', // 边界阈值
         ip: '', // ip地址
         port: '', // 端口号
         attemptsMax: '3' // 最大尝试次数
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index b1208a4..8ba85bc 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -122,7 +122,7 @@
         },
         {
           text: '采集间隔(分钟)',
-          value: 'collectCycle',
+          value: 'collectInterval',
           align: 'center'
         },
         {
diff --git a/vue.config.js b/vue.config.js
index 88553c5..73e797e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -79,7 +79,18 @@
         symbolId: 'icon-[name]'
       })
       .end()
-
+    config.module
+      .rule('images')
+      .set('parser', {
+        dataUrlCondition: {
+          maxSize: 6 * 1024 // 超过6KB图片不内联
+        }
+      })
+      // .include.add(resolve('src/assets/login_images')).end()
+      // .use('url-loader')
+      // .loader('url-loader')
+      // .options({ name: 'img/[name].[hash:8].[ext]', limit: 1 })
+      .end()
     config
       .when(process.env.NODE_ENV !== 'development',
         config => {