diff --git a/src/views/terminalEquipment/deviceInformation.vue b/src/views/terminalEquipment/deviceInformation.vue
index 4a1f745..c4c8a84 100644
--- a/src/views/terminalEquipment/deviceInformation.vue
+++ b/src/views/terminalEquipment/deviceInformation.vue
@@ -195,8 +195,6 @@
                 <el-option value="3">3</el-option>
                 <el-option value="4">4</el-option>
                 <el-option value="5">5</el-option>
-                <el-option value="6">6</el-option>
-                <el-option value="7">7</el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -216,15 +214,14 @@
         <!--隐藏字段-->
         <el-row type="flex" class="row-bg" justify="space-around">
           <el-col :span="11">
-            <el-form-item label="新增人" prop="createUser" v-show="showDeviceName">
-              <el-input v-model="form.createUser" placeholder="" :placeholder="isEditing ? '请输入新增人' : ''"
-                        :disabled="!isEditing" v-no-whitespace
-              />
+            <el-form-item label="在线状态" prop="deviceStatus" label-width="150">
+               <el-switch v-model="form.deviceStatus" :active-value='1' :inactive-value='0'></el-switch>
             </el-form-item>
           </el-col>
+
           <el-col :span="11">
-            <el-form-item label="新增时间" prop="createTime" v-show="showDeviceName">
-              <el-input v-model="form.createTime" placeholder="" :placeholder="isEditing ? '请输入新增时间' : ''"
+            <el-form-item label="新增人" prop="createUser" v-show="showDeviceName">
+              <el-input v-model="form.createUser" placeholder="" :placeholder="isEditing ? '请输入新增人' : ''"
                         :disabled="!isEditing" v-no-whitespace
               />
             </el-form-item>
@@ -232,14 +229,14 @@
         </el-row>
         <el-row type="flex" class="row-bg" justify="space-around">
           <el-col :span="11">
-            <el-form-item label="当前绑定工程" prop="proName" v-show="showDeviceName" label-width="150">
-              <el-input v-model="form.proName" placeholder="" :placeholder="isEditing ? '请输入当前绑定工程' : ''"
+            <el-form-item label="新增时间" prop="createTime" v-show="showDeviceName">
+              <el-input v-model="form.createTime" placeholder="" :placeholder="isEditing ? '请输入新增时间' : ''"
                         :disabled="!isEditing" v-no-whitespace
               />
             </el-form-item>
           </el-col>
           <el-col :span="11">
-            <el-form-item label="当前绑定工程" prop="proName" v-show="false" label-width="150">
+            <el-form-item label="当前绑定工程" prop="proName" v-show="showDeviceName" label-width="150">
               <el-input v-model="form.proName" placeholder="" :placeholder="isEditing ? '请输入当前绑定工程' : ''"
                         :disabled="!isEditing" v-no-whitespace
               />
@@ -319,6 +316,7 @@ export default {
         deviceModel: undefined,
         puid: undefined,
         ballIndex: '0',
+        deviceStatus:'0',
         typeCode:'',
         deviceUser: undefined,
         devicePhone: undefined,
@@ -390,7 +388,8 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false
-      this.reset()
+      this.queryParams.pageNum = 1
+      this.getList()
     },
     // 表单重置
     reset() {
@@ -400,7 +399,8 @@ export default {
         deviceName: undefined,
         devicePhone: undefined,
         deviceModel: undefined,
-        ballIndex:0
+        ballIndex:0,
+        deviceStatus:0
       }
       this.resetForm('form')
     },