From 51da4ca35854d45ca89aa8cfdfdfc7729f708a72 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 17 二月 2025 10:07:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev-gly
---
src/views/standard/model/index.vue | 6 +++---
vue.config.js | 2 +-
src/api/standard/model.js | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/api/standard/model.js b/src/api/standard/model.js
index 52707ad..2c47cc2 100644
--- a/src/api/standard/model.js
+++ b/src/api/standard/model.js
@@ -1,11 +1,11 @@
import request from "@/utils/request";
// 鏌ヨ瀹㈡埛鍒楄〃
-export function selectStandardTemplatePageList(data) {
+export function selectStandardTemplatePageList(query) {
return request({
url: "/StandardTemplate/selectStandardTemplatePageList",
- method: "post",
- data: data,
+ method: "get",
+ params: query,
});
}
diff --git a/src/views/standard/model/index.vue b/src/views/standard/model/index.vue
index 375cd35..d76304f 100644
--- a/src/views/standard/model/index.vue
+++ b/src/views/standard/model/index.vue
@@ -40,7 +40,7 @@
:column="column"
:page="page"
:tableLoading="tableLoading"
- :height="'calc(100vh - 240px)'"
+ :height="'calc(100vh - 250px)'"
style="padding: 20px; padding-top: 0"
@pagination="pagination"
></lims-table>
@@ -234,8 +234,8 @@
this.tableLoading = false;
});
},
- pagination(current, size) {
- this.page.current = current;
+ pagination({ page, limit }) {
+ this.page.current = page;
this.getList();
},
refreshTable(e) {
diff --git a/vue.config.js b/vue.config.js
index 1d8e525..14e2478 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,7 +36,7 @@
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- target: `http://192.168.0.104:8002`,
+ target: `http://192.168.0.170:8002`,
changeOrigin: true,
pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "",
--
Gitblit v1.9.3