From dd5fbe2e6cacffa0ff67f0f68c262d14ddfce3cc Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 24 十一月 2023 15:21:56 +0800
Subject: [PATCH] 1.修复指标排名界面的排序换页后重置的问题
---
src/utils/risk_estimate_common_function/index.js | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/utils/risk_estimate_common_function/index.js b/src/utils/risk_estimate_common_function/index.js
index 214c774..74e6ee3 100644
--- a/src/utils/risk_estimate_common_function/index.js
+++ b/src/utils/risk_estimate_common_function/index.js
@@ -44,9 +44,10 @@
}
// 璁＄畻骞冲潎鍊硷紝鍦ㄧ嚎鐜囷紝鏈夋晥鐜囷紝瓒呮爣鐜�
sumAvg = sumAvg + item.dayAvg
- sumOnline = sumOnline + Number(item.dayOnline.slice(0, -1))
- sumValid = sumValid + Number(item.dayValid.slice(0, -1))
- sumExceeding = sumExceeding + Number(item.dayExceeding.slice(0, -1))
+
+ sumOnline = sumOnline + Number(item.dayOnline)
+ sumValid = sumValid + Number(item.dayValid)
+ sumExceeding = sumExceeding + Number(item.dayExceeding)
})
// 璁＄畻鍧囧��
avg = sumAvg / dayDiff
@@ -109,8 +110,8 @@
if (exception.length == 0) {
exception.push(item.exceptionType)
}
- // 淇濆瓨鏂扮殑寮傚父绫诲瀷
- else if (exception.indexOf(item.exceptionType) == -1) {
+ // 淇濆瓨鏂扮殑寮傚父绫诲瀷 鏁版嵁瓒呬綆銆侀暱鏃堕棿鏃犳尝鍔ㄧ瓑涓ょ被寮傚父鏆備笉绾冲叆鍒嗘瀽
+ else if ( item.exceptionType!='1' && item.exceptionType!='3' && exception.indexOf(item.exceptionType) == -1) {
exception.push(item.exceptionType)
}
})
@@ -137,15 +138,33 @@
default:
return 'error'
}
-
- exceptionTypeAggregation = (exception.length / 8).toFixed(2)
+
+ // 鏁版嵁瓒呬綆銆侀暱鏃堕棿鏃犳尝鍔ㄧ瓑涓ょ被寮傚父鏆備笉绾冲叆鍒嗘瀽
+ exceptionTypeAggregation = (exception.length / 6).toFixed(2)
let obj = {}
obj['exceptionRecurrence'] = exceptionTyprRecurRate
obj['exceptionTypeAggregation'] = exceptionTypeAggregation
+
+ if(exception.length>0){
+ // 淇濆瓨璇ユ椂娈靛嚭鐜扮殑寮傚父
+ obj['exception'] = exception.length
+ }else{
+ obj['exception'] = 0
+ }
+
+
+ // 涓夌被寮傚父鍑虹幇鐨勬鏁�
+ obj['mutationCount'] = mutationCount
+ obj['exceedingNearCount'] = exceedingNearCount
+ obj['exceedingCriticalDegree'] = exceedingCriticalDegree
+
+
return obj
},
+
+
// 鍙傛暟锛氬璞℃暟缁�(璇ュ璞′腑鐨勫睘鎬т笉鑳芥槸寮曠敤绫诲瀷锛屽惁鍒欐嫹璐濈殑鍊艰繕鏄細鐩镐簰褰卞搷)
// 鍔熻兘锛氭嫹璐濊瀵硅薄鏁扮粍銆�
shallowCopyList(val) {
--
Gitblit v1.9.3