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 | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/src/utils/risk_estimate_common_function/index.js b/src/utils/risk_estimate_common_function/index.js
index a6430d5..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) {
@@ -250,18 +269,19 @@
obj.region = '閲戝北鍖�'
obj.monitorType = '鎵皹'
obj.siteName = res.name
+ obj.mnCode = res.mnCode
obj.beginTime = beginTime
obj.endTime = endTime
obj.riskValue = weight
if (weight >= 0.6) {
obj.riskGrage = '楂橀闄�'
- obj.riskAdvice = '寤鸿瀵硅绔欑偣杩涜绾夸笅鎵ф硶妫�鏌ワ紝涓撻」鏁版嵁瀵规瘮'
+ obj.riskAdvice = '1.鑻ヤ笉娑夊強瓒呮爣鎴栧湪绾跨巼銆佹湁鏁堢巼寮傚父锛屽父鎬佹暟鎹鏍稿嵆鍙紱\n2.鑻ユ秹鍙婅秴鏍囨垨鍦ㄧ嚎鐜囥�佹湁鏁堢巼绛夊紓甯革紝寤鸿閫氳繃瀹堟硶鏈嶅姟灏忕▼搴忋�佺洃娴嬬洃绠″井淇＄兢绛夌嚎涓婃柟寮忔彁绀虹珯鐐规墍灞炲崟浣嶏紝鍙婃椂寮�灞曡嚜鏌ヨ嚜绾狅紱'
} else if (weight < 0.6 && weight >= 0.2) {
obj.riskGrage = '涓闄�'
- obj.riskAdvice = '寤鸿寮�灞曞父鎬佽拷韪垎鏋�'
+ obj.riskAdvice = '1.寤鸿閫氳繃瀹堟硶鏈嶅姟灏忕▼搴忋�佺洃娴嬬洃绠″井淇＄兢绛夌嚎涓婃柟寮忔彁绀虹珯鐐规墍灞炲崟浣嶏紝鑱氱劍褰撳墠瀛樺湪鐨勯棶棰樻垨闅愭偅锛屽強鏃跺紑灞曡嚜鏌ヨ嚜绾狅紱\n2.鑻ュ悓鏃跺瓨鍦ㄥ湪绾跨巼鎴栨湁鏁堢巼鏈堝害涓嶈揪鏍囷紝寤鸿鐢佃瘽閫氱煡璇ョ珯鐐规墍灞炲崟浣嶈繘琛屽簲鎬ョ淮鎶わ紝骞惰繘琛屼笓椤瑰鏍革紱'
} else {
obj.riskGrage = '浣庨闄�'
- obj.riskAdvice = '寤鸿寮曞浼佷笟闀挎�佷繚鎸�'
+ obj.riskAdvice = '1.寤鸿鍙婃椂鎻愰啋璇ョ珯鐐规墍灞炲崟浣嶈繘琛屽簲鎬ョ淮鎶わ紱\n2.鑻ュ悓鏃跺瓨鍦ㄨ秴鏍囥�佷复鐣岃秴鏍囥�侀噺绾х獊鍙樼瓑寮傚父鏃讹紝寤鸿灏嗚绔欑偣绉讳氦鐜鎵ф硶澶ч槦寮�灞曠幇鍦烘墽娉曟鏌ワ紱\n3.鑻ユ寔缁袱鏈堝強浠ヤ笂涓洪珮椋庨櫓锛屽缓璁皢璇ョ珯鐐圭撼鍏ュ勾搴︽娊娴嬫瘮瀵规竻鍗曪紱'
}
table.push(obj)
})
--
Gitblit v1.9.3