From 6c74bf912e251347714099a84585f825b32a1c08 Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期一, 18 十二月 2023 17:52:05 +0800
Subject: [PATCH] Merge branch 'feature-001' of ssh://114.215.109.124:29418/supervision-vue into feature-001
---
src/api/index.js | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index f21aba3..cbff2ca 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -9,7 +9,7 @@
let ip2_file = 'https://fyami.com.cn/';
if (debug) {
- // ip1 = 'http://192.168.0.123:8082/';
+ ip1 = 'http://192.168.0.138:8082/';
// ip1_file = 'http://47.100.191.150:9005/';
ip2 = 'http://192.168.0.138:8080/';
// ip2_file = 'https://fyami.com.cn/';
@@ -20,7 +20,7 @@
//椋炵窘鐩戠
const $fysp = axios.create({
baseURL: ip1,
- timeout: 10000,
+ timeout: 10000
});
$fysp.imgUrl = `${ip1_file}images/`;
$fysp.downloadUrl = `${ip1_file}files/`;
@@ -28,7 +28,7 @@
//椋炵窘鐜
const $fytz = axios.create({
baseURL: ip2,
- timeout: 10000,
+ timeout: 10000
});
$fytz.imgUrl = `${ip2_file}images/`;
@@ -51,7 +51,7 @@
console.log(error);
ElMessage({
message: error,
- type: 'error',
+ type: 'error'
});
return Promise.reject(error);
}
@@ -65,17 +65,18 @@
console.log(response);
console.log('==>璇锋眰缁撴潫');
if (response.status == 200) {
- if (
- response.data.success != undefined &&
- response.data.success != null
- ) {
+ if (response.data.success != undefined && response.data.success != null) {
if (response.data.success == true) {
- return response;
+ return response.data;
} else {
+ ElMessage({
+ message: response.data.message,
+ type: 'error'
+ });
return Promise.reject(response.data.message);
}
} else {
- return response;
+ return response.data;
}
} else {
return Promise.reject(response);
@@ -88,7 +89,7 @@
console.log('==>璇锋眰缁撴潫');
ElMessage({
message: error,
- type: 'error',
+ type: 'error'
});
return Promise.reject(error);
}
--
Gitblit v1.9.3