|
|
@@ -68,9 +68,12 @@
|
|
|
<div v-if="getPathName()">
|
|
|
<p>所属架构：{{ getPathName() }}</p>
|
|
|
</div>
|
|
|
- <component :is="componentType" :tableData="tableData" :queryParams="queryParams" @option="handleOption"
|
|
|
+ <div style="height:calc(100% - 55px)">
|
|
|
+ <component :is="componentType" :tableData="tableData" :queryParams="queryParams" @option="handleOption"
|
|
|
@on-sort="handleSort">
|
|
|
- </component>
|
|
|
+ </component>
|
|
|
+ </div>
|
|
|
+
|
|
|
</el-main>
|
|
|
<el-footer class="pagination">
|
|
|
<el-pagination background layout="total, prev, pager, next, jumper" :current-page.sync="queryParams.current"
|
|
|
@@ -401,10 +404,10 @@ export default {
|
|
|
val.forEach(item => {
|
|
|
if (item.type == 3) {
|
|
|
params[item.value] = item.searchValue.map(itemValue => {
|
|
|
- return itemValue.value
|
|
|
+ return itemValue.value || itemValue.label
|
|
|
})
|
|
|
} else {
|
|
|
- params[item.value] = item.searchValue.value
|
|
|
+ params[item.value] = item.searchValue.value || item.searchValue.label
|
|
|
}
|
|
|
})
|
|
|
|
