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 | 146 ++++++++++++++++++++----------------------------
1 files changed, 61 insertions(+), 85 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 8fa13dc..6372293 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -72,6 +72,9 @@
feStandardSubstanceRecord,
personPostAuthorizationRecord,
deviceCheck,
+ personCommunicationAbility,
+ procurementSuppliesContents,
+ procurementSuppliesStore,
}
}
@@ -181,31 +184,28 @@
}
const deviceScope = {
- selectUserList: '/deviceScope/selectUserList', //鑾峰彇鐢ㄦ埛鍒楄〃
- selectDeviceParameter: '/deviceScope/selectDeviceParameter', //鏌ヨ璁惧璇︽儏鍒楄〃
- addDeviceParameter: '/deviceScope/addDeviceParameter', //娣诲姞璁惧璇︽儏鍙傛暟
- delDeviceParameter: '/deviceScope/delDeviceParameter', //鍒犻櫎璁惧璇︽儏鍙傛暟
- upDeviceParameter: '/deviceScope/upDeviceParameter', //淇敼璁惧璇︽儏鍙傛暟
- selectDeviceByCategory: '/deviceScope/selectDeviceByCategory', //閫氳繃璁惧鍒嗙被鑾峰彇璁惧鍒楄〃
+ selectDeviceParameter: "/deviceScope/selectDeviceParameter", //鏌ヨ璁惧璇︽儏鍒楄〃
+ addDeviceParameter: "/deviceScope/addDeviceParameter", //娣诲姞璁惧璇︽儏鍙傛暟
+ delDeviceParameter: "/deviceScope/delDeviceParameter", //鍒犻櫎璁惧璇︽儏鍙傛暟
+ upDeviceParameter: "/deviceScope/upDeviceParameter", //淇敼璁惧璇︽儏鍙傛暟
+ selectDeviceByCategory: "/deviceScope/selectDeviceByCategory", //閫氳繃璁惧鍒嗙被鑾峰彇璁惧鍒楄〃
+ authorizedPerson: "/user/getDeviceManager", //鑾峰彇鎺堟潈浜�
+ selectEquipmentOverview: "/deviceScope/selectEquipmentOverview", //鑾峰彇璁惧鎬昏
+ uploadFile: "/deviceScope/uploadFile", //涓婁紶鍥剧墖
+ selectDevicePrincipal: "/user/getDeviceManager", //鑾峰彇璁惧璐熻矗浜�
+ selectDeviceByCode: "/deviceScope/selectDeviceByCode", //閫氳繃璁惧缂栧彿鑾峰彇璁惧鍒楄〃
+ getNumberCollect: "/deviceScope/getNumberCollect", //鏌ヨ鏁伴噰閰嶇疆
+ numberCollect: "/deviceScope/numberCollect", //缁存姢鏁伴噰閰嶇疆
+ saveDataAcquisitionConfiguration: "/deviceScope/saveDataAcquisitionConfiguration", // 缁存姢鏁伴噰閰嶇疆
+ queryDataAcquisitionConfiguration: "/deviceScope/queryDataAcquisitionConfiguration", // 鏌ヨ鏁伴噰閰嶇疆
+ deleteDataAcquisitionConfiguration: "/deviceScope/deleteDataAcquisitionConfiguration", // 鍒犻櫎鏁伴噰閰嶇疆
+ determineWhetherToCollectData: "/deviceScope/determineWhetherToCollectData", // 鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲�
+ dataCollection: "/deviceScope/dataCollection", // 鏁伴噰-鏁版嵁閲囬泦
+ treeDevice: "/deviceScope/treeDevice", // 璁惧鏍戝舰
+ temDataAcquisition: "/deviceScope/temDataAcquisition", // PK8000鏁伴噰
+ temDataAcquisition2: "/deviceScope/temDataAcquisition2", // PK8000鏁伴噰--澶氭潯
+ formulaCalculation: "/deviceScope/formulaCalculation", // 鏁伴噰-鍏紡璁＄畻
deviceScopeSearch: "/deviceScope/search", //閫氳繃璁惧鍒嗙被鑾峰彇璁惧鍒楄〃
- authorizedPerson: '/user/getDeviceManager', //鑾峰彇鎺堟潈浜�
- selectEquipmentOverview: '/deviceScope/selectEquipmentOverview', //鑾峰彇璁惧鎬昏
- uploadFile: '/deviceScope/uploadFile', //涓婁紶鍥剧墖
- selectDevicePrincipal: '/user/getDeviceManager', //鑾峰彇璁惧璐熻矗浜�
- selectDeviceByCode: '/deviceScope/selectDeviceByCode', //閫氳繃璁惧缂栧彿鑾峰彇璁惧鍒楄〃
- getNumberCollect: '/deviceScope/getNumberCollect', //鏌ヨ鏁伴噰閰嶇疆
- numberCollect: '/deviceScope/numberCollect', //缁存姢鏁伴噰閰嶇疆
- saveDataAcquisitionConfiguration: '/deviceScope/saveDataAcquisitionConfiguration', // 缁存姢鏁伴噰閰嶇疆
- queryDataAcquisitionConfiguration: '/deviceScope/queryDataAcquisitionConfiguration', // 鏌ヨ鏁伴噰閰嶇疆
- deleteDataAcquisitionConfiguration: '/deviceScope/deleteDataAcquisitionConfiguration', // 鍒犻櫎鏁伴噰閰嶇疆
- determineWhetherToCollectData: '/deviceScope/determineWhetherToCollectData', // 鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲�
- dataCollection: '/deviceScope/dataCollection', // 鏁伴噰-鏁版嵁閲囬泦
- treeDevice: '/deviceScope/treeDevice', // 璁惧鏍戝舰
- temDataAcquisition: '/deviceScope/temDataAcquisition', // PK8000鏁伴噰
- temDataAcquisition2: '/deviceScope/temDataAcquisition2', // PK8000鏁伴噰--澶氭潯
- formulaCalculation: '/deviceScope/formulaCalculation', // 鏁伴噰-鍏紡璁＄畻
- formulaCalculation2: '/deviceScope/export', //瀵煎嚭
- selectListBylargeCategory: '/deviceScope/largeCategory'
}
const insOrder = {
@@ -268,7 +268,8 @@
getInsOrderUserList: "/insOrderPlan/getInsOrderUserList", // 鏌ョ湅妫�楠屽巻鍙插垪琛�
preview: "/insOrderPlan/preview", // csv鏂囦欢棰勮
outInsOrderState: "/insOrderPlan/outInsOrderState", // 妫�楠屼换鍔℃壂鐮佸嚭搴�
- cancelSubmitPlan: "/insOrderPlan/cancelSubmitPlan", // 妫�楠屼换鍔℃彁浜ゅ悗鎾ら攢鎻愪氦
+ // insOrderPlan.cancelSubmitPlan
+ cancelSubmitPlan: "/insOrderPlan/cancelSubmitPlan", // 妫�楠屼换鍔℃挙閿�
}
const systemLog = {
@@ -527,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',//瀵煎叆
}
@@ -583,55 +584,7 @@
// 6.2 浜哄憳
const personnel = {
selectCNSAPersonTree: '/personBasicInfo/selectCNSAPersonTree', // 鏌ヨCNAS浜哄憳渚ц竟鏍�
- getAnnex: '/personBasicInfo/getAnnex', // 鑾峰彇闄勪欢
- basicInformationOfPersonnelSelectPage: 'personBasicInfo/basicInformationOfPersonnelSelectPage', // 鑾峰彇浜哄憳鍒楄〃
- getAnnexByUserId: '/personBasicInfo/getAnnexByUserId',
- addAnnex: '/personBasicInfo/addAnnex', // 娣诲姞闄勪欢
- deleteAnnex: '/personBasicInfo/deleteAnnex', // 鍒犻櫎闄勪欢
- updateAnnex: '/personBasicInfo/updateAnnex', // 鏇存柊闄勪欢
- getCNASFile: '/personBasicInfo/getCNASFile', // 鑾峰彇鍥剧墖
- getCNASInformation: '/personBasicInfo/getCNASInformation', // 鏌ヨCNAS浜哄憳淇℃伅
- updateCNASInformation: '/personBasicInfo/updateCNASInformation', // 鏇存柊CNAS浜哄憳淇℃伅
- getCNASPersonnelInfo: '/personBasicInfo/getCNASPersonnelInfo', // 浜哄憳鍩烘湰淇℃伅鏌ヨ
- saveCNASPersonnelInfo: '/personBasicInfo/saveCNASPersonnelInfo', // 浜哄憳鍩烘湰淇℃伅淇濆瓨
saveCNASFile: '/personBasicInfo/saveCNASFile', // 鍏叡鏂囦欢淇濆瓨鎺ュ彛
- deleteCNASFile: '/personBasicInfo/deleteCNASFile', // 鍒犻櫎鏂囦欢
- personTrainingSelect: '/personTraining/personTrainingSelect', // 鏌ヨ浜哄憳鍩硅
- personTrainingDelete: '/personTraining/personTrainingDelete', // 鍒犻櫎浜哄憳鍩硅淇℃伅
- approveAnnualPersonnelTraining: '/personTraining/approveAnnualPersonnelTraining', // 鎵瑰噯 骞村害浜哄憳鍩硅
- reviewAnnualPersonnelTraining: '/personTraining/reviewAnnualPersonnelTraining', // 瀹℃牳 骞村害浜哄憳鍩硅
- personTrainingImport: '/personTraining/personTrainingImport', // 瀵煎叆 浜哄憳鍩硅
- exportPersonTraining: "/personTraining/exportPersonTraining", // 瀵煎嚭/浜哄憳鍩硅
- queryTheAnnualPlanDetailsTable: '/personTraining/queryTheAnnualPlanDetailsTable', // 鏌ヨ鍩硅璁″垝骞村害璁″垝鏄庣粏琛�
- addOrUpdatePersonTrainingDetailed: '/personTraining/addOrUpdatePersonTrainingDetailed', // 鏂板鍩硅璁″垝骞村害璁″垝鏄庣粏琛�
- deleteAnnualPlanDetailTable: '/personTraining/deleteAnnualPlanDetailTable', // 鎵归噺鍒犻櫎 骞村害璁″垝鏄庣粏琛�
- trainingAndAssessmentRecordsPage: '/personTraining/trainingAndAssessmentRecordsPage', // 鍩硅涓庤�冩牳璁板綍 鏌ヨ
- deleteTrainingAndAssessmentRecords: '/personTraining/deleteTrainingAndAssessmentRecords', // 鍩硅涓庤�冩牳璁板綍 鎵归噺鍒犻櫎
- trainingAndAssessmentRecordsAdded: '/personTraining/trainingAndAssessmentRecordsAdded', // 鍩硅涓庤�冩牳璁板綍 鎻愪氦
- personJobResponsibilitiesSave: '/personJobResponsibilities/personJobResponsibilitiesSave', // 鏂板宀椾綅鑱岃矗
- personJobResponsibilitiesDelete: '/personJobResponsibilities/personJobResponsibilitiesDelete', // 鍒犻櫎宀椾綅鑱岃矗
- personJobResponsibilitiesUpdate: '/personJobResponsibilities/personJobResponsibilitiesUpdate', // 鏇存柊宀椾綅鑱岃矗
- personJobResponsibilitiesSelect: '/personJobResponsibilities/personJobResponsibilitiesSelect', // 鍒嗛〉鏌ヨ宀椾綅鑱岃矗
- personJobResponsibilitiesExport: '/personJobResponsibilities/personJobResponsibilitiesExport', // 瀵煎嚭宀椾綅鑱岃矗
- personTrackRecordSave: '/personTrackRecord/personTrackRecordSave', // 鏂板宸ヤ綔灞ュ巻
- personTrackRecordDelete: '/personTrackRecord/personTrackRecordDelete', // 鍒犻櫎宸ヤ綔灞ュ巻
- personTrackRecordUpdate: '/personTrackRecord/personTrackRecordUpdate', // 鏇存柊宸ヤ綔灞ュ巻
- personTrackRecordSelect: '/personTrackRecord/personTrackRecordSelect', // 鏌ヨ宸ヤ綔灞ュ巻
- personTrackRecordExport: '/personTrackRecord/personTrackRecordExport', // 瀵煎嚭宸ヤ綔灞ュ巻
- personTrainingRecordSelect: '/personTrainingRecord/personTrainingRecordSelect', // 鏌ヨ鍩硅璁板綍
- personTrainingRecordExport: '/personTrainingRecord/personTrainingRecordExport', // 宸ヤ綔鍩硅璁板綍
- personPersonnelCapacityPage: '/personPersonnelCapacity/personPersonnelCapacityPage', // 鏌ヨ浜哄憳鑳藉姏
- deletePersonPersonnelCapacity: '/personPersonnelCapacity/deletePersonPersonnelCapacity', // 鍒犻櫎浜哄憳鑳藉姏
- addOrUpdatePersonPersonnelCapacity: '/personPersonnelCapacity/addOrUpdatePersonPersonnelCapacity', // 鏂板缂栬緫浜哄憳鑳藉姏
- exportPersonnelCapacity: '/personPersonnelCapacity/exportPersonnelCapacity', // 瀵煎嚭浜哄憳鑳藉姏
- newPersonnelAddedToTrainingRecords: "/personTraining/newPersonnelAddedToTrainingRecords", // 鍩硅涓庤�冩牳 鏂板浜哄憳
- outOfFocusPreservation: "/personTraining/outOfFocusPreservation", // 鍩硅涓庤�冩牳 澶辩劍鏇存柊
- trainingSelectTrainingRecord: "/personTrainingRecord/trainingSelectTrainingRecord", // 鏌ヨ浜哄憳 鍩硅璁板綍
- queryPersonnelDetails: "/personTrainingRecord/queryPersonnelDetails", // 鏌ヨ浜哄憳鏄庣粏 鍩硅璁板綍
- claimOfTrainingAndAssessmentRecords: "/personTraining/claimOfTrainingAndAssessmentRecords", // 璁ら/鍙栨秷璁ら
- exportPersonTrainingRecord: "/personTraining/exportPersonTrainingRecord", // 瀵煎嚭浜哄憳鍩硅涓庤�冩牳璁板綍
- exportTrainingRecord: "/personTrainingRecord/exportTrainingRecord", // 瀵煎嚭鍩硅璁板綍
- confirmPersonnelCapability: "/personPersonnelCapacity/confirmPersonnelCapability", // 纭浜哄憳鑳藉姏
}
// 8.3 瀹㈡埛婊℃剰搴﹁皟鏌�
@@ -792,7 +745,6 @@
getVerifyMethodFileList:'/processMethodVerify/getVerifyMethodFileList', // 鍘熷璁板綍鍒楄〃
delVerifyMethodFileList:'/processMethodVerify/delVerifyMethodFileList', // 鍒犻櫎楠岃瘉鍘熷璁板綍鍒楄〃
delMethodVerify:'/processMethodVerify/delMethodVerify', // 鍒犻櫎鏍囧噯鏂规硶鏇存柊楠岃瘉
- exportMethodVerify:'/processMethodVerify/exportMethodVerify', // 瀵煎嚭鏍囧噯鏂规硶鏇存柊楠岃瘉
}
// 7.4妫�娴嬫垨鏍″噯鐗╁搧鐨勫缃�-鏍峰搧鎺ユ敹
@@ -850,9 +802,7 @@
ratifyQualityMonitor:'/qualityMonitor/ratifyQualityMonitor', // 鐩戞帶璁″垝鎵瑰噯
delQualitySupervise:'/qualityMonitor/delQualitySupervise', // 鐩戞帶璁″垝鎵瑰噯
importQualityMonitor:'/qualityMonitor/importQualityMonitor', // 瀵煎叆鐩戞帶璁″垝
- exportQualityMonitorDetail:'/qualityMonitor/exportQualityMonitorDetail',
- exportQualityMonitorRatify:'/qualityMonitor/exportQualityMonitorRatify', // 璐ㄩ噺鐩戞帶瀹炴柦璁″垝瀵煎嚭
- exportQualityMonitorEvaluate:'/qualityMonitor/exportQualityMonitorEvaluate', // 璐ㄩ噺鐩戞帶璇勪环瀵煎嚭
+ exportQualityMonitorDetail:'/qualityMonitor/exportQualityMonitorDetail', // 瀵煎嚭鐩戞帶璁″垝
}
// 8.5 搴斿椋庨櫓鍜屾満閬囩殑鎺柦
@@ -866,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", // 鍗遍櫓鍥犵礌杈ㄨ瘑涓庨闄╄瘎浠风粨鏋滀竴瑙� 瀵煎嚭
@@ -1027,3 +977,29 @@
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