From e986cee1c804ecdf6d03c080ce9a8bb187f724a4 Mon Sep 17 00:00:00 2001
From: zhang_12370 <z2864490065@outlook.com>
Date: 星期一, 14 七月 2025 18:02:50 +0800
Subject: [PATCH] 1、煤质字段添加校验 使其唯一 2、优化首页 数据刷新 3、开发配煤计算器
---
src/hooks/usePaginationApi.jsx | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/hooks/usePaginationApi.jsx b/src/hooks/usePaginationApi.jsx
index aa995b0..749b078 100644
--- a/src/hooks/usePaginationApi.jsx
+++ b/src/hooks/usePaginationApi.jsx
@@ -1,8 +1,8 @@
import { ref, reactive, watchEffect, unref } from "vue";
-import useFormData from "./useFormData.js";
-// import { message } from "@/utils/message";
+import useFormData from "@/hooks/useFormData";
+import { deepClone, isEqual } from "@/utils/index.js"
+import { ElMessage } from 'element-plus'
-import { clone, isEqual } from "lodash";
/**
* 鍒嗛〉api
* @param api 鎺ュ彛
@@ -20,7 +20,7 @@
) {
const dataList = ref([]);
const { form: filters, resetForm } = useFormData(initalFilters);
- let lastFilters = clone(initalFilters);
+ let lastFilters = deepClone(initalFilters);
const sorter = reactive(sorters || {});
const others = ref({});
const loading = ref(true);
@@ -79,14 +79,14 @@
// 濡傛灉杩欐鍜屼笂娆＄殑filter涓嶅悓锛岄偅涔堝氨閲嶇疆椤电爜
if (!isEqual(unref(filters), lastFilters)) {
pagination.currentPage = 1;
- lastFilters = clone(unref(filters));
+ lastFilters = deepClone(unref(filters));
}
loading.value = true;
api({
...getFinalParams(),
current: pagination.currentPage,
size: pagination.pageSize
- }).then(({ code, data, ...rest }) => {
+ }).then(({ code, data, msg, ...rest }) => {
if (code == 200) {
// pagination.currentPage = meta.current_page;
// pagination.pageSize = meta.per_page;
@@ -97,7 +97,7 @@
loading.value = false;
} else {
loading.value = false;
- // message(data.msg, { type: "error" });
+ ElMessage({ message: msg, type: "error" });
}
});
}
@@ -120,7 +120,7 @@
}
watchEffect(() => {
- pagination.align = paginationAlign.value;
+ pagination.align = paginationAlign.value
});
// onMounted(() => {
--
Gitblit v1.9.3