Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-19 09:52:37
+ * @LastEditTime: 2023-10-24 13:28:43
 -->
 <template>
   <div class="djxxTable">
@@ -169,10 +169,8 @@
 
 <style lang="scss" scoped>
   @import "./qlxxCommon.scss";
-  .bgc {
-    td {
-      // background-color: rgb(182, 203, 207) !important;
-    }
+  .rollTable {
+    max-height: 80vh;
   }
   .xxTable tr td {
     min-width: 520px !important;

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-18 15:56:19
+ * @LastEditTime: 2023-10-24 15:00:35
 -->
 <template>
   <div class="from-clues">
-    <!-- <el-tabs type="card" v-model="activeName" @tab-click="handleTabClick" v-if="!isJump">
+    <el-tabs type="card" v-model="activeName" @tab-click="handleTabClick" v-if="!isJump">
       <el-tab-pane label="自然幢" name="zrz"></el-tab-pane>
       <el-tab-pane label="多幢" name="dz" v-if="sqywInfo.djywbm !== 'B37100'"></el-tab-pane>
-    </el-tabs> -->
+    </el-tabs>
     <div v-show="activeName == 'zrz'">
       <div class="from-clues-header">
         <el-form :model="queryzrzForm" ref="queryzrzForm" label-width="110px">
@@ -130,7 +130,7 @@
     data () {
       return {
         loading: false,
-        activeName: 'dz',
+        activeName: 'zrz',
         radioVal: '',
         queryzrzForm: {
           qllx: '',