From 217808e8c83d7d665aea720b0d59a4085e7012e1 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期二, 12 三月 2024 15:20:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
api/request.js | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/api/request.js b/api/request.js
index de6bdef..bddef88 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,17 +100,21 @@
500: responseError
}
-// const BaseUrl = "http://192.168.31.18:9997"
-// const webSocketUrl = "ws://192.168.31.18:9997/wrzs/ws/info"
+// const BaseUrl = "http://192.168.0.110:9896"
+// const webSocketUrl = "ws://192.168.0.110:9896/wrzs/ws/info"
-const BaseUrl = "http://192.168.31.14:9997";
-const webSocketUrl = "ws://192.168.31.14:9997/wrzs/ws/info"
-// // 绾夸笂寮�鍙�
-// const BaseUrl = "http://hesuancj.cn:9997";
-// const webSocketUrl = "ws://hesuancj.cn:9997/wrzs/ws/info"
+// const BaseUrl = "http://192.168.0.102:9896"
+// const webSocketUrl = "ws://192.168.0.102:9896/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:9095";
-// const webSocketUrl = "wss://mx.jzeg.cn:9095/wrzs/ws/info"
+const BaseUrl = "https://mx.jzeg.cn:9096";
+const webSocketUrl = "wss://mx.jzeg.cn:9096/wrzs/ws/info"
// 璇锋眰鎷︽埅
@@ -117,9 +143,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]
}
})
--
Gitblit v1.9.1