From 17e098aa3cbde6934121c95247816dfa58c44e7d Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期二, 23 七月 2024 17:47:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/assets/api/controller.js | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index a7ffa68..e1b97c9 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", // 瀵煎叆鑳藉姏鑼冨洿
}
@@ -151,6 +152,8 @@
saveDataAcquisitionConfiguration: "/deviceScope/saveDataAcquisitionConfiguration", // 缁存姢鏁伴噰閰嶇疆
queryDataAcquisitionConfiguration: "/deviceScope/queryDataAcquisitionConfiguration", // 鏌ヨ鏁伴噰閰嶇疆
deleteDataAcquisitionConfiguration: "/deviceScope/deleteDataAcquisitionConfiguration", // 鍒犻櫎鏁伴噰閰嶇疆
+ determineWhetherToCollectData: "/deviceScope/determineWhetherToCollectData", // 鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲�
+ dataCollection: "/deviceScope/dataCollection", // 鏁伴噰-鏁版嵁閲囬泦
}
const insOrder = {
@@ -166,10 +169,12 @@
delInsOrderTemplate: "/insOrder/delInsOrderTemplate", //鍒犻櫎妫�楠屽崟妯℃澘
selectSampleAndProductByOrderId: "/insOrder/selectSampleAndProductByOrderId", //閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�
costStatistics: "/insOrder/costStatistics", //璐圭敤缁熻
+ costStatistics2: "/insOrder/costStatistics2", //璐圭敤缁熻
selectSampleDefects: "/insOrder/selectSampleDefects", //鏍峰搧缂洪櫡鎸囨爣
updateStatus: "/insOrder/updateStatus", //灏嗗緟瀹℃牳鏇存柊鎴愭挙閿�鐘舵��
updateInspected: "/insOrder/updateInspected", //灏嗗緟妫�楠岀殑鐨勬挙閿�杩涜鏇存敼
labelPrinting: "/insOrder/labelPrinting", //鏍囩鎵撳嵃
+ export: "/insOrder/export", //瀵煎嚭
}
const sampleOrder = {
@@ -182,6 +187,7 @@
doInsOrder: "/insOrderPlan/doInsOrder", //鎵ц妫�楠屾搷浣�
saveInsContext: "/insOrderPlan/saveInsContext", //淇濆瓨妫�楠屽唴瀹�
upPlanUser: "/insOrderPlan/upPlanUser", //浠诲姟浜ゆ帴
+ upPlanUser2: "/insOrderPlan/upPlanUser2", //浠诲姟浜ゆ帴
verifyPlan: "/insOrderPlan/verifyPlan", //澶嶆牳妫�楠屼换鍔�
submitPlan: "/insOrderPlan/submitPlan", //妫�楠屼换鍔℃彁浜�
inspectionOrderDetailsTaskSwitching: "/insOrderPlan/inspectionOrderDetailsTaskSwitching", // 妫�楠屽崟璇︽儏-浠诲姟鍒囨崲
--
Gitblit v1.9.3