11

XdCxRhDW.App/Controllers/ResultController.cs

@@ -118,7 +118,7 @@ namespace XdCxRhDW.App.Controllers
                         }
                     }
                 }
-                var res = posList.Select(p => new TaskFreqResDto() { FreqUpHz = p }).ToList();
+                var res = posList.Select(p => new TaskFreqResDto() { FreqUpHz = p }).OrderBy(o => o.FreqUpHz).ToList();
                 return Success(res);
             }
             catch (Exception ex)

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -120,7 +120,7 @@ namespace XdCxRhDW.App.UserControl
                 return;
             }
             OnSysSetingsChanged(SysConfig.Config);
-           
+
             try
             {
                 List<TxInfo> txList = new List<TxInfo>();
@@ -212,18 +212,24 @@ namespace XdCxRhDW.App.UserControl
 
 
                 var txtFrequpItemFreq = new List<long>();
-                for (int i = 0; i < this.txtFrequpMHz.Properties.Items.Count; i++)
+                txtFrequpItemFreq.AddRange(txtFrequpMHz.Properties.Items.Select(t => Convert.ToInt64(t.Value)));
+                if (!txtFrequpItemFreq.Contains(posRes.FreqUpHz))
                 {
-                    txtFrequpItemFreq.Add(Convert.ToInt64(this.txtFrequpMHz.Properties.Items[i].Value));
+                    txtFrequpItemFreq.Add(posRes.FreqUpHz);
+
                 }
-                if (!txtFrequpItemFreq.Contains(posRes.FreqUpHz))
+                else
                 {
-                    this.Invoke(new Action(() =>
-                    {
-                        this.txtFrequpMHz.Properties.Items.Add(new ImageComboBoxItem((posRes.FreqUpHz / 1e6).ToString("f3"), posRes.FreqUpHz));
-                    }));
+                    return;
                 }
-                
+                txtFrequpItemFreq.Sort();
+                var itemsNew = txtFrequpItemFreq.Select(t => new ImageComboBoxItem((posRes.FreqUpHz / 1e6).ToString("f3"), posRes.FreqUpHz)).ToArray();
+                this.Invoke(new Action(() =>
+                {
+                    this.txtFrequpMHz.Properties.Items.Clear();
+                    this.txtFrequpMHz.Properties.Items.AddRange(itemsNew);
+                }));
+
             }
         }
         private async void GridView1_FocusedRowObjectChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowObjectChangedEventArgs e)
@@ -257,10 +263,10 @@ namespace XdCxRhDW.App.UserControl
             // }
             this.txtFrequpMHz.Properties.Items.Clear();
             this.txtFrequpMHz.Properties.Items.Add(new ImageComboBoxItem("全部", null));
-            var sigs =new List<TaskFreqResDto>();
+            var sigs = new List<TaskFreqResDto>();
             var dto = new TaskFreqQueryDto()
             {
-                TaskInfoID=tsk.ID
+                TaskInfoID = tsk.ID
             };
             var res = await HttpHelper.PostRequestAsync<List<TaskFreqResDto>>(SysConfig.GetUrl("Result/GetTaskFreqs"), dto);
             if (res.code == 200)

XdCxRhDW.Framework/HttpHelper.cs

@@ -33,7 +33,7 @@ public class HttpHelper
     /// <param name="timeoutSeconds"></param>
     /// <param name="token"></param>
     /// <returns></returns>
-    public static async Task<AjaxResult<T>> PostRequestAsync<T>(string url, object dto, int timeoutSeconds = 30, CancellationToken token = default)
+    public static async Task<AjaxResult<T>> PostRequestAsync<T>(string url, object dto, int timeoutSeconds = 60, CancellationToken token = default)
     {
         var content = new StringContent(JsonConvert.SerializeObject(dto), System.Text.Encoding.UTF8, "application/json");
         var handler = new HttpClientHandler() { UseCookies = false };
@@ -57,7 +57,7 @@ public class HttpHelper
     /// <param name="token"></param>
     /// <param name="timeoutSeconds"></param>
     /// <returns></returns>
-    public static async Task<AjaxResult> PostRequestAsync(string url, object dto, int timeoutSeconds = 30, CancellationToken token = default)
+    public static async Task<AjaxResult> PostRequestAsync(string url, object dto, int timeoutSeconds = 60, CancellationToken token = default)
     {
         var content = new StringContent(JsonConvert.SerializeObject(dto), System.Text.Encoding.UTF8, "application/json");
         var handler = new HttpClientHandler() { UseCookies = false };
@@ -73,7 +73,7 @@ public class HttpHelper
         return AjaxResult;
     }
 
-    public static async Task<AjaxResult<T>> GetRequestAsync<T>(string url, int timeoutSeconds = 30)
+    public static async Task<AjaxResult<T>> GetRequestAsync<T>(string url, int timeoutSeconds = 60)
     {
         var handler = new HttpClientHandler() { UseCookies = false };
         HttpClient client = new HttpClient(handler);