From 85a15646ffe20ed2bbb2042ec500df8c850a69cc Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期五, 25 七月 2025 15:29:41 +0800
Subject: [PATCH] 首次提交
---
common/api.js | 86 +++++++++++++++++++++++++++---------------
1 files changed, 55 insertions(+), 31 deletions(-)
diff --git a/common/api.js b/common/api.js
index 7da8c93..8d4a91f 100644
--- a/common/api.js
+++ b/common/api.js
@@ -1,16 +1,19 @@
import {
fly
-} from '@/common/request/fly.js'
-//閰嶇疆璇锋眰鍩哄湴鍧�
-fly.config.baseURL = "http://192.168.12.20:9999"
-const url = uni.getStorageSync('baseurl');
-if (url) {
- fly.config.baseURL = url + "/herb"
-}
-
-const mqttBaseUrl = "223.241.221.20";
-const emqxBaseUrl = "http://"+mqttBaseUrl +":18083/api/v5"
+} from '@/common/request/fly.js'
+const base = "http://192.168.21.3:9999"
+// const base = "https://lanpucloud.cn"
+//閰嶇疆璇锋眰鍩哄湴鍧�
+fly.config.baseURL = base + ""
+const ip = uni.getStorageSync('lan_ip');
+if (ip) {
+ fly.config.baseURL = "http://" + ip + ":9999"
+}
+
+const mqttBaseUrl = "lanpucloud.cn";
+const emqxBaseUrl = base + ":1883/api/v5";
+
// 娴嬭瘯
function test(params) {
return fly.get('/test/jeecgDemo/queryById', params);
@@ -37,11 +40,17 @@
function getOrderList(params) {
fly.config.loading = true
return fly.get('/dry/dryOrder/list', params);
-}
-//璁惧鍒楄〃
-function queryEquList(params){
- fly.config.loading = true
- return fly.get('/mobile/equ/list', params);
+}
+//璁惧鍒楄〃
+function queryEquList(params) {
+ fly.config.loading = true
+ return fly.get('/mobile/equ/list', params);
+}
+
+//浠呯敤浣滀笅鎷夊埛鏂帮紝鏃犲疄闄呮剰涔�
+function querySampleList(params) {
+ fly.config.loading = true
+ return fly.get('/mobile/sample/list', params);
}
//
@@ -53,20 +62,32 @@
function sendCommand(params) {
fly.config.loading = true
return fly.post('/dry/real/sendCommand', params);
-}
-
-
-//emqx 鎺ュ彛
+}
+
+//鍘嗗彶鏁呴殰锛屾煡璇㈡渶杩戞暟鎹�
+function queryHisFaultList(params) {
+ fly.config.loading = true
+ return fly.get('/mobile/fault/list', params);
+}
+
+//鍘嗗彶鏁呴殰锛屾煡璇㈠浘琛ㄩ渶瑕佹暟鎹�
+function queryHisFaultChartList(params) {
+ fly.config.loading = true
+ return fly.get('/mobile/fault/chart', params);
+}
+
+
+//emqx 鎺ュ彛
function emqxClients() {
fly.config.loading = true
- return fly.get(emqxBaseUrl + "/clients", {
- auth: {
- username: "a3dc6758f6abc41a",
- password: "FvBwJcmqhAuQ0aBg4FLl5gQA9A9BE64bpl0oJTg9A6I0bK"
- },
- headers: {
- 'Content-Type': 'application/json',
- },
+ return fly.get(emqxBaseUrl + "/clients", {
+ auth: {
+ username: "a3dc6758f6abc41a",
+ password: "FvBwJcmqhAuQ0aBg4FLl5gQA9A9BE64bpl0oJTg9A6I0bK"
+ },
+ headers: {
+ 'Content-Type': 'application/json',
+ },
});
}
@@ -77,11 +98,14 @@
login,
getRealTimeData,
getAnalyList,
- getOrderList,
+ getOrderList,
queryEquList,
+ querySampleList,
+ queryHisFaultList,
+ queryHisFaultChartList,
getMonth,
- sendCommand,
-
- emqxClients,
+ sendCommand,
+
+ emqxClients,
mqttBaseUrl
}
\ No newline at end of file
--
Gitblit v1.9.3