From e06313b6dba4774aef0924f342f13e8433f8d6f6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 01 十二月 2023 15:32:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/plan/productionschedul/index.vue | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index ae15cb2..0775072 100644
--- a/src/views/plan/productionschedul/index.vue
+++ b/src/views/plan/productionschedul/index.vue
@@ -3,7 +3,7 @@
<basic-container>
<el-row>
<el-col :span="12">
- <div style="height:80vh;">
+ <div style="height:80vh">
<avue-crud :data="tableData" ref="crud" :option="option" :span-method="spanMethod"
@refresh-change="getData"
:page="page"
@@ -23,13 +23,13 @@
<el-button style="float: right; padding: 3px 0" type="text">鎿嶄綔鎸夐挳</el-button>
</div>
<div style="height:70vh;overflow-y: scroll;">
- <el-timeline reverse>
+ <el-timeline>
<el-timeline-item
placement="top"
v-for="(item, index) in scheduleList"
:key="index"
:timestamp="item.planTime">
- <el-card style="width:95%;margin: 0;padding: 0px 0px;">
+ <el-card style="width:95%;margin: 0;padding: 0px 10px;">
<p style="font-weight: bold;">{{item.title}}</p>
<p>瀹為檯鏃堕棿: {{ item.actualTime }}</p>
</el-card>
@@ -66,7 +66,7 @@
pageSize: 10
},
option: {
- height: 'auto',
+ height: 400,
selection: true,
columnBtn: false,
index: true,
@@ -199,7 +199,7 @@
TableForm,
},
computed: {
- ...mapGetters(['permissions'])
+ ...mapGetters(['permissions']),
},
created(){
this.loading = true
@@ -295,9 +295,9 @@
this.tableData = res.data.data.records
this.page.total = res.data.data.total
this.page.currentPage = res.data.data.records.pages
+ this.scheduleList = []
})
this.loading = false
-
},
handleCurrentChange(val) {
this.multipleSelection = val
@@ -379,7 +379,7 @@
}
}
</script>
-<style scoped>
+<style>
.basic-template-table .el-table__body .el-table__row td:first-child .cell {
padding-left: 0px;
padding-right: 0px;
@@ -417,8 +417,5 @@
content: '\E63E';
font-size: 14px;
visibility: hidden;
-}
-.avue-main .el-card__body{
- padding: 0px 20px;
}
</style>
--
Gitblit v1.9.3