diff --git a/src/api/points/rule.js b/src/api/points/rule.js index 8529cdf..ad59b17 100644 --- a/src/api/points/rule.js +++ b/src/api/points/rule.js @@ -28,6 +28,16 @@ export function getPointsRule(id) { return request({ url: '/business/points/rule/info', method: 'get', params: { id }}) } +// 根据隐患等级编码(general/major/critical)查询该等级下的根规则与子档位列表 +export function getRulesByLevel(hazardLevel) { + return request({ url: '/business/points/rule/rulesByLevel', method: 'get', params: { hazardLevel } }) +} + +// 积分试算:按厂区 + 隐患等级编码 + 档位模拟计算积分,返回 calculatedPoints +export function trialCalculatePoints(params) { + return request({ url: '/business/points/rule/trialCalculate', method: 'get', params }) +} + export function addPointsRule(data) { return request({ url: '/business/points/rule/add', method: 'post', data }) } diff --git a/src/utils/request.js b/src/utils/request.js index ccc957b..551a2f4 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,7 +17,7 @@ const service = axios.create({ // axios中请求配置有baseURL选项,表示请求URL公共部分 baseURL: MyConfig.BASE_API, // 超时 - timeout: 10000 + timeout: 80000 }) // request拦截器 diff --git a/src/views/hazard/audit/components/AuditActionForm.vue b/src/views/hazard/audit/components/AuditActionForm.vue index 4bbbf90..8bcda28 100644 --- a/src/views/hazard/audit/components/AuditActionForm.vue +++ b/src/views/hazard/audit/components/AuditActionForm.vue @@ -54,6 +54,17 @@ + + + + + +
+ 预计积分:{{ estimatedPoints > 0 ? '+' : '' }}{{ estimatedPoints }} + 计算中… +
+
+
@@ -177,7 +188,7 @@
-

确认先保存平台补录信息,再通过当前审批任务?积分、员工通知和平台同步均以后端处理结果为准。

+

确认先保存平台补录信息,再通过当前审批任务?积分、员工通知和平台同步均以后端处理结果为准。本次档位预计积分:{{ estimatedPoints > 0 ? '+' : '' }}{{ estimatedPoints }}。

取消 @@ -228,6 +239,7 @@