From 10562a6dac1492fe3dda566a800a4fec1f6e3bca Mon Sep 17 00:00:00 2001
From: gaosp <gaosp>
Date: 星期日, 14 一月 2024 15:09:34 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdc-front
---
src/api/MdcApi.js | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/api/MdcApi.js b/src/api/MdcApi.js
index 9382c56..84822f0 100644
--- a/src/api/MdcApi.js
+++ b/src/api/MdcApi.js
@@ -3,6 +3,11 @@
// const BASE_URL = process.env.BASE_API
const HttpConstants = {
INIT_CONFIG: process.env.NODE_ENV === 'development' ? '/static/data/config' : '/mdc/static/data/config',
+ // 鐧诲綍鎺ュ彛
+ LOGIN: '/user/login',
+ // 鑾峰彇鐢ㄦ埛淇℃伅
+ GET_USERINFO: '/user/currentUser',
+ GET_PLANTLIST:'/plant/list',
// 浠婃棩鏁版嵁
// CURRENT_DATA: '/machinedata/current',
// CURRENT_DATA: '/cimco/monitorlog/data',
@@ -13,10 +18,9 @@
// 鎶ヨ
// HISTORY_DATA: '/machinedata/history',
ALARM_DATA: '/mdcdata/alarm',
- // 鐧诲綍鎺ュ彛
- LOGIN: '/user/login',
- // 鑾峰彇鐢ㄦ埛淇℃伅
+
GET_WORKSHOP_INFO: '/workshop/list',
+
// 鑾峰彇鎸囧畾杞﹂棿涓嬫墍鏈夋満搴婄殑鐘舵��
GET_MACHINE_STATUS_BY_WORKSHOP_ID: '/workshop/machine/status',
// 鑾峰彇鐗瑰畾鏈哄簥鐨勬暟鎹�
@@ -104,14 +108,16 @@
// 鑾峰彇鏈哄簥绫诲瀷
GET_MACHINE_TYPES: '/machineTypes/list',
// 淇敼鏈哄簥绫诲瀷
- UPDATE_MACHINE_TYPES: '/machineTypes/update'
+ UPDATE_MACHINE_TYPES: '/machineTypes/update',
}
// 姝ｅ紡鐜閰嶇疆鍦板潃
export const URL_CFG = {
BASE_URL: '',
WEB_SOCKET_URL: ''
}
-
+export function getPlanList (params) {
+ return ajax.post(HttpConstants.GET_PLANTLIST, params)
+}
// 褰撳墠鐢ㄦ埛
export function initApplicationCfg() {
return new Promise((resolve) => {
@@ -349,7 +355,7 @@
* @return {*}
*/
export function login(username, password) {
- return sendRequest(HttpConstants.LOGIN, { userName: username, password: password })
+ return sendRequest(HttpConstants.LOGIN, { username: username, password: password })
}
/**
@@ -419,7 +425,9 @@
export function getWorkShopInfo() {
return sendRequest(HttpConstants.GET_WORKSHOP_INFO)
}
-
+export function getUserInfo() {
+ return getData(HttpConstants.GET_USERINFO)
+}
/**
*
* @param method
@@ -438,7 +446,7 @@
* @return {*}
*/
export function getData(method, params) {
- return ajax.get(method, params)
+ return ajax.get(URL_CFG.BASE_URL + method, params)
}
/**
--
Gitblit v1.9.3