diff --git a/ruoyi-ui/src/views/basedevice/basedevice/index.vue b/ruoyi-ui/src/views/basedevice/basedevice/index.vue
index c132f37..9e04fd6 100644
--- a/ruoyi-ui/src/views/basedevice/basedevice/index.vue
+++ b/ruoyi-ui/src/views/basedevice/basedevice/index.vue
@@ -13,7 +13,16 @@
         />
       </el-form-item>
       <el-form-item :label="t('baseDevice.baseDevice.simCode')" prop="simCode">
-        <el-select v-model="queryParams.simCode" class="m-2" placeholder="Select">
+        <el-input
+            v-model="queryParams.simCode"
+            :placeholder="t('common.pleaseEnter') +t('baseDevice.baseDevice.deviceType')"
+            style="width: 200px"
+            clearable
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="t('baseDevice.baseDevice.deviceType')" prop="deviceType">
+        <el-select v-model="queryParams.deviceType" class="m-2" :placeholder="t('common.PleaseSelect')">
           <el-option
               v-for="item in options"
               :key="item.value"
@@ -22,15 +31,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="t('baseDevice.baseDevice.deviceType')" prop="deviceType">
-        <el-input
-            v-model="queryParams.deviceType"
-            :placeholder="t('common.pleaseEnter') +t('baseDevice.baseDevice.deviceType')"
-            style="width: 200px"
-            clearable
-            @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item :label="t('baseDevice.baseDevice.state')" prop="state">
         <el-input
             v-model="queryParams.state"
@@ -42,18 +42,17 @@
       </el-form-item>
       <el-form-item :label="t('baseDevice.baseDevice.activeTime')" prop="activeTime">
         <el-date-picker
-            clearable
-            style="width: 200px"
             v-model="queryParams.activeTime"
-            :placeholder="t('common.PleaseSelect') + t('baseDevice.baseDevice.activeTime')"
-            type="date"
-            format="YYYY/MM/DD"
-            value-format="YYYY-MM-DD"
+            type="daterange"
+            range-separator="To"
+            start-placeholder="Start date"
+            end-placeholder="End date"
+            :size="size"
         />
       </el-form-item>
       <el-form-item :label="t('baseDevice.baseDevice.lastRunTime')" prop="lastRunTime">
         <el-date-picker
-            v-model="value1"
+            v-model="queryParams.lastRunTime"
             type="daterange"
             range-separator="To"
             start-placeholder="Start date"
@@ -300,23 +299,11 @@ const {proxy} = getCurrentInstance();
 const options = [
   {
     value: 'Option1',
-    label: 'Option1',
+    label: 'GPS接收机',
   },
   {
     value: 'Option2',
-    label: 'Option2',
-  },
-  {
-    value: 'Option3',
-    label: 'Option3',
-  },
-  {
-    value: 'Option4',
-    label: 'Option4',
-  },
-  {
-    value: 'Option5',
-    label: 'Option5',
+    label: '胎压传感器',
   },
 ]