From 6140eb0f56b7adae1d4e41dbd4a1ac582dd17d9b Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 12 三月 2025 11:23:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi into dev
---
src/api/cnas/resourceDemand/device.js | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/src/api/cnas/resourceDemand/device.js b/src/api/cnas/resourceDemand/device.js
index 8f66b90..08b9d6d 100644
--- a/src/api/cnas/resourceDemand/device.js
+++ b/src/api/cnas/resourceDemand/device.js
@@ -660,7 +660,7 @@
//鏂板璁惧妗ｆ
export function addDocument(data) {
return request({
- url: "/deviceDocuments/addDocument",
+ url: "/documents/add",
method: "post",
data: data,
});
@@ -669,7 +669,7 @@
// 鑾峰彇鐩稿叧鏂囨。鏁版嵁鐨刟pi-鏇存柊
export function updateDocument(data) {
return request({
- url: "/deviceDocuments/updateDocument",
+ url: "/documents/updateDocument",
method: "post",
data: data,
});
@@ -678,7 +678,7 @@
//鍒犻櫎璁惧妗ｆ
export function deleteDocumentById(query) {
return request({
- url: "/deviceDocuments/deleteDocumentById",
+ url: "/documents/delete",
method: "delete",
params: query,
});
@@ -814,9 +814,9 @@
}
//鏌ヨ璁惧妗ｆ鍒楄〃
-export function getAllDocuments(query) {
+export function getListByDId(query) {
return request({
- url: `/deviceDocuments/getAllDocuments`,
+ url: '/documents/getListByDId',
method: "get",
params: query,
});
@@ -1198,11 +1198,18 @@
data: data,
});
}
-
+//浣滀笟鎸囧涔︽煡璇�
+export function pageByPageQueryOfHomeworkInstructions(query) {
+ return request({
+ url: "/instruction/pageByPageQueryOfHomeworkInstructions",
+ method: "get",
+ params: query,
+ });
+}
//浣滀笟鎸囧涔� 瀹℃壒
export function approvalOfHomeworkInstructionManual(data) {
return request({
- url: "/deviceInstruction/approvalOfHomeworkInstructionManual",
+ url: "/instruction/approvalOfHomeworkInstructionManual",
method: "post",
data: data,
});
@@ -1211,7 +1218,7 @@
//浣滀笟鎸囧涔� 鍒犻櫎
export function homeworkGuidebook(query) {
return request({
- url: "/deviceInstruction/homeworkGuidebook",
+ url: "/instruction/homeworkGuidebook",
method: "delete",
params: query,
});
@@ -1220,7 +1227,7 @@
//浣滀笟鎸囧涔� 缂栬緫鏌ヨ
export function homeworkGuidebookEditor(query) {
return request({
- url: "/deviceInstruction/homeworkGuidebookEditor",
+ url: "/instruction/homeworkGuidebookEditor",
method: "get",
params: query,
});
@@ -1229,7 +1236,7 @@
//浣滀笟鎸囧涔︽柊澧�
export function newHomeworkGuidebookAdded(data) {
return request({
- url: "/deviceInstruction/newHomeworkGuidebookAdded",
+ url: "/instruction/newHomeworkGuidebookAdded",
method: "post",
data: data,
});
@@ -1238,20 +1245,12 @@
//浣滀笟鎸囧涔﹀彈鎺ф枃浠跺垹闄�
export function deleteHomeworkGuidebook(query) {
return request({
- url: "/deviceInstruction/deleteHomeworkGuidebook",
+ url: "/instruction/deleteHomeworkGuidebook",
method: "delete",
params: query,
});
}
-//浣滀笟鎸囧涔� 鏌ヨ
-export function pageByPageQueryOfHomeworkInstructions(query) {
- return request({
- url: "/deviceInstruction/pageByPageQueryOfHomeworkInstructions",
- method: "get",
- params: query,
- });
-}
//璁惧棰勭害鎺ュ彛
export function reservationSelectDevice(query) {
return request({
@@ -1260,7 +1259,7 @@
params: query,
});
}
-//璁惧棰勭害鎺ュ彛
+//璁惧棰勭害鎺ュ彛 鍒犻櫎
export function reservationDelete(query) {
return request({
url: "/reservation/delete",
@@ -1268,7 +1267,7 @@
params: query,
});
}
-//璁惧棰勭害鎺ュ彛
+//璁惧棰勭害鎺ュ彛 淇濆瓨
export function reservationSave(query) {
return request({
url: "/reservation/save",
@@ -1284,10 +1283,10 @@
params: query,
});
}
-//璁惧棰勭害鎺ュ彛
+// 璁惧杩愯鎬昏-鏍规嵁id鑾峰彇璁惧鏁呴殰鏁版嵁
export function device(query) {
return request({
- url: "/api/device-faults/device",
+ url: "/deviceFaults/device",
method: "get",
params: query,
});
--
Gitblit v1.9.3