From 06ca842a5219511302497d0a87be4293ae7cb7a0 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 17 四月 2025 23:10:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/api/cnas/resourceDemand/device.js |  131 ++++++++++++++++++++++++++++++-------------
 1 files changed, 92 insertions(+), 39 deletions(-)

diff --git a/src/api/cnas/resourceDemand/device.js b/src/api/cnas/resourceDemand/device.js
index adb7ee4..5f2d7fd 100644
--- a/src/api/cnas/resourceDemand/device.js
+++ b/src/api/cnas/resourceDemand/device.js
@@ -108,6 +108,14 @@
     params: query,
   });
 }
+// 鏁伴噰閰嶇疆--鏌ヨ妫�楠岄」
+export function getNoConfigProduct(query) {
+  return request({
+    url: "/deviceScope/getNoConfigProduct",
+    method: "get",
+    params: query,
+  });
+}
 
 // 缁存姢鏁伴噰閰嶇疆
 export function saveDataAcquisitionConfiguration(data) {
@@ -127,11 +135,11 @@
 }
 
 //鍒犻櫎鏁伴噰閰嶇疆
-export function deleteDataAcquisitionConfiguration(data) {
+export function deleteDataAcquisitionConfiguration(query) {
   return request({
     url: "/deviceScope/deleteDataAcquisitionConfiguration",
-    method: "post",
-    data: data,
+    method: "delete",
+    params: query,
   });
 }
 
@@ -866,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({
@@ -1267,3 +1239,84 @@
     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 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,
+  });
+}

--
Gitblit v1.9.3