From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides

---
 src/api/cnas/resourceDemand/device.js |  177 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 136 insertions(+), 41 deletions(-)

diff --git a/src/api/cnas/resourceDemand/device.js b/src/api/cnas/resourceDemand/device.js
index 400a1ec..b4055f7 100644
--- a/src/api/cnas/resourceDemand/device.js
+++ b/src/api/cnas/resourceDemand/device.js
@@ -92,10 +92,26 @@
   });
 }
 
-//鏌ヨ鏁伴噰閰嶇疆
+// 鏌ヨ鏁伴噰閰嶇疆
 export function queryDataAcquisitionConfiguration(query) {
   return request({
     url: "/deviceScope/queryDataAcquisitionConfiguration",
+    method: "get",
+    params: query,
+  });
+}
+// 鏌ヨ鏁伴噰閰嶇疆
+export function queryProductConfiguration(query) {
+  return request({
+    url: "/deviceScope/queryProductConfiguration",
+    method: "get",
+    params: query,
+  });
+}
+// 鏁伴噰閰嶇疆--鏌ヨ妫�楠岄」
+export function getNoConfigProduct(query) {
+  return request({
+    url: "/deviceScope/getNoConfigProduct",
     method: "get",
     params: query,
   });
@@ -109,13 +125,21 @@
     data: data,
   });
 }
-
-//鍒犻櫎鏁伴噰閰嶇疆
-export function deleteDataAcquisitionConfiguration(data) {
+// 缁存姢鏂囦欢閰嶇疆
+export function saveDeviceFileConfiguration(data) {
   return request({
-    url: "/deviceScope/deleteDataAcquisitionConfiguration",
+    url: "/deviceScope/saveDeviceFileConfiguration",
     method: "post",
     data: data,
+  });
+}
+
+//鍒犻櫎鏁伴噰閰嶇疆
+export function deleteDataAcquisitionConfiguration(query) {
+  return request({
+    url: "/deviceScope/deleteDataAcquisitionConfiguration",
+    method: "delete",
+    params: query,
   });
 }
 
@@ -850,42 +874,6 @@
   });
 }
 
-//璁惧淇濆吇鍗曟潯瀵煎嚭
-export function exportMaintenanceRecord(query) {
-  return request({
-    url: "/deviceMaintain/exportMaintenanceRecord",
-    method: "get",
-    responseType: "blob",
-    params: query,
-  });
-}
-
-//璁惧缁存姢鍒犻櫎
-export function deleteDeviceMaintenance(query) {
-  return request({
-    url: "/deviceMaintain/deleteDeviceMaintenance",
-    method: "delete",
-    params: query,
-  });
-}
-
-// 鏂板璁惧缁存姢淇濆吇
-export function addDeviceMaintenance(data) {
-  return request({
-    url: "/deviceMaintain/addDeviceMaintenance",
-    method: "post",
-    data: data,
-  });
-}
-//璁惧缁存姢琛� 鏌ヨ
-export function getDeviceMaintenancePage(query) {
-  return request({
-    url: "/deviceMaintain/getDeviceMaintenancePage",
-    method: "get",
-    params: query,
-  });
-}
-
 // 鍊熺敤-淇濆瓨
 export function saveDeviceBorrow(data) {
   return request({
@@ -1243,3 +1231,110 @@
     params: query,
   });
 }
+//浣滀笟鎸囧涔� 鏌ヨ
+export function getDeviceById(query) {
+  return request({
+    url: "/deviceScope/getDeviceById",
+    method: "get",
+    params: query,
+  });
+}
+//璁惧缁存姢淇濆吇 鏌ヨ
+export function selectDeviceMaintenancePage(query) {
+  return request({
+    url: "/deviceMaintain/selectDeviceMaintenancePage",
+    method: "get",
+    params: query,
+  });
+}
+//璁惧缁存姢淇濆吇 鍒犻櫎
+export function deleteDeviceMaintenance(query) {
+  return request({
+    url: "/deviceMaintain/deleteDeviceMaintenance",
+    method: "delete",
+    params: query,
+  });
+}
+//璁惧缁存姢淇濆吇 鏂板
+export function addDeviceMaintenance(query) {
+  return request({
+    url: "/deviceMaintain/addDeviceMaintenance",
+    method: "post",
+    data: query,
+  });
+}
+
+//浣跨敤璁板綍 瀵煎嚭
+export function exportDeviceMaintenance(query) {
+  return request({
+    url: "/deviceMaintain/exportDeviceMaintenance",
+    method: "get",
+    responseType: "blob",
+    params: query,
+  });
+}
+//璁惧浣跨敤鎺堟潈 鍒嗛〉鏌ヨ
+export function selectDeviceImpowerByPage(query) {
+  return request({
+    url: "/deviceImpower/selectDeviceImpowerByPage",
+    method: "get",
+    params: query,
+  });
+}
+//璁惧浣跨敤鎺堟潈 鏌ヨ璇︽儏
+export function getImpowerDetail(query) {
+  return request({
+    url: "/deviceImpower/getImpowerDetail",
+    method: "get",
+    params: query,
+  });
+}
+//璁惧浣跨敤鎺堟潈 鍒犻櫎
+export function deleteImpower(query) {
+  return request({
+    url: "/deviceImpower/deleteImpower",
+    method: "delete",
+    params: query,
+  });
+}
+//璁惧浣跨敤鎺堟潈 瀵煎嚭
+export function exportDeviceImpower(query) {
+  return request({
+    url: "/deviceImpower/exportDeviceImpower",
+    method: "get",
+    responseType: "blob",
+    params: query,
+  });
+}
+//璁惧浣跨敤鎺堟潈 鏂板
+export function addImpower(query) {
+  return request({
+    url: "/deviceImpower/addImpower",
+    method: "post",
+    data: query,
+  });
+}
+//璁惧浣跨敤鎺堟潈 淇敼
+export function updateImpower(query) {
+  return request({
+    url: "/deviceImpower/updateImpower",
+    method: "post",
+    data: query,
+  });
+}
+//璁惧浣跨敤鎺堟潈 鎵瑰噯鎺堟潈
+export function reviewImpowerStatus(query) {
+  return request({
+    url: "/deviceImpower/reviewImpowerStatus",
+    method: "post",
+    data: query,
+  });
+}
+//璁惧浣跨敤鎺堟潈 鎻愪环鎵瑰噯閫氱煡
+export function submitReviewImpowerStatus(query) {
+  return request({
+    url: "/deviceImpower/submitReviewImpowerStatus",
+    method: "post",
+    data: query,
+  });
+}

--
Gitblit v1.9.3