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 | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 94dd342..13eb73a 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -124,6 +124,8 @@
upProduct: "/capacityScope/upProduct", //淇敼浜у搧
getItemTree: "/capacityScope/getItemTree", //鑾峰彇妫�楠屽璞℃爲
importData: "/capacityScope/importData", //瀵煎叆妫�楠岄」鐩�
+ importEquipData: "/capacityScope/importEquipData", //瑁呭鐢电紗-瀵煎叆妫�楠岄」鐩�
+ importExcel: "/capacityScope/importExcel", // 瀵煎叆鑳藉姏鑼冨洿
}
const laboratoryScope = {
@@ -147,6 +149,13 @@
selectDeviceByCode: "/deviceScope/selectDeviceByCode", //閫氳繃璁惧缂栧彿鑾峰彇璁惧鍒楄〃
getNumberCollect: "/deviceScope/getNumberCollect", //鏌ヨ鏁伴噰閰嶇疆
numberCollect: "/deviceScope/numberCollect", //缁存姢鏁伴噰閰嶇疆
+ saveDataAcquisitionConfiguration: "/deviceScope/saveDataAcquisitionConfiguration", // 缁存姢鏁伴噰閰嶇疆
+ queryDataAcquisitionConfiguration: "/deviceScope/queryDataAcquisitionConfiguration", // 鏌ヨ鏁伴噰閰嶇疆
+ deleteDataAcquisitionConfiguration: "/deviceScope/deleteDataAcquisitionConfiguration", // 鍒犻櫎鏁伴噰閰嶇疆
+ determineWhetherToCollectData: "/deviceScope/determineWhetherToCollectData", // 鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲�
+ dataCollection: "/deviceScope/dataCollection", // 鏁伴噰-鏁版嵁閲囬泦
+ treeDevice: "/deviceScope/treeDevice", // 璁惧鏍戝舰
+ temDataAcquisition: "/deviceScope/temDataAcquisition", // PK8000鏁伴噰
}
const insOrder = {
@@ -162,10 +171,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 = {
@@ -178,6 +189,7 @@
doInsOrder: "/insOrderPlan/doInsOrder", //鎵ц妫�楠屾搷浣�
saveInsContext: "/insOrderPlan/saveInsContext", //淇濆瓨妫�楠屽唴瀹�
upPlanUser: "/insOrderPlan/upPlanUser", //浠诲姟浜ゆ帴
+ upPlanUser2: "/insOrderPlan/upPlanUser2", //浠诲姟浜ゆ帴
verifyPlan: "/insOrderPlan/verifyPlan", //澶嶆牳妫�楠屼换鍔�
submitPlan: "/insOrderPlan/submitPlan", //妫�楠屼换鍔℃彁浜�
inspectionOrderDetailsTaskSwitching: "/insOrderPlan/inspectionOrderDetailsTaskSwitching", // 妫�楠屽崟璇︽儏-浠诲姟鍒囨崲
@@ -188,6 +200,8 @@
downFile: "/insOrderPlan/downFile", // 闄勪欢涓嬭浇
checkSubmitPlan: "/insOrderPlan/checkSubmitPlan", // 鏍￠獙妫�楠屼换鍔℃彁浜�
getReportModel: "/insOrderPlan/getReportModel", // 鍒囨崲鍏夌氦-鍏夌氦甯﹁褰曟ā鐗堟煡璇㈡楠屽唴瀹�
+ write: "/insOrderPlan/write", // 濉啓娓╁害涓庢箍搴�
+ temCycle: "/insOrderPlan/temCycle", // 娓╁害寰幆鏌ョ湅鍒楄〃鏁版嵁(鍖呮嫭閫氳繃鏍峰搧id,寰幆娆℃暟,娓╁害,寰幆娆℃暟杩涜绛涢��)
}
const systemLog = {
@@ -305,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