修改bug

This commit is contained in:
‘937886381’
2024-06-24 09:48:06 +08:00
parent c7205e32a3
commit 0992940655
10 changed files with 69 additions and 77 deletions

View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-15 10:49:13
* @LastEditTime: 2024-06-21 15:18:20
* @LastEditTime: 2024-06-24 09:39:27
* @LastEditors: zhp
* @Description:
-->
@@ -58,7 +58,7 @@
</el-form-item>
</el-form>
<base-table :span-method="objectSpanMethod" :table-props="tableProps" :page="listQuery.pageNo"
:limit="listQuery.pageSize" :table-data="tableData">
:limit="listQuery.pageSize" :table-data="tableData" :max-height="tableH">
</base-table>
</div>
</div>
@@ -101,6 +101,7 @@ export default {
end: undefined,
reportTime: []
},
tableH: this.tableHeight(269),
timeList: [
{
value: 0,
@@ -191,6 +192,7 @@ export default {
// this.changeTime()
// },
mounted() {
this.tableH = this.tableHeight(269);
// this.getOverView()
const today = new Date()
const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000))
@@ -489,7 +491,7 @@ export default {
if (res.data.length === 0) {
this.tableData = []
} else {
if (this.currentMenu !== '瑞昌') {
if (this.currentMenu != '瑞昌') {
this.tableData = dataArr
} else {
this.tableData = dataArr.filter(function (item) {
@@ -497,13 +499,6 @@ export default {
});
}
}
this.listQuery.total = res.data.total
if (this.listQuery.total > 0) {
this.tableData.forEach(item => {
item.startTime = item.startDate ? item.startDate[0] + '-' + item.startDate[1] + '-' + item.startDate[2] : '--'
item.endTime = item.endDate ? item.endDate[0] + '-' + item.endDate[1] + '-' + item.endDate[2] : '--'
})
}
},
buttonClick(val) {
this.listQuery.factorys = val.factory?.length > 0 ? val.factory : undefined