修改bug
This commit is contained in:
@@ -20,11 +20,11 @@
|
||||
</el-form-item>
|
||||
<el-form-item v-show="listQuery.date === 1" label="时间范围" prop="reportTime">
|
||||
<el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周"
|
||||
placeholder="选择周" style="width: 180px" @change="onValueChange">
|
||||
placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
|
||||
</el-date-picker>
|
||||
至
|
||||
<el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周"
|
||||
placeholder="选择周" style="width: 180px" @change="onValueChange">
|
||||
placeholder="选择周" style="width: 180px" @change="onValueChange" :picker-options="{'firstDayOfWeek': 1}">
|
||||
</el-date-picker>
|
||||
<!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
|
||||
{{ date1 }} 至 {{ date2 }},共 {{ weekNum }} 周
|
||||
@@ -84,7 +84,7 @@
|
||||
:chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
|
||||
</el-col> -->
|
||||
</el-row>
|
||||
<base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
|
||||
<base-table :key="showTable" :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.current"
|
||||
:limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
|
||||
</div>
|
||||
<!-- <div class="containerBottom">
|
||||
@@ -107,7 +107,8 @@ export default {
|
||||
return {
|
||||
otherProps: [],
|
||||
title: '',
|
||||
currentMenu:'邯郸',
|
||||
currentMenu: '邯郸',
|
||||
showTable:false,
|
||||
listQuery: {
|
||||
start: undefined,
|
||||
end: undefined,
|
||||
@@ -652,7 +653,8 @@ export default {
|
||||
// })
|
||||
// }
|
||||
// }
|
||||
this.tableData =res.data[0].list.length !== 0? dataArr : []
|
||||
this.tableData = res.data[0].list.length !== 0 ? dataArr : []
|
||||
this.showTable = !this.showTable
|
||||
},
|
||||
_setTableHeight() {
|
||||
this.tableH = this.tableHeight(137) / 2 - 70;
|
||||
|
||||
Reference in New Issue
Block a user