Merge branch 'Dev-Wxr' into wjc

wjc

2023-04-11 e74f8bfbe6c52f220deef5fc99a53c3a7872808d

 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs

@@ -713,7 +713,7 @@
            sensorSPK = showList[0].spk;
            foreach (var s in showList)
            {
                assembleValues += Convert.ToDouble(s.GetAttrState("value"));
                assembleValues += Convert.ToDouble(s.GetAttrState("value").Replace(",", "."));
            }


@@ -1011,7 +1011,7 @@
            assembleValues = 0;
            foreach (var s in sensorList)
            {
                assembleValues += Convert.ToDouble(s.GetAttrState("value"));
                assembleValues += Convert.ToDouble(s.GetAttrState("value").Replace(",", "."));
            }
        }