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 |  148 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 132 insertions(+), 16 deletions(-)

diff --git a/src/api/cnas/resourceDemand/device.js b/src/api/cnas/resourceDemand/device.js
index 0071864..635890a 100644
--- a/src/api/cnas/resourceDemand/device.js
+++ b/src/api/cnas/resourceDemand/device.js
@@ -868,6 +868,15 @@
     params: query,
   });
 }
+//璁惧缁存姢鍒犻櫎
+export function deviceMaintenanceExport(query) {
+  return request({
+    url: "/deviceMaintain/deviceMaintenanceExport",
+    method: "get",
+    responseType: "blob",
+    params: query,
+  });
+}
 
 // 鏂板璁惧缁存姢淇濆吇
 export function addDeviceMaintenance(data) {
@@ -1189,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,
   });
@@ -1202,7 +1218,7 @@
 //浣滀笟鎸囧涔� 鍒犻櫎
 export function homeworkGuidebook(query) {
   return request({
-    url: "/deviceInstruction/homeworkGuidebook",
+    url: "/instruction/homeworkGuidebook",
     method: "delete",
     params: query,
   });
@@ -1211,7 +1227,7 @@
 //浣滀笟鎸囧涔� 缂栬緫鏌ヨ
 export function homeworkGuidebookEditor(query) {
   return request({
-    url: "/deviceInstruction/homeworkGuidebookEditor",
+    url: "/instruction/homeworkGuidebookEditor",
     method: "get",
     params: query,
   });
@@ -1220,7 +1236,7 @@
 //浣滀笟鎸囧涔︽柊澧�
 export function newHomeworkGuidebookAdded(data) {
   return request({
-    url: "/deviceInstruction/newHomeworkGuidebookAdded",
+    url: "/instruction/newHomeworkGuidebookAdded",
     method: "post",
     data: data,
   });
@@ -1229,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({
@@ -1251,7 +1259,7 @@
     params: query,
   });
 }
-//璁惧棰勭害鎺ュ彛
+//璁惧棰勭害鎺ュ彛 鍒犻櫎
 export function reservationDelete(query) {
   return request({
     url: "/reservation/delete",
@@ -1259,7 +1267,7 @@
     params: query,
   });
 }
-//璁惧棰勭害鎺ュ彛
+//璁惧棰勭害鎺ュ彛 淇濆瓨
 export function reservationSave(query) {
   return request({
     url: "/reservation/save",
@@ -1275,3 +1283,111 @@
     params: query,
   });
 }
+//璁惧棰勭害鎺ュ彛
+export function device(query) {
+  return request({
+    url: "/api/device-faults/device",
+    method: "get",
+    params: query,
+  });
+}
+//璁惧楠屾敹涓洓涓猼able琛ㄦ牸鐨勫垹闄ゅ姛鑳�
+export function deleteIncidentReportAll(query) {
+  return request({
+    url: "/incident-report/deleteIncidentReportAll",
+    method: "delete",
+    params: query,
+  });
+}
+
+//璁惧楠屾敹 淇濆瓨锛屾彁浜わ紝椹冲洖锛岄�氳繃鎺ュ彛
+export function saveIncidentReportData(query) {
+  return request({
+    url: "/incident-report/saveIncidentReportData",
+    method: "post",
+    data: query,
+  });
+}
+//璁惧楠屾敹 淇濆瓨锛屾彁浜わ紝椹冲洖锛岄�氳繃鎺ュ彛
+export function incidentReportPage(query) {
+  return request({
+    url: "/incident-report/incidentReportPage",
+    method: "get",
+    params: query,
+  });
+}
+//璁惧楠屾敹 淇濆瓨锛屾彁浜わ紝椹冲洖锛岄�氳繃鎺ュ彛
+export function getShowIncidentReport(query) {
+  return request({
+    url: "/incident-report/getShowIncidentReport",
+    method: "get",
+    params: query,
+  });
+}
+//璁惧楠屾敹瀵煎嚭
+export function incidentReportExport(query) {
+  return request({
+    url: "/incident-report/incidentReportExport",
+    method: "get",
+    params: query,
+    responseType: "blob"
+  });
+}
+//娣诲姞璁惧鏁呴殰
+export function addOrUpdateDeviceFaultOne(query) {
+  return request({
+    url: "/deviceFaultOne/addOrUpdateDeviceFaultOne",
+    method: "post",
+    data: query,
+  });
+}
+//璁惧鏁呴殰琛� 鍒嗛〉鏌ヨ
+export function deviceFaultOnePage(query) {
+  return request({
+    url: "/deviceFaultOne/deviceFaultOnePage",
+    method: "get",
+    params: query,
+  });
+}
+//璁惧鏁呴殰瀵煎嚭
+export function exportRewardAndPunishmentRecords(query) {
+  return request({
+    url: "/deviceFaultOne/exportRewardAndPunishmentRecords",
+    method: "get",
+    params: query,
+    responseType: "blob"
+  });
+}
+//璁惧鏍″噯瀵煎嚭
+export function downLoadDeviceCalibrationFile(query) {
+  return request({
+    url: "/personBasicInfo/downLoadDeviceCalibrationFile",
+    method: "get",
+    params: query,
+    responseType: "blob"
+  });
+}
+//鍒犻櫎 璁惧鏁呴殰
+export function deleteDeviceFaultOne(query) {
+  return request({
+    url: "/deviceFaultOne/deleteDeviceFaultOne",
+    method: "delete",
+    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