From c92029d888ea7c7f54ea02f13688743b00cd8870 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 22 七月 2024 17:15:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/assets/api/controller.js | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 7b82b18..19d9552 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -149,7 +149,10 @@
getNumberCollect: "/deviceScope/getNumberCollect", //鏌ヨ鏁伴噰閰嶇疆
numberCollect: "/deviceScope/numberCollect", //缁存姢鏁伴噰閰嶇疆
saveDataAcquisitionConfiguration: "/deviceScope/saveDataAcquisitionConfiguration", // 缁存姢鏁伴噰閰嶇疆
-
+ queryDataAcquisitionConfiguration: "/deviceScope/queryDataAcquisitionConfiguration", // 鏌ヨ鏁伴噰閰嶇疆
+ deleteDataAcquisitionConfiguration: "/deviceScope/deleteDataAcquisitionConfiguration", // 鍒犻櫎鏁伴噰閰嶇疆
+ determineWhetherToCollectData: "/deviceScope/determineWhetherToCollectData", // 鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲�
+ dataCollection: "/deviceScope/dataCollection", // 鏁伴噰-鏁版嵁閲囬泦
}
const insOrder = {
@@ -165,10 +168,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 = {
--
Gitblit v1.9.3