diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue
index 9e9b8c5..9ed6750 100644
--- a/src/views/system/device/index.vue
+++ b/src/views/system/device/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="MAC" prop="mac">
-        <el-input
+        <el-input style="width: 150px"
           v-model="queryParams.mac"
           placeholder="请输入mac"
           clearable
@@ -10,7 +10,7 @@
         />
       </el-form-item>
       <el-form-item label="SN号" prop="sn">
-        <el-input
+        <el-input style="width: 150px"
           v-model="queryParams.sn"
           placeholder="请输入设备SN号"
           clearable
@@ -37,6 +37,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="锁状态" prop="status">
+        <el-select v-model="queryParams.lockStatus" placeholder="请选择锁状态" clearable>
+          <el-option
+            v-for="dict in dict.type.et_device_lock_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -104,6 +114,11 @@
           <dict-tag :options="dict.type.as_device_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
+      <el-table-column label="锁状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.et_device_lock_status" :value="scope.row.lockStatus"/>
+        </template>
+      </el-table-column>
       <el-table-column label="车辆上下线" align="center" prop="onlineStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.as_online_status" :value="scope.row.onlineStatus"/>
@@ -362,7 +377,7 @@ import { listArea } from '@/api/system/area'
 
 export default {
   name: "Device",
-  dicts: ['as_online_status', 'as_device_status'],
+  dicts: ['as_online_status', 'as_device_status','et_device_lock_status'],
   components: { Map, OrderRecord, RepairRecord, ReplacementRecord, QrCode, PlaceSearchDialog, LocationMap },
   props: {
     initLng: {