From 9f39f90c35e51907485b38652c02efdd99a8925d Mon Sep 17 00:00:00 2001 From: aleksey_k Date: Sun, 26 Nov 2023 10:28:06 +0900 Subject: [PATCH] add var ind --- rolling bearing/defects/rb-def-inring.js | 5 +++-- rolling bearing/defects/rb-def-shaft.js | 7 ++++--- rolling bearing/rolling bearing.js | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/rolling bearing/defects/rb-def-inring.js b/rolling bearing/defects/rb-def-inring.js index 273409e..a22de96 100644 --- a/rolling bearing/defects/rb-def-inring.js +++ b/rolling bearing/defects/rb-def-inring.js @@ -11,7 +11,7 @@ export function vk() { //биение вала if ( - spen.harms_sets[1].get_count(0, 1) >= 1 + spen.harms_sets[indx].get_count(0, 1) >= 1 ) { Defect = true; for (let i = 0; i <= 2; i++) { @@ -23,4 +23,5 @@ export function vk() { gtl.log.info("Раковины на внутреннем кольце", "Признаков дефекта не обнаружено"); return Defect; -} +}; +indx = idnx + 1; diff --git a/rolling bearing/defects/rb-def-shaft.js b/rolling bearing/defects/rb-def-shaft.js index e4c5569..ff61c99 100644 --- a/rolling bearing/defects/rb-def-shaft.js +++ b/rolling bearing/defects/rb-def-shaft.js @@ -11,8 +11,8 @@ export function val() { //биение вала if ( - spen.harms_sets[0].get_count(0, 2) >= 1 && spen.harms_sets[0].get_count(0, 2) <= 10 && - ausp.harms_sets[0].get_count(0, 2) >= 0 && harms_sets[0].get_count(0, 2) <= 10 + spen.harms_sets[indx].get_count(0, 2) >= 1 && spen.harms_sets[0].get_count(0, 2) <= 10 && + ausp.harms_sets[indx].get_count(0, 2) >= 0 && harms_sets[0].get_count(0, 2) <= 10 ) { Defect = true; for (let i = 0; i <= 9; i++) { @@ -29,4 +29,5 @@ export function val() { gtl.log.info("Биение вала", "Признаков дефекта не обнаружено"); return Defect; -} +}; +indx = indx + 1; diff --git a/rolling bearing/rolling bearing.js b/rolling bearing/rolling bearing.js index 7944da9..4c1faf4 100644 --- a/rolling bearing/rolling bearing.js +++ b/rolling bearing/rolling bearing.js @@ -236,6 +236,7 @@ function diagnose() { gtl.log.info("СКЗ(V) 10-1000 Гц", rms_v10.value); let res = {}; + var indx = 0; res["Биение вала"] = val.val(); res["Раковины на внутреннем кольце"] = vk.vk();