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 |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index d5e16a7..4a53106 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -124,6 +124,7 @@
   upProduct: "/capacityScope/upProduct", //淇敼浜у搧
   getItemTree: "/capacityScope/getItemTree", //鑾峰彇妫�楠屽璞℃爲
   importData: "/capacityScope/importData", //瀵煎叆妫�楠岄」鐩�
+  importExcel: "/capacityScope/importExcel", // 瀵煎叆鑳藉姏鑼冨洿
 }
 
 const laboratoryScope = {
@@ -147,6 +148,11 @@
   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 = {
@@ -162,6 +168,7 @@
   delInsOrderTemplate: "/insOrder/delInsOrderTemplate", //鍒犻櫎妫�楠屽崟妯℃澘
   selectSampleAndProductByOrderId: "/insOrder/selectSampleAndProductByOrderId", //閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�
   costStatistics: "/insOrder/costStatistics", //璐圭敤缁熻
+  costStatistics2: "/insOrder/costStatistics2", //璐圭敤缁熻
   selectSampleDefects: "/insOrder/selectSampleDefects", //鏍峰搧缂洪櫡鎸囨爣
   updateStatus: "/insOrder/updateStatus", //灏嗗緟瀹℃牳鏇存柊鎴愭挙閿�鐘舵��
   updateInspected: "/insOrder/updateInspected", //灏嗗緟妫�楠岀殑鐨勬挙閿�杩涜鏇存敼

--
Gitblit v1.9.3