From 03094b048acfbb444bb298273d698189d18a1a0f Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期四, 23 十一月 2023 17:40:55 +0800
Subject: [PATCH] 1. 修改了风险模型的统计信息的函数

---
 src/utils/risk_estimate_common_function/index.js |   30 +++++++++++++++++++++++-------
 1 files changed, 23 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..9f6aaa3 100644
--- a/src/utils/risk_estimate_common_function/index.js
+++ b/src/utils/risk_estimate_common_function/index.js
@@ -44,9 +44,13 @@
       }
       // 璁$畻骞冲潎鍊硷紝鍦ㄧ嚎鐜囷紝鏈夋晥鐜囷紝瓒呮爣鐜�
       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.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 +113,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 +141,27 @@
       default:
         return 'error'
     }
-
-    exceptionTypeAggregation = (exception.length / 8).toFixed(2)
+    
+    // 鏁版嵁瓒呬綆銆侀暱鏃堕棿鏃犳尝鍔ㄧ瓑涓ょ被寮傚父鏆備笉绾冲叆鍒嗘瀽
+    exceptionTypeAggregation = (exception.length / 6).toFixed(2)
 
     let obj = {}
     obj['exceptionRecurrence'] = exceptionTyprRecurRate
     obj['exceptionTypeAggregation'] = exceptionTypeAggregation
 
+    // 淇濆瓨璇ユ椂娈靛嚭鐜扮殑寮傚父
+    obj['exception'] = exception
+
+    // 涓夌被寮傚父鍑虹幇鐨勬鏁�
+    obj['mutationCount'] = mutationCount
+    obj['exceedingNearCount'] = exceedingNearCount
+    obj['exceedingCriticalDegree'] = exceedingCriticalDegree
+
+
     return obj
   },
+
+
   // 鍙傛暟锛氬璞℃暟缁�(璇ュ璞′腑鐨勫睘鎬т笉鑳芥槸寮曠敤绫诲瀷锛屽惁鍒欐嫹璐濈殑鍊艰繕鏄細鐩镐簰褰卞搷)
   // 鍔熻兘锛氭嫹璐濊瀵硅薄鏁扮粍銆�
   shallowCopyList(val) {

--
Gitblit v1.9.3