From 1a080e99a3d5acd4fddb0ff658c369e2a33e41a9 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 08 十一月 2024 14:06:10 +0800
Subject: [PATCH] loading
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs | 18 ++++++++++++------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 19 +++++++++++++------
DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category1/category.cs | 6 ++++--
DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category2/category.cs | 6 ++++--
4 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 7d7ddd1..3d7cfae 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -334,8 +334,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ getPageList(1, UtilityHelper.GetPageSize());
}
/// <summary>
/// 淇敼浜嬩欢
@@ -455,7 +457,7 @@
}
_loading.Stop();
}
- private void getModel(string strGuid, bool isEdit, int tabIdx)
+ private async void getModel(string strGuid, bool isEdit, int tabIdx)
{
if (string.IsNullOrEmpty(strGuid))
{
@@ -463,13 +465,14 @@
return;
}
UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
+ UcLoading _loading = new UcLoading();
var _obj = new
{
guid = strGuid,//涓诲缓
};
try
{
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+ string strJson = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
@@ -505,6 +508,8 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
+
+ _loading.Stop();
}
@@ -560,8 +565,9 @@
/// 鏍规嵁妫�楠岄」鐩鍙栨娊鏍风粨鏋�
/// </summary>
/// <param name="guid5"></param>
- private void getList12(string guid5)
+ private async void getList12(string guid5)
{
+ UcLoading _loading = new UcLoading();
var _obj = new
{
parentGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
@@ -569,7 +575,7 @@
};
try
{
- var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
+ var strReturn = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
var dd = UtilityHelper.ReturnToList(strReturn);
var dt = dd.rtnData;
gcMx2.BindingContext = new BindingContext();
@@ -580,6 +586,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
+ _loading.Stop();
}
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
index 697842b..1dc64ea 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -187,8 +187,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ getPageList(1, UtilityHelper.GetPageSize());
}
/// <summary>
@@ -234,7 +236,7 @@
}
_loading.Stop();
}
- private void getModel(string strGuid, bool isEdit, int tabIdx)
+ private async void getModel(string strGuid, bool isEdit, int tabIdx)
{
if (string.IsNullOrEmpty(strGuid))
{
@@ -242,13 +244,14 @@
return;
}
UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
+ UcLoading _loading = new UcLoading();
var _obj = new
{
guid = strGuid,//涓诲缓
};
try
{
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+ string strJson = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
@@ -284,6 +287,7 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
+ _loading.Stop();
}
/// <summary>
/// 閫夐」鍗″垏鎹�
@@ -337,8 +341,9 @@
/// 鏍规嵁妫�楠岄」鐩鍙栨娊鏍风粨鏋�
/// </summary>
/// <param name="guid5"></param>
- private void getList12(string guid5)
+ private async void getList12(string guid5)
{
+ UcLoading _loading = new UcLoading();
var _obj = new
{
parentGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
@@ -346,7 +351,7 @@
};
try
{
- var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
+ var strReturn = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
var dd = UtilityHelper.ReturnToList(strReturn);
var dt = dd.rtnData;
gcMx2.BindingContext = new BindingContext();
@@ -357,6 +362,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
+ _loading.Stop();
}
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
diff --git a/DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category1/category.cs b/DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category1/category.cs
index b868177..308680a 100644
--- a/DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category1/category.cs
+++ b/DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category1/category.cs
@@ -137,8 +137,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ getPageList(1, UtilityHelper.GetPageSize());
}
/// <summary>
/// 淇敼浜嬩欢
diff --git a/DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category2/category.cs b/DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category2/category.cs
index 7b6b561..3b884d3 100644
--- a/DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category2/category.cs
+++ b/DevApp/Gs.DevApp/bin/Debug/templeEasyCode/category2/category.cs
@@ -140,8 +140,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ getPageList(1, UtilityHelper.GetPageSize());
}
/// <summary>
/// 淇敼浜嬩欢
--
Gitblit v1.9.3