From defa824eab2350fd6abfd10abd8f4df94749e336 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 31 七月 2024 11:21:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index e1b97c9..13eb73a 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -154,6 +154,8 @@
   deleteDataAcquisitionConfiguration: "/deviceScope/deleteDataAcquisitionConfiguration", // 鍒犻櫎鏁伴噰閰嶇疆
   determineWhetherToCollectData: "/deviceScope/determineWhetherToCollectData", // 鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲�
   dataCollection: "/deviceScope/dataCollection", // 鏁伴噰-鏁版嵁閲囬泦
+  treeDevice: "/deviceScope/treeDevice", // 璁惧鏍戝舰
+  temDataAcquisition: "/deviceScope/temDataAcquisition", // PK8000鏁伴噰
 }
 
 const insOrder = {
@@ -317,6 +319,10 @@
   update: "/performanceShift/update", //缁╂晥绠$悊-鐝-鐝鐘舵�佷慨鏀�
   pageYear: "/performanceShift/pageYear", //缁╂晥绠$悊-鐝-骞翠唤鍒嗛〉鏌ヨ
   export: "/performanceShift/export", //缁╂晥绠$悊-鐝-瀵煎嚭
+  shiftAdd: "/shiftTime/add", //缁╂晥绠$悊-鐝-鏃堕棿閰嶇疆-鏂板
+  getList: "/shiftTime/list", //缁╂晥绠$悊-鐝-鏃堕棿閰嶇疆-鏌ヨ鏃堕棿閰嶇疆淇℃伅
+  shiftRemove: "/shiftTime/remove", //缁╂晥绠$悊-鐝-鏃堕棿閰嶇疆-鍒犻櫎
+  shiftUpdate: "/shiftTime/update", //缁╂晥绠$悊-鐝-鏃堕棿閰嶇疆-淇敼
 }
 
 const auxiliaryWorkingHours = {

--
Gitblit v1.9.3