修改了AI无人站页面的搜索框分辨率问题

src/views/AIStation/ExtinguisherPage/ExtinguisherAlarmPage.vue

@@ -160,7 +160,7 @@ function Nindex(index) {
             :data="AlarmData"
             border
             style="width: 100%"
-            height="calc(100vh - 280px)"
+            height="calc(100vh - 330px)"
             :header-cell-class-name="tableHeaderClass"
             :row-class-name="tableBodyClass"
             @sort-change="handleSortChange"

src/views/AIStation/ExtinguisherPage/ExtinguisherHistoryPage.vue

@@ -162,7 +162,7 @@ function Nindex(index) {
             :data="HistoryData"
             border
             style="width: 98%;margin-left: 15px"
-            height="calc(100vh - 280px)"
+            height="calc(100vh - 330px)"
             :header-cell-class-name="tableHeaderClass"
             :row-class-name="tableBodyClass"
             @sort-change="handleSortChange"

src/views/AIStation/ExtinguisherPage/ExtinguisherNewDataPage.vue

@@ -152,7 +152,7 @@ function Nindex(index) {
             :data="ExtinguisherNewData"
             border
             style="width: 98%;margin-left: 15px"
-            height="calc(100vh - 280px)"
+            height="calc(100vh - 330px)"
             :header-cell-class-name="tableHeaderClass"
             :row-class-name="tableBodyClass"
             @sort-change="handleSortChange"

src/views/AIStation/ExtinguisherPage/index.vue

@@ -362,19 +362,15 @@ function getSupplys(){
 <template>
   <div class="app-content">
     <div class="search-wrapper">
-      <el-form :model="queryParams" :inline="true" style="padding: 10px 0 0 10px;">
+      <el-form :model="queryParams" :inline="true" style="padding: 10px 0 0 10px;display: flex;align-items: center;justify-content: space-between">
+        <div style="display: flex;align-items: center;width: 80%">
+          <div style="width: 25%">
             <el-form-item label="换热站:">
               <el-cascader :options="options" v-model="queryParams.stationId" filterable clearable :show-all-levels="false"
-                       placeholder="请选择" style="min-width: 250px;" :props="props" collapse-tags/>
-        </el-form-item>
-        <el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1 || selectedBtn === 2">
-          <el-select placeholder="请选择" clearable style="width: 140px" v-model="queryParams.alarmStatus">
-            <el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.label"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="设备名称:" prop="srcName">
-          <el-input placeholder="请输入内容" style="width: 140px" v-model="queryParams.srcName" clearable></el-input>
+                           placeholder="请选择" style="width: 180px;" :props="props" collapse-tags/>
             </el-form-item>
+          </div>
+          <div style="width: 25%;display: flex;flex-direction: column" v-if="selectedBtn !== 1">
             <el-form-item label="开始时间:" prop="beginTime" v-if="selectedBtn !== 1">
               <el-config-provider :locale="zhCn">
                 <el-date-picker
@@ -382,7 +378,7 @@ function getSupplys(){
                     type="datetime"
                     value-format="YYYY-MM-DD HH:mm:ss"
                     placeholder="选择开始时间"
-                style="width: 175px"
+                    style="width: 200px"
                     v-model="queryParams.beginTime"
                 />
               </el-config-provider>
@@ -394,16 +390,30 @@ function getSupplys(){
                     type="datetime"
                     value-format="YYYY-MM-DD HH:mm:ss"
                     placeholder="选择结束时间"
-                style="width: 175px"
+                    style="width: 200px"
                     v-model="queryParams.endTime"
                 />
               </el-config-provider>
             </el-form-item>
+          </div>
+          <div style="width: 25%;display: flex;flex-direction: column">
+            <el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1 || selectedBtn === 2">
+              <el-select placeholder="请选择" clearable style="width: 200px" v-model="queryParams.alarmStatus">
+                <el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.label"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="设备名称:" prop="srcName">
+              <el-input placeholder="请输入内容" style="width: 200px" v-model="queryParams.srcName" clearable></el-input>
+            </el-form-item>
+          </div>
+        </div>
+        <div style="display: flex;align-items: center">
           <el-form-item>
             <el-button type="primary" @click="search" class="add-search-btn">查询</el-button>
             <el-button type="primary" @click="resetSearch()" class="add-search-btn">重置</el-button>
             <el-button type="primary" @click="handleExport()" class="add-search-btn">导出</el-button>
           </el-form-item>
+        </div>
       </el-form>
     </div>
     <div>
@@ -431,8 +441,6 @@ function getSupplys(){
 
 .search-wrapper {
   width: 100%;
-  display: flex;
-  justify-content: start;
 }
 
 .search-wrapper .el-row {

src/views/AIStation/MoveMonitorPage/MoveMonitorAlarmPage.vue

@@ -166,7 +166,7 @@ function Nindex(index) {
             :data="AlarmData"
             border
             style="width: 98%;margin-left: 15px"
-            height="calc(100vh - 280px)"
+            height="calc(100vh - 330px)"
             :header-cell-class-name="tableHeaderClass"
             :row-class-name="tableBodyClass"
             @sort-change="handleSortChange"

src/views/AIStation/MoveMonitorPage/MoveMonitorHistoryPage.vue

@@ -172,7 +172,7 @@ function Nindex(index) {
             :data="HistoryData"
             border
             style="width: 98%;margin-left: 15px"
-            height="calc(100vh - 280px)"
+            height="calc(100vh - 330px)"
             :header-cell-class-name="tableHeaderClass"
             :row-class-name="tableBodyClass"
             @sort-change="handleSortChange"

src/views/AIStation/MoveMonitorPage/MoveMonitorNewDataPage.vue

@@ -187,7 +187,7 @@ function handleCamera(row) {
             :data="MoveMonitorNewData"
             border
             style="width: 98%;margin-left: 15px"
-            height="calc(100vh - 280px)"
+            height="calc(100vh - 330px)"
             :header-cell-class-name="tableHeaderClass"
             :row-class-name="tableBodyClass"
             @sort-change="handleSortChange"

src/views/AIStation/MoveMonitorPage/index.vue

@@ -521,22 +521,25 @@ function batchSetHandleChange(e){
 <template>
   <div class="app-content">
     <div class="search-wrapper">
-      <el-form :model="queryParams" :inline="true" style="padding: 10px 0 0 10px;">
+      <el-form :model="queryParams" :inline="true" style="padding: 10px 0 0 10px;display: flex;align-items: center;justify-content: space-between">
+        <div style="display: flex;align-items: center;width: 80%">
+          <div style="width: 25%">
             <el-form-item label="换热站:">
               <el-cascader :options="options" v-model="queryParams.stationId"  filterable  clearable :show-all-levels="false"
-                       placeholder="请选择" :props="props" style="min-width: 250px;" collapse-tags/>
+                           placeholder="请选择" :props="props" style="min-width: 180px;" collapse-tags/>
             </el-form-item>
+          </div>
+          <div style="width: 25%;display: flex;flex-direction: column" v-if="selectedBtn === 1 || selectedBtn === 2">
             <el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1 || selectedBtn === 2">
-          <el-select placeholder="请选择" clearable style="width: 140px" v-model="queryParams.alarmStatus">
+              <el-select placeholder="请选择" clearable style="width: 200px" v-model="queryParams.alarmStatus">
                 <el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.label"/>
               </el-select>
             </el-form-item>
-        <el-form-item label="设备:" prop="meterName" v-show="selectedBtn === 1 || selectedBtn === 2">
-          <el-input placeholder="请输入内容" style="width: 140px" v-model="queryParams.meterName" clearable></el-input>
-        </el-form-item>
-        <el-form-item label="设施名称:" prop="deviceName" v-show="selectedBtn === 3">
-          <el-input placeholder="请输入内容" style="width: 140px" v-model="queryParams.srcName" clearable></el-input>
+            <el-form-item label="设备名称:" prop="meterName" v-show="selectedBtn === 1 || selectedBtn === 2">
+              <el-input placeholder="请输入内容" style="width: 200px" v-model="queryParams.meterName" clearable></el-input>
             </el-form-item>
+          </div>
+          <div style="width: 25%;display: flex;flex-direction: column" v-if="selectedBtn !== 1">
             <el-form-item label="开始时间:" prop="beginTime" v-if="selectedBtn !== 1">
               <el-config-provider :locale="zhCn">
                 <el-date-picker
@@ -544,7 +547,7 @@ function batchSetHandleChange(e){
                     type="datetime"
                     value-format="YYYY-MM-DD HH:mm:ss"
                     placeholder="选择开始时间"
-                style="width: 175px"
+                    style="max-width: 200px"
                     v-model="queryParams.beginTime"
                 />
               </el-config-provider>
@@ -556,21 +559,33 @@ function batchSetHandleChange(e){
                     type="datetime"
                     value-format="YYYY-MM-DD HH:mm:ss"
                     placeholder="选择结束时间"
-                style="width: 175px"
+                    style="max-width: 200px"
                     v-model="queryParams.endTime"
                 />
               </el-config-provider>
             </el-form-item>
+          </div>
+          <div style="width: 20%;display: flex;flex-direction: column">
             <el-form-item label="自动更新:">
               <el-switch v-model="refresh" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
             </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="search" class="add-search-btn">查询</el-button>
-          <el-button type="primary" @click="resetSearch" class="add-search-btn">重置</el-button>
-          <el-button type="primary" @click="handleExport" class="add-search-btn">导出</el-button>
-          <el-button type="primary" @click="setError" class="add-search-btn" v-if="selectedBtn === 1">设置误差</el-button>
-          <el-button type="primary" @click="downloadPlugin()" class="add-search-btn" v-if="selectedBtn === 1">下载证书</el-button>&nbsp;&nbsp;<span v-if="selectedBtn === 1">（如果图片不能加载请安装证书）</span>
+            <el-form-item label="设施名称:" prop="deviceName" v-show="selectedBtn === 3">
+              <el-input placeholder="请输入内容" style="width: 200px" v-model="queryParams.srcName" clearable></el-input>
             </el-form-item>
+          </div>
+        </div>
+        <div style="display: flex; flex-direction: column;margin-bottom: 1%;margin-right: 10px;">
+          <div style="display: flex; justify-content: space-between;">
+            <el-button style="margin-left: 12px;" type="primary" @click="search" class="add-search-btn">查询</el-button>
+            <el-button style="margin-left: 12px;" type="primary" @click="resetSearch" class="add-search-btn">重置</el-button>
+            <el-button style="margin-left: 12px;" type="primary" @click="handleExport" class="add-search-btn">导出</el-button>
+            <el-button style="margin-left: 12px;" type="primary" @click="setError" class="add-search-btn" v-if="selectedBtn === 1">设置误差</el-button>
+          </div>
+          <div style="display: flex; justify-content: flex-start;align-items: center;">
+            <el-button style="margin-top: 12px;margin-left: 12px" type="primary" @click="downloadPlugin()" class="add-search-btn" v-if="selectedBtn === 1">下载证书</el-button>
+            <span v-if="selectedBtn === 1">（如果图片不能加载请安装证书）</span>
+          </div>
+        </div>
       </el-form>
     </div>
     <div>
@@ -668,8 +683,6 @@ function batchSetHandleChange(e){
 
 .search-wrapper {
   width: 100%;
-  display: flex;
-  justify-content: start;
 }
 
 .search-wrapper .el-row {

src/views/AIStation/PipelineTempPage/PipelineTempAlarmPage.vue

@@ -166,7 +166,7 @@ function Nindex(index) {
             border
             :cell-style="setCellStyle"
             style="width: 98%;margin-left: 15px"
-            height="calc(100vh - 280px)"
+            height="calc(100vh - 330px)"
             :header-cell-class-name="tableHeaderClass"
             :row-class-name="tableBodyClass"
             @sort-change="handleSortChange"

src/views/AIStation/PipelineTempPage/PipelineTempHistoryPage.vue

@@ -194,7 +194,7 @@ function Nindex(index) {
             border
             :cell-style="setCellStyle"
             style="width: 98%;margin-left: 15px"
-            height="calc(100vh - 280px)"
+            height="calc(100vh - 330px)"
             :header-cell-class-name="tableHeaderClass"
             :row-class-name="tableBodyClass"
             @sort-change="handleSortChange"

src/views/AIStation/PipelineTempPage/PipelineTempNewDataPage.vue

@@ -174,7 +174,7 @@ function Nindex(index) {
             border
             :cell-style="setCellStyle"
             style="width: 98%;margin-left: 15px"
-            height="calc(100vh - 280px)"
+            height="calc(100vh - 330px)"
             :header-cell-class-name="tableHeaderClass"
             :row-class-name="tableBodyClass"
             @sort-change="handleSortChange"

src/views/AIStation/PipelineTempPage/index.vue

@@ -391,27 +391,35 @@ function datePickerEndConfirm(e){
 <template>
   <div class="app-content">
     <div class="search-wrapper">
-      <el-form :model="queryParams" :inline="true" style="padding: 10px 0 0 10px;">
+      <el-form :model="queryParams" :inline="true" style="padding: 10px 0 0 10px;display: flex;align-items: center;justify-content: space-between">
+        <div style="display: flex;align-items: center;width: 80%">
+          <div style="width: 25%;">
             <el-form-item label="换热站:">
               <el-cascader :options="options" v-model="queryParams.stationId" filterable clearable :show-all-levels="false"
-                       placeholder="请选择" style="min-width: 250px;" :props="props" collapse-tags/>
+                           placeholder="请选择" style="min-width: 180px;" :props="props" collapse-tags/>
             </el-form-item>
+          </div>
+          <div style="width: 25%;display: flex;flex-direction: column" v-if="selectedBtn === 1 || selectedBtn === 2">
             <el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1 || selectedBtn === 2">
-          <el-select placeholder="请选择" style="width: 140px" clearable v-model="queryParams.alarmStatus">
+              <el-select placeholder="请选择" style="width: 200px" clearable v-model="queryParams.alarmStatus">
                 <el-option v-for="item in alarmStatusList"  :key="item.value" :value="item.value" :label="item.label"/>
               </el-select>
             </el-form-item>
             <el-form-item label="光纤设备:" prop="deviceName" v-show="selectedBtn === 1 || selectedBtn === 2">
-          <el-input placeholder="请输入内容" style="width: 140px"  v-model="queryParams.deviceName" clearable></el-input>
+              <el-input placeholder="请输入内容" style="width: 200px"  v-model="queryParams.deviceName" clearable></el-input>
             </el-form-item>
+          </div>
+          <div style="width: 25%;display: flex;flex-direction: column" v-if="selectedBtn === 3">
             <el-form-item label="报警类型:" prop="thermalAlarmType" v-show="selectedBtn === 3">
-          <el-select placeholder="请选择" style="width: 140px" clearable   v-model="queryParams.thermalAlarmType">
+              <el-select placeholder="请选择" style="width: 200px" clearable   v-model="queryParams.thermalAlarmType">
                 <el-option v-for="item in thermalAlarmTypeList" :key="item.value" :value="item.value" :label="item.label"/>
               </el-select>
             </el-form-item>
             <el-form-item label="设施名称:" prop="deviceName" v-show="selectedBtn === 3">
-          <el-input placeholder="请输入内容" style="width: 140px" v-model="queryParams.srcName" clearable></el-input>
+              <el-input placeholder="请输入内容" style="width: 200px" v-model="queryParams.srcName" clearable></el-input>
             </el-form-item>
+          </div>
+          <div style="width: 25%;display: flex;flex-direction: column" v-if="selectedBtn !== 1">
             <el-form-item label="开始时间:" prop="beginTime" v-if="selectedBtn !== 1">
               <el-config-provider :locale="zhCn">
                 <el-date-picker
@@ -419,7 +427,7 @@ function datePickerEndConfirm(e){
                     type="datetime"
                     value-format="YYYY-MM-DD HH:mm:ss"
                     placeholder="选择开始时间"
-                style="width: 175px"
+                    style="width: 200px"
                     v-model="queryParams.beginTime"
                 />
               </el-config-provider>
@@ -431,19 +439,30 @@ function datePickerEndConfirm(e){
                     type="datetime"
                     value-format="YYYY-MM-DD HH:mm:ss"
                     placeholder="选择结束时间"
-                style="width: 175px"
+                    style="width: 200px"
                     v-model="queryParams.endTime"
                 />
               </el-config-provider>
             </el-form-item>
+          </div>
+          <div style="width: 20%">
             <el-form-item label="自动更新:">
-          <el-switch v-model="refresh" style="width: 40px" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
+              <el-switch v-model="refresh" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
             </el-form-item>
+          </div>
+        </div>
+        <div style="display: flex;padding-bottom: 1%;padding-right: 20px;">
           <el-form-item>
-          <el-button type="primary" @click="search" class="add-search-btn">查询</el-button>
-          <el-button type="primary" @click="resetSearch" class="add-search-btn">重置</el-button>
-          <el-button type="primary" @click="handleExport()" class="add-search-btn">导出</el-button>
+            <el-button style="margin-left: 12px;" type="primary" @click="search" class="add-search-btn">查询</el-button>
+            <el-button style="margin-left: 12px;" type="primary" @click="resetSearch" class="add-search-btn">重置</el-button>
+            <el-button style="margin-left: 12px;" type="primary" @click="handleExport" class="add-search-btn">导出</el-button>
           </el-form-item>
+        </div>
+<!--        <el-form-item>-->
+<!--          <el-button type="primary" @click="search" class="add-search-btn">查询</el-button>-->
+<!--          <el-button type="primary" @click="resetSearch" class="add-search-btn">重置</el-button>-->
+<!--          <el-button type="primary" @click="handleExport()" class="add-search-btn">导出</el-button>-->
+<!--        </el-form-item>-->
       </el-form>
     </div>
     <div>
@@ -470,8 +489,6 @@ function datePickerEndConfirm(e){
 
 .search-wrapper {
   width: 100%;
-  display: flex;
-  justify-content: start;
 }
 
 .search-wrapper .el-row {

src/views/AIStation/RecyclePumpPage/RecyclePumpAlarmPage.vue

@@ -158,7 +158,7 @@ function Nindex(index) {
             :data="TransTempAlarmData"
             border
             style="width: 98%;margin-left: 15px"
-            height="calc(100vh - 280px)"
+            height="calc(100vh - 330px)"
             :header-cell-class-name="tableHeaderClass"
             :row-class-name="tableBodyClass"
             @sort-change="handleSortChange"

src/views/AIStation/RecyclePumpPage/RecyclePumpHistoryPage.vue

@@ -474,7 +474,7 @@ function Nindex(index) {
             :data="RecyclePumpData"
             border
             style="width: 45%;margin-left: 15px"
-            height="calc(100vh - 280px)"
+            height="calc(100vh - 330px)"
             :header-cell-class-name="tableHeaderClass"
             :row-class-name="tableBodyClass"
             @row-click="selectRow"

src/views/AIStation/RecyclePumpPage/RecyclePumpNewDataPage.vue

@@ -459,7 +459,7 @@ function Nindex(index) {
             :data="RecyclePumpData"
             border
             style="width: 45%;margin-left: 15px"
-            height="calc(100vh - 280px)"
+            height="calc(100vh - 330px)"
             :header-cell-class-name="tableHeaderClass"
             :row-class-name="tableBodyClass"
             @row-click="selectRow"

src/views/AIStation/RecyclePumpPage/index.vue

@@ -358,19 +358,15 @@ function getSupplys(){
 <template>
   <div class="app-content">
     <div class="search-wrapper">
-      <el-form :model="queryParams" :inline="true" style="padding: 10px 0 0 10px;">
+      <el-form :model="queryParams" :inline="true" style="padding: 10px 0 0 10px;display: flex;align-items: center;justify-content: space-between">
+        <div style="display: flex;align-items: center;width: 80%">
+          <div style="width: 25%">
             <el-form-item label="换热站:">
               <el-cascader :options="options" v-model="queryParams.stationId" filterable clearable :show-all-levels="false"
-                       placeholder="请选择" style="min-width: 250px;"  :props="props" collapse-tags/>
-        </el-form-item>
-        <el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1 || selectedBtn === 2">
-          <el-select placeholder="请选择" clearable style="width: 140px" v-model="queryParams.alarmStatus">
-            <el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.label"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="设备名称:" prop="deviceName">
-          <el-input placeholder="请输入内容" style="width: 140px" v-model="queryParams.deviceName" clearable></el-input>
+                           placeholder="请选择" style="min-width: 180px;"  :props="props" collapse-tags/>
             </el-form-item>
+          </div>
+          <div style="display: flex;flex-direction: column;width: 25%" v-if="selectedBtn !== 1">
             <el-form-item label="开始时间:" prop="beginTime" v-if="selectedBtn !== 1">
               <el-config-provider :locale="zhCn">
                 <el-date-picker
@@ -378,7 +374,7 @@ function getSupplys(){
                     type="datetime"
                     value-format="YYYY-MM-DD HH:mm:ss"
                     placeholder="选择开始时间"
-                style="width: 175px"
+                    style="width: 200px"
                     v-model="queryParams.beginTime"
                 />
               </el-config-provider>
@@ -390,19 +386,35 @@ function getSupplys(){
                     type="datetime"
                     value-format="YYYY-MM-DD HH:mm:ss"
                     placeholder="选择结束时间"
-                style="width: 175px"
+                    style="width: 200px"
                     v-model="queryParams.endTime"
                 />
               </el-config-provider>
             </el-form-item>
+          </div>
+          <div style="width: 25%;display: flex;flex-direction: column;">
+            <el-form-item label="设备名称:" prop="deviceName">
+              <el-input placeholder="请输入内容" style="width: 200px" v-model="queryParams.deviceName" clearable></el-input>
+            </el-form-item>
             <el-form-item label="自动更新:">
-          <el-switch v-model="refresh"  style="width: 40px" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
+              <el-switch v-model="refresh" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
             </el-form-item>
+          </div>
+          <div style="width: 20%" v-if="selectedBtn === 1 || selectedBtn === 2">
+            <el-form-item label="告警状态:" prop="alarmStatus" v-show="selectedBtn === 1 || selectedBtn === 2">
+              <el-select placeholder="请选择" clearable style="width: 200px" v-model="queryParams.alarmStatus">
+                <el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.label"/>
+              </el-select>
+            </el-form-item>
+          </div>
+        </div>
+        <div style="display: flex;align-items: center">
           <el-form-item>
             <el-button type="primary" @click="search" class="add-search-btn">查询</el-button>
             <el-button type="primary" @click="resetSearch" class="add-search-btn">重置</el-button>
             <el-button type="primary" @click="handleExport" class="add-search-btn">导出</el-button>
           </el-form-item>
+        </div>
       </el-form>
     </div>
     <div>
@@ -429,8 +441,6 @@ function getSupplys(){
 
 .search-wrapper {
   width: 100%;
-  display: flex;
-  justify-content: start;
 }
 
 .search-wrapper .el-row {

src/views/AIStation/TransTempPage/index.vue

@@ -380,14 +380,15 @@ function getSupplys() {
 <template>
   <div class="app-content">
     <div class="search-wrapper">
-      <el-form :model="queryParams" :inline="true" style="padding: 10px 0 0 10px;display: flex;align-items: center" >
+      <el-form :model="queryParams" :inline="true" style="padding: 10px 0 0 10px;display: flex;align-items: center;justify-content: space-between">
+        <div style="display: flex;align-items: center;width: 80%">
           <div style="width: 25%;">
             <el-form-item label="换热站:">
               <el-cascader :options="options" v-model="queryParams.stationId" filterable clearable :show-all-levels="false"
                            placeholder="请选择" style="min-width: 180px;"  :props="props" collapse-tags/>
             </el-form-item>
           </div>
-        <div style="width: 20%;">
+          <div style="width: 20%;display: flex;flex-direction: column">
             <el-form-item label="自动更新:">
               <el-switch v-model="refresh" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
             </el-form-item>
@@ -395,7 +396,7 @@ function getSupplys() {
               <el-input placeholder="请输入内容" v-model="queryParams.deviceName" clearable></el-input>
             </el-form-item>
           </div>
-        <div style="width: 20%;" v-if="selectedBtn !== 1">
+          <div style="width: 25%;display: flex;flex-direction: column" v-if="selectedBtn !== 1">
             <el-form-item label="开始时间:" prop="beginTime" v-if="selectedBtn !== 1">
               <el-config-provider :locale="zhCn">
                 <el-date-picker
@@ -428,7 +429,7 @@ function getSupplys() {
               </el-select>
             </el-form-item>
           </div>
-        <div style="width: 20%;" v-if="selectedBtn === 3">
+          <div style="width: 20%;display: flex;flex-direction: column" v-if="selectedBtn === 3">
             <el-form-item label="处理状态:" prop="handleStatus" v-if="selectedBtn === 3">
               <el-select placeholder="请选择" clearable style="width: 200px" v-model="queryParams.handleStatus">
                 <el-option v-for="item in handleStatusList" :key="item.value" :value="item.value" :label="item.label"/>
@@ -440,6 +441,7 @@ function getSupplys() {
               </el-select>
             </el-form-item>
           </div>
+        </div>
 <!--        <div style="width: 200px;">-->
 <!--          <el-form-item>-->
 <!--            <el-button style="margin-left: 12px;margin-right: 10px" type="primary" @click="search" class="add-search-btn">查询</el-button>-->
@@ -447,14 +449,12 @@ function getSupplys() {
 <!--            <el-button style="margin-right: 10px;margin-top: 10px" type="primary" @click="handleExport" class="add-search-btn">导出</el-button>-->
 <!--          </el-form-item>-->
 <!--        </div>-->
-        <div style="display: flex; flex-direction: column;margin-bottom: 1%">
-          <div style="display: flex; justify-content: space-between;">
+        <div style="display: flex; align-items: center">
+          <el-form-item>
             <el-button style="margin-left: 12px;" type="primary" @click="search" class="add-search-btn">查询</el-button>
             <el-button style="margin-left: 12px;" type="primary" @click="resetSearch" class="add-search-btn">重置</el-button>
-          </div>
-          <div style="display: flex; justify-content: flex-start;">
-            <el-button style="margin-top: 12px;margin-left: 12px;" type="primary" @click="handleExport" class="add-search-btn">导出</el-button>
-          </div>
+            <el-button style="margin-left: 12px;" type="primary" @click="handleExport" class="add-search-btn">导出</el-button>
+          </el-form-item>
         </div>
       </el-form>
     </div>
@@ -484,8 +484,6 @@ function getSupplys() {
 
 .search-wrapper {
   width: 100%;
-  display: flex;
-  justify-content: start;
 }
 
 .search-wrapper .el-row {

src/views/AIStation/VoiceCommandPage.vue

@@ -379,17 +379,23 @@ function Nindex(index) {
   <div>
     <div class="ExtinguisherPage-container">
       <div class="search-wrapper">
-        <el-form style="padding: 10px 0 0 10px" :model="queryParams" :inline="true">
+        <el-form style="padding: 10px 0 0 10px;display: flex;align-items: center;justify-content: space-between" :model="queryParams" :inline="true">
+          <div style="display: flex;align-items: center;width: 80%">
+            <div style="width: 25%;">
               <el-form-item label="换热站:">
                 <el-cascader :options="options" v-model="queryParams.stationId" filterable clearable :show-all-levels="false"
-                         placeholder="请选择" style="min-width: 250px;"  :props="props" collapse-tags/>
+                             placeholder="请选择" style="min-width: 200px;"  :props="props" collapse-tags/>
               </el-form-item>
+            </div>
+            <div style="width: 25%;display: flex;flex-direction: column">
               <el-form-item label="IP地址:" prop="ipAddress">
-            <el-input placeholder="请输入IP地址" style="width: 130px" v-model="queryParams.ipAddress"/>
+                <el-input placeholder="请输入IP地址" style="width: 200px" v-model="queryParams.ipAddress"/>
               </el-form-item>
               <el-form-item label="MAC地址:" prop="macAddress">
-            <el-input placeholder="请输入MAC地址" style="width: 130px" v-model="queryParams.macAddress"/>
+                <el-input placeholder="请输入MAC地址" style="width: 200px" v-model="queryParams.macAddress"/>
               </el-form-item>
+            </div>
+            <div style="width: 25%;display: flex;flex-direction: column">
               <el-form-item label="开始时间:" prop="beginTime">
                 <el-config-provider :locale="zhCn">
                   <el-date-picker
@@ -397,7 +403,7 @@ function Nindex(index) {
                       type="datetime"
                       value-format="YYYY-MM-DD HH:mm:ss"
                       placeholder="选择开始时间"
-                  style="width: 175px"
+                      style="width: 200px"
                       v-model="queryParams.beginTime"
                   />
                 </el-config-provider>
@@ -409,19 +415,25 @@ function Nindex(index) {
                       type="datetime"
                       value-format="YYYY-MM-DD HH:mm:ss"
                       placeholder="选择结束时间"
-                  style="width: 175px"
+                      style="width: 200px"
                       v-model="queryParams.endTime"
                   />
                 </el-config-provider>
               </el-form-item>
+            </div>
+            <div style="width: 10%;">
               <el-form-item label="自动更新:">
-            <el-switch v-model="refresh" style="width: 40px" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
+                <el-switch v-model="refresh" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
               </el-form-item>
+            </div>
+          </div>
+          <div>
             <el-form-item>
               <el-button type="primary" @click="loadData()" class="add-search-btn">查询</el-button>
               <el-button type="primary" @click="resetSearch" class="add-search-btn">重置</el-button>
               <el-button type="primary" @click="handleExport()" class="add-search-btn">导出</el-button>
             </el-form-item>
+          </div>
         </el-form>
       </div>
       <div>
@@ -429,7 +441,7 @@ function Nindex(index) {
             :data="VoiceCommandData"
             border
             style="width: 98%;margin-left: 15px"
-            height="calc(100vh - 230px)"
+            height="calc(100vh - 280px)"
             :header-cell-class-name="tableHeaderClass"
             :row-class-name="tableBodyClass"
             @sort-change="handleSortChange"
@@ -527,8 +539,6 @@ function Nindex(index) {
 
 .search-wrapper {
   width: 100%;
-  display: flex;
-  justify-content: start;
 }
 
 .search-wrapper .el-row {