From b1b6d5435e244018433b3b1223eee2365cf6fc85 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 11 三月 2025 11:35:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/api/cnas/resourceDemand/device.js | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/api/cnas/resourceDemand/device.js b/src/api/cnas/resourceDemand/device.js
index 8f66b90..635890a 100644
--- a/src/api/cnas/resourceDemand/device.js
+++ b/src/api/cnas/resourceDemand/device.js
@@ -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",
--
Gitblit v1.9.3