From 67d2338b3dd43c5972159822aa3dd8f53cd3c78b Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 四月 2024 11:14:00 +0800
Subject: [PATCH] 合并冲突
---
src/assets/api/controller.js | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 61f59e7..4c25d3e 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -14,7 +14,8 @@
StandardTemplate,
insOrder,
sampleOrder,
- insOrderPlan
+ insOrderPlan,
+ insReport
}
}
@@ -37,7 +38,8 @@
selectCustomPageList: "/user/selectCustomPageList", //鑾峰彇瀹㈡埛鍒楄〃
delCustomById: "/user/delCustomById", //鍒犻櫎瀹㈡埛淇℃伅
addCustom: "/user/addCustom", //鏂板瀹㈡埛淇℃伅
- getUserNow: "/user/getUserNow", //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴蜂俊鎭�
+ getUserNow: "/user/getUserNow", //鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�
+ getUserInfo: "/user/getUserInfo", //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴蜂俊鎭�
}
const dataReporting = {
@@ -107,6 +109,7 @@
addDeviceParameter: "/deviceScope/addDeviceParameter", //娣诲姞璁惧璇︽儏鍙傛暟
delDeviceParameter: "/deviceScope/delDeviceParameter", //鍒犻櫎璁惧璇︽儏鍙傛暟
upDeviceParameter: "/deviceScope/upDeviceParameter", //淇敼璁惧璇︽儏鍙傛暟
+ selectDeviceByCategory: "/deviceScope/selectDeviceByCategory", //閫氳繃璁惧鍒嗙被鑾峰彇璁惧鍒楄〃
authorizedPerson: "/user/getDeviceManager", //鑾峰彇鎺堟潈浜�
selectEquipmentOverview: "/deviceScope/selectEquipmentOverview", //鑾峰彇璁惧鎬昏
uploadFile: "/deviceScope/uploadFile", //涓婁紶鍥剧墖
@@ -134,6 +137,10 @@
selectInsOrderPlanList: "/insOrderPlan/selectInsOrderPlanList", //鏌ヨ妫�楠屼换鍔�
claimInsOrderPlan: "/insOrderPlan/claimInsOrderPlan",//璁ら妫�楠屼换鍔�
doInsOrder: "/insOrderPlan/doInsOrder",//鎵ц妫�楠屾搷浣�
+ saveInsContext: "/insOrderPlan/saveInsContext",//淇濆瓨妫�楠屽唴瀹�
+ upPlanUser: "/insOrderPlan/upPlanUser",//浠诲姟浜ゆ帴
+ verifyPlan: "/insOrderPlan/verifyPlan",//澶嶆牳妫�楠屼换鍔�
+ submitPlan: "/insOrderPlan/submitPlan",//妫�楠屼换鍔℃彁浜�
}
const systemLog = {
@@ -170,3 +177,7 @@
delStandardTemplate: "/StandardTemplate/delStandardTemplate", //鍒犻櫎妫�楠屾ā鏉�
getStandardTemplate: "/StandardTemplate/getStandardTemplate", //鏌ヨ鍘熷璁板綍妯℃澘鏋氫妇
}
+
+const insReport = {
+ pageInsReport: "/insReport/pageInsReport", //鏌ヨ妫�楠屾姤鍛婃暟鎹�
+}
--
Gitblit v1.9.3