From defa824eab2350fd6abfd10abd8f4df94749e336 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 31 七月 2024 11:21:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/assets/api/controller.js | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 19d9552..13eb73a 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -124,6 +124,7 @@
upProduct: "/capacityScope/upProduct", //淇敼浜у搧
getItemTree: "/capacityScope/getItemTree", //鑾峰彇妫�楠屽璞℃爲
importData: "/capacityScope/importData", //瀵煎叆妫�楠岄」鐩�
+ importEquipData: "/capacityScope/importEquipData", //瑁呭鐢电紗-瀵煎叆妫�楠岄」鐩�
importExcel: "/capacityScope/importExcel", // 瀵煎叆鑳藉姏鑼冨洿
}
@@ -153,6 +154,8 @@
deleteDataAcquisitionConfiguration: "/deviceScope/deleteDataAcquisitionConfiguration", // 鍒犻櫎鏁伴噰閰嶇疆
determineWhetherToCollectData: "/deviceScope/determineWhetherToCollectData", // 鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲�
dataCollection: "/deviceScope/dataCollection", // 鏁伴噰-鏁版嵁閲囬泦
+ treeDevice: "/deviceScope/treeDevice", // 璁惧鏍戝舰
+ temDataAcquisition: "/deviceScope/temDataAcquisition", // PK8000鏁伴噰
}
const insOrder = {
@@ -186,6 +189,7 @@
doInsOrder: "/insOrderPlan/doInsOrder", //鎵ц妫�楠屾搷浣�
saveInsContext: "/insOrderPlan/saveInsContext", //淇濆瓨妫�楠屽唴瀹�
upPlanUser: "/insOrderPlan/upPlanUser", //浠诲姟浜ゆ帴
+ upPlanUser2: "/insOrderPlan/upPlanUser2", //浠诲姟浜ゆ帴
verifyPlan: "/insOrderPlan/verifyPlan", //澶嶆牳妫�楠屼换鍔�
submitPlan: "/insOrderPlan/submitPlan", //妫�楠屼换鍔℃彁浜�
inspectionOrderDetailsTaskSwitching: "/insOrderPlan/inspectionOrderDetailsTaskSwitching", // 妫�楠屽崟璇︽儏-浠诲姟鍒囨崲
@@ -315,6 +319,10 @@
update: "/performanceShift/update", //缁╂晥绠＄悊-鐝-鐝鐘舵�佷慨鏀�
pageYear: "/performanceShift/pageYear", //缁╂晥绠＄悊-鐝-骞翠唤鍒嗛〉鏌ヨ
export: "/performanceShift/export", //缁╂晥绠＄悊-鐝-瀵煎嚭
+ shiftAdd: "/shiftTime/add", //缁╂晥绠＄悊-鐝-鏃堕棿閰嶇疆-鏂板
+ getList: "/shiftTime/list", //缁╂晥绠＄悊-鐝-鏃堕棿閰嶇疆-鏌ヨ鏃堕棿閰嶇疆淇℃伅
+ shiftRemove: "/shiftTime/remove", //缁╂晥绠＄悊-鐝-鏃堕棿閰嶇疆-鍒犻櫎
+ shiftUpdate: "/shiftTime/update", //缁╂晥绠＄悊-鐝-鏃堕棿閰嶇疆-淇敼
}
const auxiliaryWorkingHours = {
--
Gitblit v1.9.3