From cbc2fe74fb54aad814695982c2987e064696f540 Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期五, 16 一月 2026 10:49:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/system/user/GyDriver.vue | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/views/system/user/GyDriver.vue b/src/views/system/user/GyDriver.vue
index 897f4a2..474bfae 100644
--- a/src/views/system/user/GyDriver.vue
+++ b/src/views/system/user/GyDriver.vue
@@ -824,7 +824,7 @@
async initData() {
try {
const userRes = await axios.get(
- `${this.baseURL}/Web/GetUser?UserName=${
+ `${this.$baseUrl}/Web/GetUser?UserName=${
sessionStorage.getItem("UserName") || "001"
}&PassWord=123456&HOrgName=100038`
);
@@ -835,7 +835,7 @@
this.queryParams.HUSEORGID = userData.HUSEORGID;
}
- const orgRes = await axios.get(`${this.baseURL}/Web/GetOrganizations`);
+ const orgRes = await axios.get(`${this.$baseUrl}/Web/GetOrganizations`);
if (orgRes.data.count == 1) {
this.organizationList = orgRes.data.data;
}
@@ -863,7 +863,7 @@
size: this.pageSize,
};
- const res = await axios.get(`${this.baseURL}/Gy_DriverController/list`, {
+ const res = await axios.get(`${this.$baseUrl}/Gy_DriverController/list`, {
params,
});
@@ -930,7 +930,7 @@
async DisPlay_HideColumn() {
try {
const res = await axios.get(
- `${this.baseURL}/Xt_grdAlignment_WMES/grdAlignmentWMESList`,
+ `${this.$baseUrl}/Xt_grdAlignment_WMES/grdAlignmentWMESList`,
{
params: {
HModName: this.HModName,
@@ -1126,7 +1126,7 @@
}
try {
- const res = await axios.get(`${this.baseURL}/Gy_Driver/Gy_DriverViewApi`, {
+ const res = await axios.get(`${this.$baseUrl}/Gy_Driver/Gy_DriverViewApi`, {
params: {
Number: this.queryParams.HSyncNumber,
Type: "JSY", // 椹鹃┒鍛樼被鍨�
@@ -1257,7 +1257,7 @@
try {
await this.$modal.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠");
- const res = await axios.get(`${this.baseURL}/DeltetGy_Driver`, {
+ const res = await axios.get(`${this.$baseUrl}/DeltetGy_Driver`, {
params: {
HItemID: this.rowForm.HItemID.toString(),
user: this.user,
@@ -1288,7 +1288,7 @@
const action = isAudit ? "鍙嶅鏍�" : "瀹℃牳";
await this.$modal.confirm(`纭瑕�${action}鍚楋紵`);
- const res = await axios.get(`${this.baseURL}/Gy_Driver/AuditGy_Driver`, {
+ const res = await axios.get(`${this.$baseUrl}/Gy_Driver/AuditGy_Driver`, {
params: {
HInterID: this.rowForm.HItemID.toString(),
IsAudit: isAudit,
@@ -1320,7 +1320,7 @@
const action = isStop ? "鍙嶇鐢�" : "绂佺敤";
await this.$modal.confirm(`纭瑕�${action}鍚楋紵`);
- const res = await axios.get(`${this.baseURL}/Gy_Driver/StopGy_Driver`, {
+ const res = await axios.get(`${this.$baseUrl}/Gy_Driver/StopGy_Driver`, {
params: {
HInterID: this.rowForm.HItemID.toString(),
IsStop: isStop,
@@ -1457,7 +1457,7 @@
const sSubStr = JSON.stringify(validData);
const sMainSub = sSubStr + "&鍜�" + this.user;
- const res = await axios.post(`${this.baseURL}/Gy_Driver/Gy_Process_Excel`, {
+ const res = await axios.post(`${this.$baseUrl}/Gy_Driver/Gy_Process_Excel`, {
sMainSub: sMainSub,
});
@@ -1537,7 +1537,7 @@
// 鍔犺浇杩囨护鏂规
async loadFilterSchemes() {
try {
- const res = await axios.get(`${this.baseURL}/Xt_FastICScheme/list`, {
+ const res = await axios.get(`${this.$baseUrl}/Xt_FastICScheme/list`, {
params: {
HModuleName: this.HModuleName,
user: this.user,
@@ -1573,7 +1573,7 @@
try {
await this.$modal.confirm(`纭瑕佸垹闄ゆ柟妗�"${row.鏂规鍚嶇О}"鍚楋紵`);
- const res = await axios.post(`${this.baseURL}/Xt_FastICScheme/delete`, {
+ const res = await axios.post(`${this.$baseUrl}/Xt_FastICScheme/delete`, {
HInterID: row.hmainid,
});
--
Gitblit v1.9.1