From b7eedb41516a6ab02526e64177331a9669f4d3cb Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 15:54:23 +0800
Subject: [PATCH] 修改冲突
---
src/assets/api/controller.js | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 8fa13dc..5ed70de 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -72,6 +72,7 @@
feStandardSubstanceRecord,
personPostAuthorizationRecord,
deviceCheck,
+ personCommunicationAbility,
}
}
@@ -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',//瀵煎叆
}
@@ -866,7 +867,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 +1028,8 @@
approvalOfHomeworkInstructionManual: "/instruction/approvalOfHomeworkInstructionManual", // 浣滀笟鎸囧涔� 瀹℃壒
deviceMetricRecordExport: '/deviceMetricRecord/deviceMetricRecordExport', // 璁惧鏍″噯 瀵煎嚭
};
+
+// 娌熼�氳褰�
+const personCommunicationAbility = {
+ exportPersonCommunicationAbility:'/personCommunicationAbility/exportPersonCommunicationAbility',//瀵煎嚭
+}
--
Gitblit v1.9.3