From a075ef6b7cbd09d727068ef3d7e08691775dbb16 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 22 三月 2024 17:58:58 +0800
Subject: [PATCH] 合并冲突
---
src/assets/api/controller.js | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index d281f3f..61f59e7 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -13,6 +13,7 @@
standardMethod,
StandardTemplate,
insOrder,
+ sampleOrder,
insOrderPlan
}
}
@@ -36,6 +37,7 @@
selectCustomPageList: "/user/selectCustomPageList", //鑾峰彇瀹㈡埛鍒楄〃
delCustomById: "/user/delCustomById", //鍒犻櫎瀹㈡埛淇℃伅
addCustom: "/user/addCustom", //鏂板瀹㈡埛淇℃伅
+ getUserNow: "/user/getUserNow", //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴蜂俊鎭�
}
const dataReporting = {
@@ -105,21 +107,34 @@
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", //鏌ヨ妫�楠屼笅鍗�
+ addInsOrder: "/insOrder/addInsOrder", //娣诲姞妫�楠屼笅鍗曟暟鎹�
+ selectOrderManDay: "/insOrder/selectOrderManDay", //鏌ヨ璁㈠崟鎬诲叡棰勮鏃堕棿
+ upInsOrder: "/insOrder/upInsOrder", //妫�楠屼笅鍙�
+ getInsOrder: "/insOrder/getInsOrder", //鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�
+ upInsOrderOfState: "/insOrder/upInsOrderOfState", //瀹℃牳妫�楠屽崟鏈鸿繘琛岀姸鎬佷慨鏀�
+ addInsOrderTemplate: "/insOrder/addInsOrderTemplate", //娣诲姞妫�楠屽崟妯℃澘
+ selectInsOrderTemplate: "/insOrder/selectInsOrderTemplate", //鏌ヨ妫�楠屽崟妯℃澘
+ selectInsOrderTemplateById: "/insOrder/selectInsOrderTemplateById", //閫氳繃妫�楠屽崟妯℃澘id鑾峰彇妫�楠屽崟妯℃澘鍐呭
+ delInsOrderTemplate: "/insOrder/delInsOrderTemplate", //鍒犻櫎妫�楠屽崟妯℃澘
+}
+
+const sampleOrder = {
+ list: "/sampleOrder/list", //鑾峰彇鎸囨淳浜哄憳
}
const insOrderPlan = {
selectInsOrderPlanList: "/insOrderPlan/selectInsOrderPlanList", //鏌ヨ妫�楠屼换鍔�
+ claimInsOrderPlan: "/insOrderPlan/claimInsOrderPlan",//璁ら妫�楠屼换鍔�
+ doInsOrder: "/insOrderPlan/doInsOrder",//鎵ц妫�楠屾搷浣�
}
-
-
const systemLog = {
selectSystemLogList: "/systemLog/selectSystemLogList", //鑾峰彇鏃ュ織
@@ -135,11 +150,17 @@
delStandardProductByIds: "/standardTree/delStandardProductByIds", //鍒犻櫎鏍囧噯鏍戜笅鐨勬楠岄」鐩�
addStandardProduct: "/standardTree/addStandardProduct", //鏂板鏍囧噯鏍戜笅鐨勬楠岄」鐩�
delStandardTree: "/standardTree/delStandardTree", //鍒犻櫎鏍囧噯鏍戠殑灞傜骇
+ selectStandardProductList: "/standardTree/selectStandardProductList", //閫氳繃鏍囧噯鏍戞煡璇㈠搴旂殑妫�楠岄」鐩�
+ selectStandardProductListByMethodId: "/standardTree/selectStandardProductListByMethodId", //閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�
+ selectStandardMethodEnum: "/standardTree/selectStandardMethodEnum", //鑾峰彇鏍囧噯鏍戜笅鏍囧噯鏂规硶鏋氫妇
}
const standardMethod = {
selectStandardMethodList: "/standardMethod/selectStandardMethodList", //鑾峰彇鏍囧噯鏂规硶鍒楄〃
selectStandardMethods: "/standardMethod/selectStandardMethods", //鑾峰彇鏍囧噯鏂规硶鏋氫妇
+ addStandardMethod: "/standardMethod/addStandardMethod", //娣诲姞鏍囧噯鏂规硶
+ upStandardMethod: "/standardMethod/upStandardMethod", //淇敼鏍囧噯鏂规硶
+ delStandardMethod: "/standardMethod/delStandardMethod", //鍒犻櫎鏍囧噯鏂规硶
}
const StandardTemplate = {
--
Gitblit v1.9.3