From c8d3c85876534f17e92ac2e8d5917ab6195c2472 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 15 Apr 2025 16:55:02 +0800
Subject: [PATCH] feat: 去掉分页，调整机巢详情列表样式
---
src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue | 18 +++++++-----------
src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue | 31 ++++++++++++++++---------------
2 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue
index 00afe76..587af5b 100644
--- a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue
+++ b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceEvent.vue
@@ -37,16 +37,16 @@
</el-table-column>
</el-table>
</div>
- <!-- <el-pagination
+ <el-pagination
class="ztzf-pagination"
background
- :page-sizes="[10, 20, 30, 50]"
+
v-model:current-page="sizeParams.current"
v-model:page-size="sizeParams.size"
- layout="prev, pager, next,sizes, jumper"
+ layout="prev, pager, next, jumper"
:total="total"
@change="pageChange"
- /> -->
+ />
</div>
</template>
<script setup>
@@ -60,7 +60,7 @@
})
const sizeParams = ref({
current: 1,
- size: 99999,
+ size: 5,
})
const store = useStore()
const device_sn = computed(() => store.state.home.singleUavHome.device_sn)
@@ -103,9 +103,7 @@
</script>
<style scoped lang="scss">
-.deviceevent-container {
-margin-top:10px;
-}
+
// 标题
.machineTableDetailsTitle {
margin: 0 24px;
@@ -130,9 +128,7 @@
// 表格
.deviceevent-table {
padding: 0 17px;
-height: 280px;
- overflow: hidden;
- overflow-y: scroll !important;
+
}
// 分页
diff --git a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue
index 19c3a42..4999956 100644
--- a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue
+++ b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue
@@ -2,8 +2,9 @@
<div class="devicejob-container">
<div class="machineTableDetailsTitle">
<p>
- 相关任务<span>{{ total }}</span
- >次
+ 相关任务
+ <span>{{ total }}</span>
+ 次
</p>
</div>
<div class="devicelob-table ztzf-table">
@@ -32,16 +33,16 @@
</el-table-column>
</el-table>
</div>
- <!-- <el-pagination
+ <el-pagination
class="ztzf-pagination"
background
- :page-sizes="[10, 20, 30, 50]"
+
v-model:current-page="sizeParams.current"
v-model:page-size="sizeParams.size"
- layout=" prev, pager, next,sizes, jumper"
+ layout=" prev, pager, next, jumper"
:total="total"
@change="pageChange"
- /> -->
+ />
</div>
<DeviceJobDetails v-model:show="deviceJobDetailsShow" />
@@ -57,7 +58,7 @@
})
const sizeParams = ref({
current: 1,
- size: 99999,
+ size: 5,
})
const store = useStore()
const device_sn = computed(() => store.state.home.singleUavHome.device_sn)
@@ -120,15 +121,15 @@
// 表格
.devicelob-table {
padding: 0 17px;
- height: 280px;
- overflow: hidden;
- overflow-y: scroll !important;
+ // height: 280px;
+ // overflow: hidden;
+ // overflow-y: scroll !important;
}
-:deep(::-webkit-scrollbar ){
- width: 0;
- display: none;
- background: none !important;
- }
+// :deep(::-webkit-scrollbar) {
+// width: 0;
+// display: none;
+// background: none !important;
+// }
// 分页
:deep(.el-pagination) {
--
Gitblit v1.9.3