Merge branch 'master' of http://139.155.15.221:3000/zoulei/XdCxRhDW

XdCxRhDW.App/EditForms/SigEditor.cs

@@ -43,8 +43,8 @@ namespace XdCxRhDW.App.EditForms
             txtSigType.AddEnum<EnumSigCheckType>();
             if (this.Text == "编辑信号" && info != null)
             {
-                this.txtFreqUp.EditValue = info.FreqUp;
-                this.txtFreqDown.EditValue = info.FreqDown;
+                this.txtFreqUp.EditValue = info.FreqUp / 1e6;
+                this.txtFreqDown.EditValue = info.FreqDown / 1e6;
                 this.txtSnr.EditValue = info.Snr;
                 var arr = Enum.GetValues(typeof(EnumSigCheckType));
                 foreach (EnumSigCheckType item in arr)
@@ -64,12 +64,12 @@ namespace XdCxRhDW.App.EditForms
             try
             {
                 dxErrorProvider.ClearErrors();
-                if (!double.TryParse(txtFreqUp.Text, out double freqUp))
+                if (!decimal.TryParse(txtFreqUp.Text, out decimal freqUp))
                 {
                     dxErrorProvider.SetError(txtFreqUp, "上行频点格式错误");
                     return;
                 }
-                if (!double.TryParse(txtFreqDown.Text, out double freqDown))
+                if (!decimal.TryParse(txtFreqDown.Text, out decimal freqDown))
                 {
                     dxErrorProvider.SetError(txtFreqUp, "下行频点格式错误");
                     return;
@@ -84,8 +84,8 @@ namespace XdCxRhDW.App.EditForms
                     dxErrorProvider.SetError(txtFreqUp, "门限格式错误");
                     return;
                 }
-                info.FreqUp = freqUp;
-                info.FreqDown = freqDown;
+                info.FreqUp = (long)(freqUp * 1000000);
+                info.FreqDown = (long)(freqDown * 1000000);
                 info.Snr = Convert.ToDouble(txtSnr.EditValue);
                 var res = txtSigType.Items.Where(p => p.CheckState == CheckState.Checked).Select(t => (EnumSigCheckType)t.Value).ToList();
                 EnumSigCheckType sigType = res.First();

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -173,7 +173,7 @@ namespace XdCxRhDW.App.UserControl
                 var sigs = await db.SigInfos.ToListAsync();
                 foreach (var item in sigs)
                 {
-                    this.txtFrequpMHz.Properties.Items.Add(new ImageComboBoxItem(item.FreqUp.ToString("f3"), item.FreqUp));
+                    this.txtFrequpMHz.Properties.Items.Add(new ImageComboBoxItem((item.FreqUp / 1e6).ToString("f3"), item.FreqUp));
                 }
                    
             }
@@ -739,8 +739,7 @@ namespace XdCxRhDW.App.UserControl
                 {
                     var dto = new PosRequestByTimeRangeDto()
                     {
-                        TarFrequpHz = (long?)(double?)txtFrequpMHz.EditValue,
-                        //TarFrequpHz = txtFrequpMHz.EditValue==nu,
+                        TarFrequpHz = (long?)txtFrequpMHz.EditValue,
                         BeginTime = txtStartTime.DateTime,
                         EndTime = txtEndTime.DateTime,
                         TaskInfoID = tsk.ID,
@@ -772,7 +771,7 @@ namespace XdCxRhDW.App.UserControl
                     };
                     if (txtFrequpMHz.EditValue != null)
                     {
-                        dto.TarFrequpHz = Convert.ToInt64(Convert.ToDouble(txtFrequpMHz.EditValue)*1e6);
+                        dto.TarFrequpHz = Convert.ToInt64(txtFrequpMHz.EditValue);
                     }
                     var res = await HttpHelper.PostRequestAsync<List<ModelPosRes>>(baseUrl + "Pos/GetPosResByLastHoursObsolete", dto, token: ct);
                     if (res.code == 200)

XdCxRhDW.Entity/SigInfo.cs

@@ -12,11 +12,17 @@ namespace XdCxRhDW.Entity
     [Table("SigInfo")]
     public class SigInfo : BaseEntity
     {
+        [Display(Name = "上行频点(Hz)",AutoGenerateField =false)]
+        public long FreqUp { get; set; }
+
         [Display(Name = "上行频点(MHz)")]
-        public double FreqUp { get; set; }
+        public double FreqUpDis => FreqUp / 1e6;
+
+        [Display(Name = "下行频点(Hz)", AutoGenerateField = false)]
+        public long FreqDown { get; set; }
 
         [Display(Name = "下行频点(MHz)")]
-        public double FreqDown { get; set; }
+        public double FreqDownDis => FreqDown / 1e6;
 
         [Display(Name = "信号类型")]
         public EnumSigCheckType SigType { get; set; }