Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
5e35dfe8 by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents 74c106e4 bc29a0fa
Inline Side-by-side
Showing 6 changed files with 24 additions and 16 deletions
...@@ -180,6 +180,7 @@ ...@@ -180,6 +180,7 @@
180 }); 180 });
181 _this.tableHeight = _this.calcHeightx(_this.calcHeight) 181 _this.tableHeight = _this.calcHeightx(_this.calcHeight)
182 } 182 }
183 console.log(_this.tableHeight, '_this.tableHeight');
183 }) 184 })
184 } else { 185 } else {
185 _this.tableHeight = window.innerHeight - _this.heightNum 186 _this.tableHeight = window.innerHeight - _this.heightNum
......
...@@ -19,11 +19,11 @@ ...@@ -19,11 +19,11 @@
19 font-size: 12px; 19 font-size: 12px;
20 flex-wrap: wrap; 20 flex-wrap: wrap;
21 padding-top: 5px; 21 padding-top: 5px;
22 height: 30px; 22 justify-content: flex-start;
23 min-height: 30px;
23 24
24 span { 25 span {
25 display: flex; 26 display: flex;
26 align-items: center;
27 } 27 }
28 28
29 i { 29 i {
...@@ -35,18 +35,21 @@ ...@@ -35,18 +35,21 @@
35 ul { 35 ul {
36 display: flex; 36 display: flex;
37 align-items: center; 37 align-items: center;
38 flex-wrap: wrap;
39 flex: 1;
40 max-height: 38px;
38 41
39 li { 42 li {
40 color: $light-blue; 43 color: $light-blue;
41 border: 1px solid $light-blue; 44 border: 1px solid $light-blue;
42 border-radius: 10px; 45 border-radius: 10px;
43 padding: 0 3px; 46 padding: 1px 3px;
44 line-height: 16px;
45 } 47 }
46 } 48 }
47 49
48 .clean-btn { 50 .clean-btn {
49 margin-left: 5px; 51 margin-left: 5px;
52 float: left;
50 } 53 }
51 } 54 }
52 55
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-26 14:22:21 4 * @LastEditTime: 2023-10-30 09:01:21
5 */ 5 */
6 import { mapGetters } from 'vuex' 6 import { mapGetters } from 'vuex'
7 import { defaultParameters } from "../../views/ywbl/ywsq/javascript/publicDefaultPar"; 7 import { defaultParameters } from "../../views/ywbl/ywsq/javascript/publicDefaultPar";
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-27 15:47:40 4 * @LastEditTime: 2023-10-27 17:31:20
5 */ 5 */
6 export default { 6 export default {
7 data () { 7 data () {
...@@ -102,9 +102,11 @@ export default { ...@@ -102,9 +102,11 @@ export default {
102 * @author: renchao 102 * @author: renchao
103 */ 103 */
104 getSearch (val) { 104 getSearch (val) {
105 console.log(val, '2222222222222'); 105 this.$nextTick(() => {
106 this.otherForm = val 106 this.otherForm = val
107 this.iterationData() 107 this.iterationData()
108 this.$refs.Lbtable.getHeight()
109 })
108 this.queryClick() 110 this.queryClick()
109 }, 111 },
110 /** 112 /**
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-27 15:55:52 4 * @LastEditTime: 2023-10-30 09:01:33
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
121 </el-input> 121 </el-input>
122 </el-form-item> 122 </el-form-item>
123 </el-col> 123 </el-col>
124 <el-col :span="6"> 124 <el-col :span="9">
125 <el-form-item label="坐落"> 125 <el-form-item label="坐落">
126 <el-input 126 <el-input
127 placeholder="如需要模糊查询，前后输入%" 127 placeholder="如需要模糊查询，前后输入%"
...@@ -141,18 +141,19 @@ ...@@ -141,18 +141,19 @@
141 class="el-icon-circle-close" 141 class="el-icon-circle-close"
142 @click="handelItem(item, index)"></i> 142 @click="handelItem(item, index)"></i>
143 </li> 143 </li>
144 </ul>
145 <el-button 144 <el-button
146 class="clean-btn" 145 class="clean-btn"
147 type="text" 146 type="text"
148 v-if="searchList.length > 0" 147 v-if="searchList.length > 0"
149 @click.native="hanldeCleanAll">清除全部 148 @click.native="hanldeCleanAll">清除全部
150 </el-button> 149 </el-button>
150 </ul>
151 </el-row> 151 </el-row>
152 </el-form> 152 </el-form>
153 </div> 153 </div>
154 <div class="from-clues-content"> 154 <div class="from-clues-content">
155 <lb-table 155 <lb-table
156 ref="Lbtable"
156 :page-size="pageData.size" 157 :page-size="pageData.size"
157 class="loadingtext" 158 class="loadingtext"
158 @sort-change="handleSort" 159 @sort-change="handleSort"
...@@ -200,8 +201,9 @@ ...@@ -200,8 +201,9 @@
200 tableData: { 201 tableData: {
201 total: 0, 202 total: 0,
202 columns: datas.columns(), 203 columns: datas.columns(),
203 data: [], 204 data: []
204 } 205 },
206 jumpid: ""
205 } 207 }
206 }, 208 },
207 mounted () { 209 mounted () {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-27 16:08:06 4 * @LastEditTime: 2023-10-30 09:01:45
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
122 </el-input> 122 </el-input>
123 </el-form-item> 123 </el-form-item>
124 </el-col> 124 </el-col>
125 <el-col :span="6"> 125 <el-col :span="9">
126 <el-form-item label="坐落"> 126 <el-form-item label="坐落">
127 <el-input 127 <el-input
128 placeholder="如需要模糊查询，前后输入%" 128 placeholder="如需要模糊查询，前后输入%"
...@@ -142,24 +142,24 @@ ...@@ -142,24 +142,24 @@
142 class="el-icon-circle-close" 142 class="el-icon-circle-close"
143 @click="handelItem(item, index)"></i> 143 @click="handelItem(item, index)"></i>
144 </li> 144 </li>
145 </ul>
146 <el-button 145 <el-button
147 class="clean-btn" 146 class="clean-btn"
148 type="text" 147 type="text"
149 v-if="searchList.length > 0" 148 v-if="searchList.length > 0"
150 @click.native="hanldeCleanAll">清除全部 149 @click.native="hanldeCleanAll">清除全部
151 </el-button> 150 </el-button>
151 </ul>
152 </el-row> 152 </el-row>
153 </el-form> 153 </el-form>
154 </div> 154 </div>
155 <!-- 表格 --> 155 <!-- 表格 -->
156 <div class="from-clues-content"> 156 <div class="from-clues-content">
157 <lb-table 157 <lb-table
158 ref="Lbtable"
158 :page-size="pageData.size" 159 :page-size="pageData.size"
159 class="loadingtext" 160 class="loadingtext"
160 @sort-change="handleSort" 161 @sort-change="handleSort"
161 :current-page.sync="pageData.currentPage" 162 :current-page.sync="pageData.currentPage"
162 :heightNum="350"
163 :total="tableData.total" 163 :total="tableData.total"
164 @size-change="handleSizeChange" 164 @size-change="handleSizeChange"
165 @p-current-change="handleCurrentChange" 165 @p-current-change="handleCurrentChange"
......