fix(CoilSelector,acid): 调整表格高度并修复侧边菜单排序问题
1. 修复CoilSelector组件表格高度计算,使用calc适配排序状态下的布局 2. 调整acid页面侧边菜单的菜单项顺序,将跟踪菜单移至正确位置
This commit is contained in:
@@ -142,7 +142,7 @@
|
||||
</div>
|
||||
|
||||
<div class="selected-table-wrapper">
|
||||
<el-table :data="selectedCoils" :height="orderBy ? '100%' : '200px'">
|
||||
<el-table :data="selectedCoils" :height="orderBy ? 'calc(100% - 30px)' : '200px'">
|
||||
<el-table-column v-for="column in renderColumns" :label="column.label" :align="column.align"
|
||||
:prop="column.prop" :width="column.width" :show-overflow-tooltip="column.showOverflowTooltip" />
|
||||
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
<template>
|
||||
<div class="acid-container">
|
||||
<div class="acid-sidebar">
|
||||
<el-menu
|
||||
:default-active="activeMenu"
|
||||
class="sidebar-menu"
|
||||
@select="handleMenuSelect"
|
||||
>
|
||||
<el-menu :default-active="activeMenu" class="sidebar-menu" @select="handleMenuSelect">
|
||||
<el-menu-item index="inventory">
|
||||
<i class="el-icon-box"></i>
|
||||
<span slot="title">库存</span>
|
||||
@@ -34,6 +30,10 @@
|
||||
<i class="el-icon-date"></i>
|
||||
<span slot="title">计划</span>
|
||||
</el-menu-item>
|
||||
<el-menu-item index="tracking">
|
||||
<i class="el-icon-location-outline"></i>
|
||||
<span slot="title">跟踪</span>
|
||||
</el-menu-item>
|
||||
<el-menu-item index="actualPerformance">
|
||||
<i class="el-icon-data-analysis"></i>
|
||||
<span slot="title">实绩</span>
|
||||
@@ -54,10 +54,6 @@
|
||||
<i class="el-icon-alarm-clock"></i>
|
||||
<span slot="title">app</span>
|
||||
</el-menu-item>
|
||||
<el-menu-item index="tracking">
|
||||
<i class="el-icon-location-outline"></i>
|
||||
<span slot="title">跟踪</span>
|
||||
</el-menu-item>
|
||||
</el-menu>
|
||||
</div>
|
||||
<div style="flex: 1; overflow: hidden;">
|
||||
|
||||
Reference in New Issue
Block a user