Merge branch 'dev'

@@ -180,6 +180,7 @@
                 });
                 _this.tableHeight = _this.calcHeightx(_this.calcHeight)
               }
+              console.log(_this.tableHeight, '_this.tableHeight');
             })
           } else {
             _this.tableHeight = window.innerHeight - _this.heightNum

@@ -19,11 +19,11 @@
         font-size: 12px;
         flex-wrap: wrap;
         padding-top: 5px;
-        height: 30px;
+        justify-content: flex-start;
+        min-height: 30px;
 
         span {
             display: flex;
-            align-items: center;
         }
 
         i {
@@ -35,18 +35,21 @@
         ul {
             display: flex;
             align-items: center;
+            flex-wrap: wrap;
+            flex: 1;
+            max-height: 38px;
 
             li {
                 color: $light-blue;
                 border: 1px solid $light-blue;
                 border-radius: 10px;
-                padding: 0 3px;
-                line-height: 16px;
+                padding: 1px 3px;
             }
         }
 
         .clean-btn {
             margin-left: 5px;
+            float: left;
         }
     }
 

 /*
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-10-26 14:22:21
+ * @LastEditTime: 2023-10-30 09:01:21
  */
 import { mapGetters } from 'vuex'
 import { defaultParameters } from "../../views/ywbl/ywsq/javascript/publicDefaultPar";

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-27 15:47:40
+ * @LastEditTime: 2023-10-27 17:31:20
  */
 export default {
   data () {
@@ -102,9 +102,11 @@ export default {
      * @author: renchao
      */
     getSearch (val) {
-      console.log(val, '2222222222222');
-      this.otherForm = val
-      this.iterationData()
+      this.$nextTick(() => {
+        this.otherForm = val
+        this.iterationData()
+        this.$refs.Lbtable.getHeight()
+      })
       this.queryClick()
     },
     /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-27 15:55:52
+ * @LastEditTime: 2023-10-30 09:01:33
 -->
 <template>
   <div class="from-clues">
@@ -121,7 +121,7 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="9">
             <el-form-item label="坐落">
               <el-input
                 placeholder="如需要模糊查询，前后输入%"
@@ -141,18 +141,19 @@
                 class="el-icon-circle-close"
                 @click="handelItem(item, index)"></i>
             </li>
+            <el-button
+              class="clean-btn"
+              type="text"
+              v-if="searchList.length > 0"
+              @click.native="hanldeCleanAll">清除全部
+            </el-button>
           </ul>
-          <el-button
-            class="clean-btn"
-            type="text"
-            v-if="searchList.length > 0"
-            @click.native="hanldeCleanAll">清除全部
-          </el-button>
         </el-row>
       </el-form>
     </div>
     <div class="from-clues-content">
       <lb-table
+        ref="Lbtable"
         :page-size="pageData.size"
         class="loadingtext"
         @sort-change="handleSort"
@@ -200,8 +201,9 @@
         tableData: {
           total: 0,
           columns: datas.columns(),
-          data: [],
-        }
+          data: []
+        },
+        jumpid: ""
       }
     },
     mounted () {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-27 16:08:06
+ * @LastEditTime: 2023-10-30 09:01:45
 -->
 <template>
   <div class="from-clues">
@@ -122,7 +122,7 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="9">
             <el-form-item label="坐落">
               <el-input
                 placeholder="如需要模糊查询，前后输入%"
@@ -142,24 +142,24 @@
                 class="el-icon-circle-close"
                 @click="handelItem(item, index)"></i>
             </li>
+            <el-button
+              class="clean-btn"
+              type="text"
+              v-if="searchList.length > 0"
+              @click.native="hanldeCleanAll">清除全部
+            </el-button>
           </ul>
-          <el-button
-            class="clean-btn"
-            type="text"
-            v-if="searchList.length > 0"
-            @click.native="hanldeCleanAll">清除全部
-          </el-button>
         </el-row>
       </el-form>
     </div>
     <!-- 表格 -->
     <div class="from-clues-content">
       <lb-table
+        ref="Lbtable"
         :page-size="pageData.size"
         class="loadingtext"
         @sort-change="handleSort"
         :current-page.sync="pageData.currentPage"
-        :heightNum="350"
         :total="tableData.total"
         @size-change="handleSizeChange"
         @p-current-change="handleCurrentChange"