From 281b4001438ba56d2f02720fa42a4c11f72910f7 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 12 三月 2025 13:35:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/api/cnas/resourceDemand/device.js | 88 ++++++++++++++++++++++++++++++--------------
1 files changed, 60 insertions(+), 28 deletions(-)
diff --git a/src/api/cnas/resourceDemand/device.js b/src/api/cnas/resourceDemand/device.js
index 84b37ea..6a5786a 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,
});
@@ -1295,7 +1294,15 @@
//璁惧楠屾敹涓洓涓猼able琛ㄦ牸鐨勫垹闄ゅ姛鑳�
export function deleteIncidentReportAll(query) {
return request({
- url: "/incident-report/deleteIncidentReportAll",
+ url: "/incidentReport/deleteIncidentReportAll",
+ method: "delete",
+ params: query,
+ });
+}
+//璁惧楠屾敹涓洓涓猼able琛ㄦ牸鐨勫垹闄ゅ姛鑳�
+export function deleteIncidentReport(query) {
+ return request({
+ url: "/incidentReport/deleteIncidentReport",
method: "delete",
params: query,
});
@@ -1304,7 +1311,7 @@
//璁惧楠屾敹 淇濆瓨锛屾彁浜わ紝椹冲洖锛岄�氳繃鎺ュ彛
export function saveIncidentReportData(query) {
return request({
- url: "/incident-report/saveIncidentReportData",
+ url: "/incidentReport/saveIncidentReportData",
method: "post",
data: query,
});
@@ -1312,7 +1319,7 @@
//璁惧楠屾敹 淇濆瓨锛屾彁浜わ紝椹冲洖锛岄�氳繃鎺ュ彛
export function incidentReportPage(query) {
return request({
- url: "/incident-report/incidentReportPage",
+ url: "/incidentReport/incidentReportPage",
method: "get",
params: query,
});
@@ -1320,7 +1327,7 @@
//璁惧楠屾敹 淇濆瓨锛屾彁浜わ紝椹冲洖锛岄�氳繃鎺ュ彛
export function getShowIncidentReport(query) {
return request({
- url: "/incident-report/getShowIncidentReport",
+ url: "/incidentReport/getShowIncidentReport",
method: "get",
params: query,
});
@@ -1328,7 +1335,7 @@
//璁惧楠屾敹瀵煎嚭
export function incidentReportExport(query) {
return request({
- url: "/incident-report/incidentReportExport",
+ url: "/incidentReport/incidentReportExport",
method: "get",
params: query,
responseType: "blob"
@@ -1359,6 +1366,15 @@
responseType: "blob"
});
}
+//璁惧鏍″噯瀵煎嚭
+export function downLoadDeviceCalibrationFile(query) {
+ return request({
+ url: "/personBasicInfo/downLoadDeviceCalibrationFile",
+ method: "get",
+ params: query,
+ responseType: "blob"
+ });
+}
//鍒犻櫎 璁惧鏁呴殰
export function deleteDeviceFaultOne(query) {
return request({
@@ -1367,3 +1383,19 @@
params: query,
});
}
+//鍒犻櫎 璁惧鏍″噯
+export function delDeviceCalibrationFile(query) {
+ return request({
+ url: "/personBasicInfo/delDeviceCalibrationFile",
+ method: "delete",
+ params: query,
+ });
+}
+//璁惧鏍″噯鏌ヨ
+export function getDeviceCalibrationFile(query) {
+ return request({
+ url: "/personBasicInfo/getDeviceCalibrationFile",
+ method: "get",
+ params: query,
+ });
+}
--
Gitblit v1.9.3