From 1ea1ad2c56e95e71e1756cfca73e7183f9795ac9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 16 四月 2025 15:23:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_test

---
 src/api/cnas/resourceDemand/device.js |   42 +++++++++++++++++++++++++++++++++++++-----
 1 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/api/cnas/resourceDemand/device.js b/src/api/cnas/resourceDemand/device.js
index 400a1ec..58189d3 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,
   });
 }
 
@@ -1243,3 +1267,11 @@
     params: query,
   });
 }
+//浣滀笟鎸囧涔� 鏌ヨ
+export function getDeviceById(query) {
+  return request({
+    url: "/deviceScope/getDeviceById",
+    method: "get",
+    params: query,
+  });
+}

--
Gitblit v1.9.3