From 9090bb7dad196dfb3f60530491b21919c55c68e0 Mon Sep 17 00:00:00 2001
From: CD配唱片 <CD配唱片>
Date: 星期一, 28 四月 2025 18:40:58 +0800
Subject: [PATCH] 合并最新dev解决冲突
---
src/views/basicData/processRoute/index.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/basicData/processRoute/index.vue b/src/views/basicData/processRoute/index.vue
index e4b782c..e209bff 100644
--- a/src/views/basicData/processRoute/index.vue
+++ b/src/views/basicData/processRoute/index.vue
@@ -220,7 +220,7 @@
const title = ref("");
const daterangeIntegrationDay = ref([]);
//寮圭獥鐩稿叧
-const height = ref(document.documentElement.clientHeight - 260 + "px;");
+const height = ref(document.documentElement.clientHeight - 230 + "px;");
const isVisible = ref(false);
const isError = ref(false);
const planned = ref(true);
@@ -407,7 +407,7 @@
form: {},
queryParams: {
pageNum: 0,
- pageSize: 10,
+ pageSize: 100,
itemNo: null,
integrationDay: null,
},
--
Gitblit v1.9.3