From 1fc339c8f71c81dfbd262f5fede143225580f1e0 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Tue, 15 Apr 2025 17:33:43 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue b/src/views/SignMachineNest/MachineRight/MachineStatus/MachineTableDetails/DeviceJob/DeviceJob.vue
index 89a9c0d..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">
@@ -35,10 +36,10 @@
<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"
/>
@@ -120,8 +121,15 @@
// 表格
.devicelob-table {
padding: 0 17px;
+ // height: 280px;
+ // overflow: hidden;
+ // overflow-y: scroll !important;
}
-
+// :deep(::-webkit-scrollbar) {
+// width: 0;
+// display: none;
+// background: none !important;
+// }
// 分页
:deep(.el-pagination) {
--
Gitblit v1.9.3