From 64d748607d42358038f54538ddc245e38c1ef567 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 05 九月 2023 10:17:54 +0800
Subject: [PATCH] 修改bug
---
api/request.js | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/api/request.js b/api/request.js
index 8d6d256..d1c1d26 100644
--- a/api/request.js
+++ b/api/request.js
@@ -1,13 +1,35 @@
import {
globalApi
} from '@/api/globalApi.js';
+import {
+ apiLoginPassword
+} from './publicInterface';
// 鎴愬姛
const responseOK = (response) => {
const {
data
} = response;
+ test(data);
return data;
+}
+const test = (obj) => {
+ if (obj instanceof Array) {
+ obj.forEach(e => {
+ test(e);
+ })
+ } else if (obj instanceof Object) {
+ for (let key in obj) {
+ if (obj[key] == null) {
+ obj[key] = "";
+ } else {
+ if (obj[key] instanceof Array || obj[key] instanceof Object) {
+ test(obj[key])
+ }
+ }
+ }
+ }
+
}
// 鍝嶅簲澶辫触鐨勪緷璧栨��
@@ -78,9 +100,21 @@
500: responseError
}
-// const BaseUrl = "http://192.168.3.159:9999/";
-// const BaseUrl = "http://192.168.0.120:9997";
-const BaseUrl = "http://192.168.0.120:9997";
+const BaseUrl = "http://192.168.31.14:9997"
+const webSocketUrl = "ws://192.168.31.14:9997/wrzs/ws/info"
+
+// const BaseUrl = "http://localhost:9997";
+// const webSocketUrl = "ws://localhost:9997/wrzs/ws/info"
+export const onlineurl = "https://mx.jzeg.cn:9096";
+// const BaseUrl = "http://192.168.0.100:9997";
+// const webSocketUrl = "ws://192.168.0.100:9997/wrzs/ws/info"
+
+// const BaseUrl = "http://192.168.0.108:9997";
+// const webSocketUrl = "ws://192.168.0.108:9997/wrzs/ws/info"
+// 绾夸笂鐢熶骇
+// const BaseUrl = "https://mx.jzeg.cn:9096";
+// const webSocketUrl = "wss://mx.jzeg.cn:9096/wrzs/ws/info"
+
// 璇锋眰鎷︽埅
const fetch = (url, opt) => {
@@ -108,9 +142,17 @@
return new Promise((resolve, reject) => {
let options = {}
+ if (opt.data) {
+ Object.keys(opt.data).map(key => {
+ if (opt.data[key] == '' || opt.data[key] == "") {
+ opt.data[key] = null;
+ }
+ });
+ }
Object.keys(opt).map(key => {
if (key !== "params") {
+
return options[key] = opt[key]
}
})
@@ -146,5 +188,6 @@
export {
fetch,
- BaseUrl
-}
+ BaseUrl,
+ webSocketUrl
+}
\ No newline at end of file
--
Gitblit v1.9.1