Merge remote-tracking branch 'origin/dev' into dev-gly

gaoluyang

2025-02-17 51da4ca35854d45ca89aa8cfdfdfc7729f708a72

Merge remote-tracking branch 'origin/dev' into dev-gly

 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,
  });
}


 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) {

 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]: "",