diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs index da417d4..88dec18 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs @@ -34,12 +34,15 @@ //设置当前灵敏度 GPIB_TCPIP_OPERATIO.setVOLTage(gPIBService, currentVolTage, counterCheckParam.SoOutDelay); + string currentValue_E = ""; string currentValue = ""; //主动读取检测数据LAN if (type == "freq") - currentValue = GPIB_TCPIP_OPERATIO.getFreq(tcpService);//Hz + currentValue_E = GPIB_TCPIP_OPERATIO.getFreq(tcpService);//Hz else if (type == "period") - currentValue = GPIB_TCPIP_OPERATIO.getPeriod(tcpService);//s + currentValue_E = GPIB_TCPIP_OPERATIO.getPeriod(tcpService);//s + + currentValue = UnitConvertHelper.convertDt(currentValue_E); //检测数据是否在容差范围内 bool errorCheckResult=satisfyCheck(counterCheckParam, sensitivityContentParam,currentValue,type); //返回满足容差的数据 diff --git a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs index da417d4..88dec18 100644 --- a/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs +++ b/RbFreqStandMeasure/R_DevService/Service/Impl/SensitivityServiceImpl.cs @@ -34,12 +34,15 @@ //设置当前灵敏度 GPIB_TCPIP_OPERATIO.setVOLTage(gPIBService, currentVolTage, counterCheckParam.SoOutDelay); + string currentValue_E = ""; string currentValue = ""; //主动读取检测数据LAN if (type == "freq") - currentValue = GPIB_TCPIP_OPERATIO.getFreq(tcpService);//Hz + currentValue_E = GPIB_TCPIP_OPERATIO.getFreq(tcpService);//Hz else if (type == "period") - currentValue = GPIB_TCPIP_OPERATIO.getPeriod(tcpService);//s + currentValue_E = GPIB_TCPIP_OPERATIO.getPeriod(tcpService);//s + + currentValue = UnitConvertHelper.convertDt(currentValue_E); //检测数据是否在容差范围内 bool errorCheckResult=satisfyCheck(counterCheckParam, sensitivityContentParam,currentValue,type); //返回满足容差的数据 diff --git a/RbFreqStandMeasure/tools/UnitConvertHelper.cs b/RbFreqStandMeasure/tools/UnitConvertHelper.cs index d0c2b6b..0d6f620 100644 --- a/RbFreqStandMeasure/tools/UnitConvertHelper.cs +++ b/RbFreqStandMeasure/tools/UnitConvertHelper.cs @@ -52,6 +52,24 @@ } } + public static string convertDt(string eData) + { + double result; + if (eData.ToUpper().Contains("E")) + { + double b = double.Parse(eData.ToUpper().Split('E')[0].ToString());//整数部分 +                double c = double.Parse(eData.ToUpper().Split('E')[1].ToString());//指数部分 +                result = b * Math.Pow(10, c); + } + else + { + result = double.Parse(eData); + } + + return result.ToString() + } + + /*int convertV(string currentVOLTage) {