From 00c9c554fcfbb1755af6c41f19dc5ae6f8294075 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 18 七月 2024 18:05:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/assets/api/controller.js | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 96039d0..4a53106 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -28,6 +28,10 @@
companies,
auxiliaryOutputWorkingHours,
auxiliaryWorkingHoursDay,
+ auxiliaryCorrectionHours,
+ insBushing,
+ auxiliaryOriginalHours,
+ evaluate,
}
}
@@ -120,6 +124,7 @@
upProduct: "/capacityScope/upProduct", //淇敼浜у搧
getItemTree: "/capacityScope/getItemTree", //鑾峰彇妫�楠屽璞℃爲
importData: "/capacityScope/importData", //瀵煎叆妫�楠岄」鐩�
+ importExcel: "/capacityScope/importExcel", // 瀵煎叆鑳藉姏鑼冨洿
}
const laboratoryScope = {
@@ -141,6 +146,13 @@
uploadFile: "/deviceScope/uploadFile", //涓婁紶鍥剧墖
selectDevicePrincipal: "/user/getDeviceManager", //鑾峰彇璁惧璐熻矗浜�
selectDeviceByCode: "/deviceScope/selectDeviceByCode", //閫氳繃璁惧缂栧彿鑾峰彇璁惧鍒楄〃
+ getNumberCollect: "/deviceScope/getNumberCollect", //鏌ヨ鏁伴噰閰嶇疆
+ numberCollect: "/deviceScope/numberCollect", //缁存姢鏁伴噰閰嶇疆
+ saveDataAcquisitionConfiguration: "/deviceScope/saveDataAcquisitionConfiguration", // 缁存姢鏁伴噰閰嶇疆
+ queryDataAcquisitionConfiguration: "/deviceScope/queryDataAcquisitionConfiguration", // 鏌ヨ鏁伴噰閰嶇疆
+ deleteDataAcquisitionConfiguration: "/deviceScope/deleteDataAcquisitionConfiguration", // 鍒犻櫎鏁伴噰閰嶇疆
+ determineWhetherToCollectData: "/deviceScope/determineWhetherToCollectData", // 鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲�
+ dataCollection: "/deviceScope/dataCollection", // 鏁伴噰-鏁版嵁閲囬泦
}
const insOrder = {
@@ -156,9 +168,11 @@
delInsOrderTemplate: "/insOrder/delInsOrderTemplate", //鍒犻櫎妫�楠屽崟妯℃澘
selectSampleAndProductByOrderId: "/insOrder/selectSampleAndProductByOrderId", //閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�
costStatistics: "/insOrder/costStatistics", //璐圭敤缁熻
+ costStatistics2: "/insOrder/costStatistics2", //璐圭敤缁熻
selectSampleDefects: "/insOrder/selectSampleDefects", //鏍峰搧缂洪櫡鎸囨爣
- updateStatus:"/insOrder/updateStatus",//灏嗗緟瀹℃牳鏇存柊鎴愭挙閿�鐘舵��
- updateInspected:"/insOrder/updateInspected",//灏嗗緟妫�楠岀殑鐨勬挙閿�杩涜鏇存敼
+ updateStatus: "/insOrder/updateStatus", //灏嗗緟瀹℃牳鏇存柊鎴愭挙閿�鐘舵��
+ updateInspected: "/insOrder/updateInspected", //灏嗗緟妫�楠岀殑鐨勬挙閿�杩涜鏇存敼
+ labelPrinting: "/insOrder/labelPrinting", //鏍囩鎵撳嵃
}
const sampleOrder = {
@@ -174,6 +188,15 @@
verifyPlan: "/insOrderPlan/verifyPlan", //澶嶆牳妫�楠屼换鍔�
submitPlan: "/insOrderPlan/submitPlan", //妫�楠屼换鍔℃彁浜�
inspectionOrderDetailsTaskSwitching: "/insOrderPlan/inspectionOrderDetailsTaskSwitching", // 妫�楠屽崟璇︽儏-浠诲姟鍒囨崲
+ getInsProduct: "/insOrderPlan/getInsProduct", // 鑾峰彇妫�楠岄」鐩拰妯℃澘鍐呭
+ getFileList: "/insOrderPlan/getFileList", // 鏌ョ湅妫�楠屽崟涓嬬殑闄勪欢鍒楄〃
+ delfile: "/insOrderPlan/delfile", // 闄勪欢鍒犻櫎
+ uploadFile: "/insOrderPlan/uploadFile", // 闄勪欢涓婁紶
+ downFile: "/insOrderPlan/downFile", // 闄勪欢涓嬭浇
+ checkSubmitPlan: "/insOrderPlan/checkSubmitPlan", // 鏍￠獙妫�楠屼换鍔℃彁浜�
+ getReportModel: "/insOrderPlan/getReportModel", // 鍒囨崲鍏夌氦-鍏夌氦甯﹁褰曟ā鐗堟煡璇㈡楠屽唴瀹�
+ write: "/insOrderPlan/write", // 濉啓娓╁害涓庢箍搴�
+ temCycle: "/insOrderPlan/temCycle", // 娓╁害寰幆鏌ョ湅鍒楄〃鏁版嵁(鍖呮嫭閫氳繃鏍峰搧id,寰幆娆℃暟,娓╁害,寰幆娆℃暟杩涜绛涢��)
}
const systemLog = {
@@ -182,6 +205,7 @@
const standardTree = {
selectStandardTreeList: "/standardTree/selectStandardTreeList", //鑾峰彇鏍囧噯鏍�
+ selectStandardTreeList2: "/standardTree/selectStandardTreeList2", //鑾峰彇鏍囧噯鏍�
addStandardTree: "/standardTree/addStandardTree", //娣诲姞鏍囧噯鏍�
addStandardMethodList: "/standardTree/addStandardMethodList", //缁欐爣鍑嗘爲娣诲姞妫�楠屾爣鍑�
selectsStandardMethodByFLSSM: "/standardTree/selectsStandardMethodByFLSSM", //鏍规嵁鏍囧噯鏍戣繘琛屾爣鍑嗘煡璇�
@@ -198,6 +222,9 @@
upStandardProducts: "/standardTree/upStandardProducts", //鑾峰彇浜у搧鏋舵瀯
selectStandardProductEnumByMethodId: "/standardTree/selectStandardProductEnumByMethodId", //鎵归噺缂栬緫鏌ヨ鎵�鏈夋楠岄」鐩拰妫�楠屽瓙椤规灇涓�
getStandTreeBySampleType: "/standardTree/getStandTreeBySampleType", //浠呰幏鍙栧厜绾ょ殑鍨嬪彿
+ inExcelOfTree: "/standardTree/inExcelOfTree", //瀵煎叆鏍囧噯搴�
+ resetTreeOfPrice: "/standardTree/resetTreeOfPrice", //閲嶇疆鏍囧噯搴撳崟浠�
+ resetTreeOfHour: "/standardTree/resetTreeOfHour", //閲嶇疆鏍囧噯搴撳伐鏃剁郴鏁�
}
const standardMethod = {
@@ -323,3 +350,30 @@
check: "/auxiliaryWorkingHoursDay/check", //瀹℃牳
approve: "/auxiliaryWorkingHoursDay/approve", //鎵瑰噯
}
+
+const auxiliaryCorrectionHours = {
+ selectAuxiliaryCorrectionHours: "/auxiliaryCorrectionHours/selectAuxiliaryCorrectionHours", //鏌ヨ淇宸ユ椂
+ upload: "/auxiliaryCorrectionHours/upload", //瀵煎叆
+}
+
+const insBushing = {
+ selectBushingBySampleId: "/insBushing/selectBushingBySampleId", //閫氳繃鏍峰搧id鑾峰彇鏍峰搧涓嬪厜绾ら厤缃唴瀹�
+}
+
+const auxiliaryOriginalHours = {
+ selectAuxiliaryOriginalHours: "/auxiliaryOriginalHours/selectAuxiliaryOriginalHours", //鏌ヨ鍘熷宸ユ椂
+ exportOriginalHours: "/auxiliaryOriginalHours/exportOriginalHours", //瀵煎嚭鍘熷宸ユ椂
+}
+
+const evaluate = {
+ page: "/evaluate/page", //鏌ヨ鑰冭瘎
+ exportEvaluate: "/evaluate/exportEvaluate", //瀵煎嚭鑰冭瘎
+ getEvaluateCompetent: "/evaluateCompetent/getEvaluateCompetent", //鏌ヨ涓荤鎵撳垎
+ writeEvaluateCompetent: "/evaluateCompetent/writeEvaluateCompetent", //濉啓涓荤鎵撳垎
+ getEvaluateLeader: "/evaluateLeader/getEvaluateLeader", //鏌ヨ缁勯暱璇勫垎
+ writeEvaluateLeader: "/evaluateLeader/writeEvaluateLeader", //缁勯暱璇勫垎
+ exportEvaluateCompetent: "/evaluateCompetent/exportEvaluateCompetent", //瀵煎嚭涓荤鎵撳垎
+ exportEvaluateLeader: "/evaluateLeader/exportEvaluateLeader", //瀵煎嚭缁勯暱鎵撳垎
+ getEvaluateGroup: "/evaluateGroup/getEvaluateGroup", //鏌ヨ鍛樺伐浜掕瘎
+ writeEvaluateGroup: "/evaluateGroup/writeEvaluateGroup", //濉啓鍛樺伐浜掕瘎
+}
--
Gitblit v1.9.3