From c1f06f52a6b7f3337bacd98feb55aca6af8e6e2c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 05 七月 2024 08:32:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/Slicecage/slicecage.vue | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecage.vue b/UI-Project/src/views/Slicecage/slicecage.vue
index 943558e..3035fa4 100644
--- a/UI-Project/src/views/Slicecage/slicecage.vue
+++ b/UI-Project/src/views/Slicecage/slicecage.vue
@@ -82,15 +82,17 @@
} else if (currentPage.value === 3) {
return 21;
} else if (currentPage.value === 4) {
- return 21;
+ return 20;
} else if (currentPage.value === 5) {
return 21;
} else if (currentPage.value === 6) {
- return 21;
+ return 25;
} else if (currentPage.value === 7) {
- return 21;
+ return 51;
+ } else if (currentPage.value === 8) {
+ return 25;
} else {
- return 21; // 榛樿鍊硷紝鍙互鏍规嵁瀹為檯闇�姹備慨鏀�
+ return 25; // 榛樿鍊硷紝鍙互鏍规嵁瀹為檯闇�姹備慨鏀�
}
});
@@ -112,15 +114,17 @@
} else if (i === 3) {
index += 21;
}else if (i === 4) {
- index += 21;
+ index += 20;
}else if (i === 5) {
index += 21;
}else if (i === 6) {
- index += 21;
+ index += 25;
}else if (i === 7) {
- index += 21;
+ index += 51;
+ }else if (i === 8) {
+ index += 25;
} else {
- index += 31;
+ index += 25;
}
}
return index;
@@ -153,7 +157,7 @@
// total += 10;
// }
// }
- return 8;
+ return 9;
});
--
Gitblit v1.8.0