From 3ad119ce8540ccd941f97c272d95180618ff0965 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 15 三月 2024 16:04:01 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before

---
 src/assets/api/controller.js |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index a5640ec..b8e2c4b 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -36,6 +36,7 @@
 	selectCustomPageList: "/user/selectCustomPageList", //鑾峰彇瀹㈡埛鍒楄〃
 	delCustomById: "/user/delCustomById", //鍒犻櫎瀹㈡埛淇℃伅
 	addCustom: "/user/addCustom", //鏂板瀹㈡埛淇℃伅
+	getUserNow: "/user/getUserNow", //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴蜂俊鎭�
 }
 
 const dataReporting = {
@@ -105,14 +106,15 @@
 	addDeviceParameter: "/deviceScope/addDeviceParameter", //娣诲姞璁惧璇︽儏鍙傛暟
 	delDeviceParameter: "/deviceScope/delDeviceParameter", //鍒犻櫎璁惧璇︽儏鍙傛暟
 	upDeviceParameter: "/deviceScope/upDeviceParameter", //淇敼璁惧璇︽儏鍙傛暟
-  authorizedPerson: "/user/getDeviceManager", //鑾峰彇鎺堟潈浜�
-  selectEquipmentOverview: "/deviceScope/selectEquipmentOverview", //鑾峰彇璁惧鎬昏
-  uploadFile: "/deviceScope/uploadFile", //涓婁紶鍥剧墖
-  selectDevicePrincipal: "/user/getDeviceManager", //鑾峰彇璁惧璐熻矗浜�
+	authorizedPerson: "/user/getDeviceManager", //鑾峰彇鎺堟潈浜�
+	selectEquipmentOverview: "/deviceScope/selectEquipmentOverview", //鑾峰彇璁惧鎬昏
+	uploadFile: "/deviceScope/uploadFile", //涓婁紶鍥剧墖
+	selectDevicePrincipal: "/user/getDeviceManager", //鑾峰彇璁惧璐熻矗浜�
 }
 
 const insOrder = {
 	selectInsOrderParameter: "/insOrder/selectInsOrderParameter", //鏌ヨ妫�楠屼笅鍗�
+	getDeviceManager: "/user/getDeviceManager", //鑾峰彇鎸囨淳浜哄憳
 }
 
 const insOrderPlan = {

--
Gitblit v1.9.3