11

XdCxRhDW.App/UserControl/CtrlHome.cs

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