From dd929871969c4275eeb3246d7c5c0d6f35060b10 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 31 十二月 2024 14:52:47 +0800
Subject: [PATCH] 接口文件冲突
---
src/assets/api/controller.js | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 110 insertions(+), 9 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index a455cca..6372293 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -68,6 +68,13 @@
internalWastes,
foreignRegister,
feCalibrationSchedule,
+ feStandardSubstance,
+ feStandardSubstanceRecord,
+ personPostAuthorizationRecord,
+ deviceCheck,
+ personCommunicationAbility,
+ procurementSuppliesContents,
+ procurementSuppliesStore,
}
}
@@ -261,7 +268,8 @@
getInsOrderUserList: "/insOrderPlan/getInsOrderUserList", // 鏌ョ湅妫�楠屽巻鍙插垪琛�
preview: "/insOrderPlan/preview", // csv鏂囦欢棰勮
outInsOrderState: "/insOrderPlan/outInsOrderState", // 妫�楠屼换鍔℃壂鐮佸嚭搴�
- cancelSubmitPlan: "/insOrderPlan/cancelSubmitPlan", // 妫�楠屼换鍔℃彁浜ゅ悗鎾ら攢鎻愪氦
+ // insOrderPlan.cancelSubmitPlan
+ cancelSubmitPlan: "/insOrderPlan/cancelSubmitPlan", // 妫�楠屼换鍔℃挙閿�
}
const systemLog = {
@@ -520,13 +528,13 @@
}
// 8.4璁板綍鐨勬帶鍒�--鏂囦欢瀹℃壒璁板綍
const manageRecordCheck = {
- pageManageRecordCheck:'/manageRecordCheck/pageManageRecordCheck ',//鍒楄〃
- addManageRecordCheck:'/manageRecordCheck/addManageRecordCheck ',//鏂板
- doManageRecordCheck:'/manageRecordCheck/doManageRecordCheck ',//缂栬緫
- delManageRecordCheck:'/manageRecordCheck/delManageRecordCheck ',//鍒犻櫎
- checkManageRecordCheck:'/manageRecordCheck/checkManageRecordCheck ',//瀹℃牳
- ratifyManageRecordCheck:'/manageRecordCheck/ratifyManageRecordCheck ',//鎵瑰噯
- exportOutManageRecordCheck:'/manageRecordCheck/exportOutManageRecordCheck ',//瀵煎嚭
+ pageManageRecordCheck:'/manageRecordCheck/pageManageRecordCheck',//鍒楄〃
+ addManageRecordCheck:'/manageRecordCheck/addManageRecordCheck',//鏂板
+ doManageRecordCheck:'/manageRecordCheck/doManageRecordCheck',//缂栬緫
+ delManageRecordCheck:'/manageRecordCheck/delManageRecordCheck',//鍒犻櫎
+ checkManageRecordCheck:'/manageRecordCheck/checkManageRecordCheck',//瀹℃牳
+ ratifyManageRecordCheck:'/manageRecordCheck/ratifyManageRecordCheck',//鎵瑰噯
+ exportOutManageRecordCheck:'/manageRecordCheck/exportOutManageRecordCheck',//瀵煎嚭
exportInManageRecordCheck:'/manageRecordCheck/exportInManageRecordCheck',//瀵煎叆
}
@@ -576,6 +584,7 @@
// 6.2 浜哄憳
const personnel = {
selectCNSAPersonTree: '/personBasicInfo/selectCNSAPersonTree', // 鏌ヨCNAS浜哄憳渚ц竟鏍�
+ saveCNASFile: '/personBasicInfo/saveCNASFile', // 鍏叡鏂囦欢淇濆瓨鎺ュ彛
}
// 8.3 瀹㈡埛婊℃剰搴﹁皟鏌�
@@ -807,7 +816,7 @@
getPageResults: "/manageRiskAssessmentResults/getPageResults", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 鍒嗛〉
hazardIdentificationAndRiskApproval: "/manageRiskAssessmentResults/hazardIdentificationAndRiskApproval", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 鎵瑰噯
dangerousRiskApproval: "/manageRiskAssessmentResults/dangerousRiskApproval", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 瀹℃壒
- riskAssessmentImport: "manageRiskAssessmentResults/riskAssessmentImport", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 瀵煎叆
+ riskAssessmentImport: "/manageRiskAssessmentResults/riskAssessmentImport", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 瀵煎叆
addNewRiskFactors: "/manageRiskAssessmentResults/addNewRiskFactors", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 鏂板
removeRiskFactors: "/manageRiskAssessmentResults/removeRiskFactors", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 鍒犻櫎
exportHazardFactorIdentification: "/manageRiskAssessmentResults/exportHazardFactorIdentification", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 瀵煎嚭
@@ -902,3 +911,95 @@
exportOfValueTraceabilityPlan: '/feCalibrationSchedule/exportOfValueTraceabilityPlan', // 閲忓�兼函婧愯鍒� 瀵煎嚭
importOfValueTraceabilityPlan: '/feCalibrationSchedule/importOfValueTraceabilityPlan', // 閲忓�兼函婧愯鍒� 瀵煎叆
}
+
+// 6.5鏍囧噯鐗╄川娓呭崟
+const feStandardSubstance = {
+ getPageStandardSubstance:'/feStandardSubstance/getPageStandardSubstance',// 鏍囧噯鐗╄川娓呭崟鏌ヨ
+ addStandardSubstance:'/feStandardSubstance/addStandardSubstance',//鏍囧噯鐗╄川娓呭崟鏂板缂栬緫
+ removeStandardSubstance:'/feStandardSubstance/removeStandardSubstance',//鍒犻櫎鏍囧噯鐗╄川娓呭崟
+ exportOfStandardSubstanceList: '/feStandardSubstance/exportOfStandardSubstanceList', // 鏍囧噯鐗╄川娓呭崟 瀵煎嚭
+}
+
+// 6.5鏍囧噯鐗╄川娓呭崟-棰嗙敤鍊熺敤褰掕繕
+const feStandardSubstanceRecord = {
+ getSubstanceRecord:'/feStandardSubstanceRecord/getSubstanceRecord',// 鏍囧噯鐗╄川娓呭崟棰嗙敤鏌ヨ
+ borrowSubstance:'/feStandardSubstanceRecord/borrowSubstance',//鏍囧噯鐗╄川娓呭崟鍊熺敤
+ returnSubstance:'/feStandardSubstanceRecord/returnSubstance',//鏍囧噯鐗╄川娓呭崟褰掕繕
+ getPageSubstanceRecord: '/feStandardSubstanceRecord/getPageSubstanceRecord', // 鍒嗛〉鏌ヨ
+}
+
+const personPostAuthorizationRecord = {
+ exportPersonPostAuthorizationRecord:'/personPostAuthorizationRecord/exportPersonPostAuthorizationRecord',//浼犲弬id 浜哄憳鐨勪换鑱屾巿鏉冨鍑�
+ exportPersonBasicInfo:'/personBasicInfo/exportPersonBasicInfo',//鏈俊鎭鍑�,浼犲弬绫讳技鍒嗛〉
+ exportPersonBasicInfoById:'/personBasicInfo/exportPersonBasicInfoById',//鏈俊鎭鍑�,浼犲弬绫讳技鍒嗛〉
+ exportPersonJobResponsibilities:'/personJobResponsibilities/exportPersonJobResponsibilities',//瀵煎嚭浜哄憳鑱岃矗,浼犲弬id
+}
+
+//璁惧鎺ュ彛
+const deviceCheck = {
+ list: '/device-alt',
+ edit: '/device-alt/edit',
+ saveIncidentReportData: '/incident-report/saveIncidentReportData', // 璁惧楠屾敹 淇濆瓨锛屾彁浜わ紝椹冲洖锛岄�氳繃鎺ュ彛
+ incidentReportPage: '/incident-report/incidentReportPage', // 鎵撳紑鏂板寮规锛岃幏鍙栬澶囩殑鍩虹淇℃伅
+ deleteIncidentReport: '/incident-report/deleteIncidentReport', // 鍒犻櫎璁惧楠屾敹鏁版嵁
+ getShowIncidentReport: '/incident-report/getShowIncidentReport', // 璁惧楠屾敹 鐐瑰嚮鏌ョ湅鑾峰彇鏁版嵁
+ deleteIncidentReportAll: '/incident-report/deleteIncidentReportAll', // 璁惧楠屾敹涓洓涓猼able琛ㄦ牸鐨勫垹闄ゅ姛鑳�
+ incidentReportExport: '/incident-report/incidentReportExport', // 璁惧楠屾敹瀵煎嚭
+ deviceRecordPage: '/deviceRecord/deviceRecordPage', // cnas璁惧浣跨敤璁板綍鍒嗛〉鏌ヨ
+ saveDeviceRecord: '/deviceRecord/saveDeviceRecord', // 璁惧浣跨敤璁板綍淇濆瓨
+ deleteDeviceRecord: '/deviceRecord/deleteDeviceRecord', // 鍒犻櫎璁惧浣跨敤璁板綍
+ deviceRecordExport: '/deviceRecord/deviceRecordExport', // 璁惧浣跨敤璁板綍鍒犻櫎
+ getDeviceMaintenancePage: '/device-maintain/getDeviceMaintenancePage', // 璁惧缁存姢鍒嗛〉鏌ヨ
+ deviceMaintenanceExport: '/device-maintain/deviceMaintenanceExport', // 璁惧缁存姢瀵煎嚭
+ deviceMaintenanceDelete: '/device-maintain/delete', // 璁惧缁存姢鍒犻櫎
+ deviceMaintainAdd: '/device-maintain', // 璁惧缁存姢鏂板
+ saveDeviceState: '/deviceState/saveDeviceState', // 璁惧鍚敤/鍋滅敤 淇濆瓨锛屾彁浜わ紝椹冲洖锛岄�氳繃鎺ュ彛
+ getDeviceStatePage: '/deviceState/getDeviceStatePage', // 璁惧鍚敤/鍋滅敤 鍒嗛〉
+ deleteDeviceState: '/deviceState/deleteDeviceState', // 璁惧鍚敤/鍋滅敤 鍒犻櫎
+ deviceFaultOnePage: '/deviceFaultOne/deviceFaultOnePage', // 璁惧鏁呴殰琛� 鍒嗛〉鏌ヨ
+ addOrUpdateDeviceFaultOne: '/deviceFaultOne/addOrUpdateDeviceFaultOne',
+ deleteDeviceFaultOne: '/deviceFaultOne/deleteDeviceFaultOne', // 鍒犻櫎 璁惧鏁呴殰
+ deviceMetricRecordPage: '/deviceMetricRecord/deviceMetricRecordPage', // 璁惧鏍″噯 鍒嗛〉鏌ヨ
+ addOrUpdateDeviceMetricRecord: '/deviceMetricRecord/addOrUpdateDeviceMetricRecord', // 璁惧鏍″噯 鏂板 鏇存柊
+ deleteDeviceMetricRecord: '/deviceMetricRecord/deleteDeviceMetricRecord', // 璁惧鏍″噯 鍒犻櫎
+ showDeviceMetricsCopy: '/deviceMetricRecord/showDeviceMetricsCopy', // 璁惧鏍″噯 鏌ヨ鏍″噯鏉＄洰
+ selectDeviceMetric: '/deviceMetrics/selectDeviceMetric', // 璁惧鏍″噯 璁惧缁存姢琛� 鏌ヨ
+ saveOrUpdateDeviceMetric: '/deviceMetrics/saveOrUpdateDeviceMetric', // 璁惧鏍″噯 鏂板 鏇存柊
+ deleteDeviceMetrics: '/deviceMetrics/deleteDeviceMetrics', // 璁惧鏍″噯 鍒犻櫎
+ rewardPunishmentExport: '/personRewardPunishmentRecord/rewardPunishmentExport', // 濂栨儵璁板綍 瀵煎嚭
+ exportRewardAndPunishmentRecords: '/deviceFaultOne/exportRewardAndPunishmentRecords', // 濂栨儵璁板綍瀵煎嚭
+ deviceStateExport: "/deviceState/deviceStateExport", // 璁惧鐘舵��
+ newHomeworkGuidebookAdded: "/instruction/newHomeworkGuidebookAdded", // 浣滀笟鎸囧涔︽柊澧�
+ pageByPageQueryOfHomeworkInstructions: "/instruction/pageByPageQueryOfHomeworkInstructions", // 浣滀笟鎸囧涔� 鏌ヨ
+ homeworkGuidebookEditor: "/instruction/homeworkGuidebookEditor", // 浣滀笟鎸囧涔� 缂栬緫鏌ヨ
+ deleteHomeworkGuidebook: "/instruction/deleteHomeworkGuidebook", // 浣滀笟鎸囧涔﹀彈鎺ф枃浠跺垹闄�
+ homeworkGuidebook: "/instruction/homeworkGuidebook", // 浣滀笟鎸囧涔� 鍒犻櫎
+ approvalOfHomeworkInstructionManual: "/instruction/approvalOfHomeworkInstructionManual", // 浣滀笟鎸囧涔� 瀹℃壒
+ deviceMetricRecordExport: '/deviceMetricRecord/deviceMetricRecordExport', // 璁惧鏍″噯 瀵煎嚭
+};
+
+// 娌熼�氳褰�
+const personCommunicationAbility = {
+ exportPersonCommunicationAbility:'/personCommunicationAbility/exportPersonCommunicationAbility',//瀵煎嚭
+}
+
+const procurementSuppliesContents = {
+ directoryListing: "/procurementSuppliesContents/directoryListing", // 閲囪喘鐗╄祫鐩綍鍒楄〃
+ selectById: "/procurementSuppliesContents/selectProcurementSuppliesContentById", // 閲囪喘鐗╄祫鐩綍璇︽儏
+ add: "/procurementSuppliesContents/addProcurementSuppliesContents", // 閲囪喘鐗╄祫鐩綍鏂板
+ update: "/procurementSuppliesContents/updateProcurementSuppliesContents", // 閲囪喘鐗╄祫鐩綍淇敼
+ deleteById: "/procurementSuppliesContents/deleteProcurementSuppliesContentById", // 閲囪喘鐗╄祫鐩綍鍒犻櫎
+ getUserList: "/procurementSuppliesContents/getUserList", // 閲囪喘鐗╄祫鐩綍鑾峰彇鐢ㄦ埛鍒楄〃
+ getNodeNames: "/procurementSuppliesContents/getNodeNames", // 閲囪喘鐗╄祫鐩綍鑾峰彇鑺傜偣鍚嶇О
+ selectSuppliersDirectoryContentsById:'/suppliersDirectoryContents/selectSuppliersDirectoryContentsById',//渚涘簲鍟嗙洰褰曡鎯�
+}
+
+const procurementSuppliesStore = {
+ storeList: '/procurementSuppliesStore/storeList', // 鑰楁潗鍏ュ簱鍒楄〃
+ addStore: '/procurementSuppliesStore/addStore', // 鑰楁潗鍏ュ簱鏂板
+ deleteStore: '/procurementSuppliesStore/deleteStore', // 鑰楁潗鍏ュ簱鍒犻櫎
+ updateStore: '/procurementSuppliesStore/updateStore', // 鑰楁潗鍏ュ簱淇敼
+ selectStoreById: '/procurementSuppliesStore/selectStoreById', // 鏍规嵁id鏌ヨ鑰楁潗鍏ュ簱
+ exportExcel: '/procurementSuppliesStore/exportExcel', // 鑰楁潗鍏ュ簱瀵煎嚭
+ updateStore: '/procurementSuppliesStore/updateStore', // 鑰楁潗鍏ュ簱淇敼
+}
--
Gitblit v1.9.3