Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-12-26 15:00:22
+ * @LastEditTime: 2024-03-11 15:18:56
 -->
 <template>
   <dialogBox
@@ -24,6 +24,7 @@
       v-if="activeName==1"
       :model="ruleForm"
       :rules="rules"
+      style="height:490px"
       ref="ruleForm"
       label-width="120px">
       <el-form-item label="身份证读卡器" style="margin-top:-10px;margin-bottom:0">
@@ -261,7 +262,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <div v-if="activeName==2" class="padding10">
+    <div v-if="activeName==2" class="padding10" style="height:550px">
       <el-form :model="queryFormQY" label-width="80px">
         <el-row>
           <el-col :span="8">
@@ -283,7 +284,7 @@
           </el-col>
         </el-row>
       </el-form>
-      <el-table :data="tableDataQy.data" border v-Loading="loading" :height="563">
+      <el-table :data="tableDataQy.data" border v-Loading="loading" :height="450">
         <el-table-column label="序号" type="index" width="50" align="center">
           <template slot-scope="scope">
             {{(pageData.currentPage - 1) * pageData.pageSize + scope.$index + 1}}
@@ -301,7 +302,7 @@
         @current-change="handleQYCurrentChange"></el-pagination>
     </div>
 
-    <div v-if="activeName==3" class="padding10">
+    <div v-if="activeName==3" class="padding10" style="height:550px">
       <el-form :model="queryFormYH" label-width="80px">
         <el-row>
           <el-col :span="8">
@@ -323,7 +324,7 @@
           </el-col>
         </el-row>
       </el-form>
-      <el-table :data="tableDataYh.data" border v-Loading="loading" :height="563">
+      <el-table :data="tableDataYh.data" border v-Loading="loading" :height="450">
         <el-table-column label="序号" type="index" width="50" align="center">
           <template slot-scope="scope">
             {{(pageData.currentPage - 1) * pageData.pageSize + scope.$index + 1}}