diff --git a/src/components/LowDesign/src/LowReport/index.vue b/src/components/LowDesign/src/LowReport/index.vue index 88422c0..5397626 100644 --- a/src/components/LowDesign/src/LowReport/index.vue +++ b/src/components/LowDesign/src/LowReport/index.vue @@ -209,7 +209,7 @@ const initTable = async () => { menu: false, addBtn: false, height: isHeight ? 'auto' : undefined, - calcHeight: isHeight ? 10 : '', + calcHeight: isHeight ? 160 : '', index: reportVo.tableConfig.includes('index'), border: reportVo.tableConfig.includes('border'), stripe: reportVo.tableConfig.includes('stripe'), @@ -281,11 +281,6 @@ const initTable = async () => { tableSearch.value[config.prop]=item.searchDefaultValue } } - if(['年','年度','年份','月','月度','月份','年月'].includes(item.fieldName)){ - config.searchSpan=3 - config.searchLabelWidth=60 - - } if(!!item.isAmount){ index==0?amountFieds.value.fistField=config.prop:'' amountFieds.value[item.isAmount]=config @@ -354,7 +349,7 @@ const initTableLayout = () => { if (tableInfo.value.isHeight || props.calcHeight) { const calcH = props.calcHeight - let calcHeight = calcH || 10 + let calcHeight = calcH || 160 if (calcH) tableOption.value.height = 'auto' tableOption.value.calcHeight = calcHeight } diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue index 236ac54..9e02df6 100644 --- a/src/views/Login/Login.vue +++ b/src/views/Login/Login.vue @@ -1,14 +1,19 @@