From 5eae401ee623a3ba2a144fb05df2242747d0a466 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期五, 19 七月 2024 17:40:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/assets/api/controller.js |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index a7ffa68..19d9552 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -151,6 +151,8 @@
   saveDataAcquisitionConfiguration: "/deviceScope/saveDataAcquisitionConfiguration", // 缁存姢鏁伴噰閰嶇疆
   queryDataAcquisitionConfiguration: "/deviceScope/queryDataAcquisitionConfiguration", // 鏌ヨ鏁伴噰閰嶇疆
   deleteDataAcquisitionConfiguration: "/deviceScope/deleteDataAcquisitionConfiguration", // 鍒犻櫎鏁伴噰閰嶇疆
+  determineWhetherToCollectData: "/deviceScope/determineWhetherToCollectData", // 鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲�
+  dataCollection: "/deviceScope/dataCollection", // 鏁伴噰-鏁版嵁閲囬泦
 }
 
 const insOrder = {
@@ -166,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