From fd9deb7e45ff86f3570a3048a459b29f0ebbd628 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期四, 13 六月 2024 18:04:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/assets/api/controller.js | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js index 5b3cbdc..2f5338c 100644 --- a/src/assets/api/controller.js +++ b/src/assets/api/controller.js @@ -29,7 +29,8 @@ auxiliaryOutputWorkingHours, auxiliaryWorkingHoursDay, auxiliaryCorrectionHours, - insBushing + insBushing, + auxiliaryOriginalHours, } } @@ -143,6 +144,8 @@ uploadFile: "/deviceScope/uploadFile", //涓婁紶鍥剧墖 selectDevicePrincipal: "/user/getDeviceManager", //鑾峰彇璁惧璐熻矗浜� selectDeviceByCode: "/deviceScope/selectDeviceByCode", //閫氳繃璁惧缂栧彿鑾峰彇璁惧鍒楄〃 + getNumberCollect: "/deviceScope/getNumberCollect", //鏌ヨ鏁伴噰閰嶇疆 + numberCollect: "/deviceScope/numberCollect", //缁存姢鏁伴噰閰嶇疆 } const insOrder = { @@ -176,6 +179,12 @@ 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", // 鏍¢獙妫�楠屼换鍔℃彁浜� } const systemLog = { @@ -328,8 +337,14 @@ const auxiliaryCorrectionHours = { selectAuxiliaryCorrectionHours: "/auxiliaryCorrectionHours/selectAuxiliaryCorrectionHours", //鏌ヨ淇宸ユ椂 + upload: "/auxiliaryCorrectionHours/upload", //瀵煎叆 } const insBushing = { selectBushingBySampleId: "/insBushing/selectBushingBySampleId", //閫氳繃鏍峰搧id鑾峰彇鏍峰搧涓嬪厜绾ら厤缃唴瀹� } + +const auxiliaryOriginalHours = { + selectAuxiliaryOriginalHours: "/auxiliaryOriginalHours/selectAuxiliaryOriginalHours", //鏌ヨ鍘熷宸ユ椂 + exportOriginalHours: "/auxiliaryOriginalHours/exportOriginalHours", //瀵煎嚭鍘熷宸ユ椂 +} -- Gitblit v1.9.3