From b0cebba8ea5393c5de74f4b09078f7a4d3d3e8cf Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 13 十二月 2024 10:38:09 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 111 ++++++++-----------------------------------------------
1 files changed, 16 insertions(+), 95 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 262a31e..5b452bf 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -26,7 +26,6 @@
btnLoad.ItemClick += BtnLoad_ItemClick;
btnSave.ItemClick += BtnSave_ItemClick;
btnEsc.ItemClick += BtnEsc_ItemClick;
- btnRole.ItemClick += BtnRole_ItemClick;
btnQuery.ItemClick += BtnQuery_ItemClick;
btnReport.ItemClick += BtnReport_ItemClick;
btnDesign.ItemClick += BtnDesign_ItemClick;
@@ -47,11 +46,8 @@
btnFjieAn.ItemClick += BtnFjieAn_ItemClick;
btnTzbl.ItemClick += BtnTzbl_ItemClick;
btnKg.ItemClick += BtnKg_ItemClick;
- btnDkg.ItemClick += BtnDkg_ItemClick;
- btnZanTing.ItemClick += BtnZanTing_ItemClick;
- btnBdll.ItemClick += BtnBdll_ItemClick;
+ btnZhongTai.ItemClick += BtnbZhongTai_ItemClick;
btnWg.ItemClick += BtnWg_ItemClick;
- btnFtzbl.ItemClick += BtnFtzbl_ItemClick;
btnHelp.ItemClick += BtnHelp_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
@@ -178,52 +174,19 @@
private void BtnFchk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnFChkClick != null)
+ {
btnFChkClick(this, e);
- else
- return;
-
- if (string.IsNullOrEmpty(guidKey))
- {
- // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
}
- else
- {
- if (string.IsNullOrEmpty(chkParameter))
- {
- MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
- return;
- }
-
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍙嶅鏍稿悧锛�"))
- return;
- _ckService(0.ToString());
- }
+ return;
}
private void BtnChk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnChkClick != null)
+ {
btnChkClick(this, e);
- else
- return;
-
- if (string.IsNullOrEmpty(chkParameter))
- {
- //MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
- return;
}
- else
- {
- if (string.IsNullOrEmpty(guidKey))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾瀹℃牳鍚楋紵"))
- return;
- _ckService(1.ToString());
- }
+ return;
}
private void BtnFjieAn_ItemClick(object sender, ItemClickEventArgs e)
{
@@ -313,7 +276,7 @@
//_ckService(1.ToString());
}
- private async void BtnIn_ItemClick(object sender, ItemClickEventArgs e)
+ private async void BtnIn_ItemClick(object sender, ItemClickEventArgs e)
{
if (string.IsNullOrEmpty(xlsInService))
{
@@ -453,11 +416,7 @@
{
if (btnQueryClick != null) btnQueryClick(this, e);
}
- private void BtnFtzbl_ItemClick(object sender, ItemClickEventArgs e)
- {
- if (btnFtzblClick != null) btnFtzblClick(this, e);
- }
-
+
private void BtnEsc_ItemClick(object sender, ItemClickEventArgs e)
{
if (MsgHelper.AskQuestion("纭畾瑕佽鍙栨秷鍚�?"))
@@ -467,7 +426,6 @@
lst.Add(btnEdit.Name);
lst.Add(btnLoad.Name);
lst.Add(btnDel.Name);
- lst.Add(btnRole.Name);
lst.Add(btnQuery.Name);
lst.Add(btnReport.Name);
lst.Add(btnDesign.Name);
@@ -555,19 +513,11 @@
if (btnWgClick != null) btnWgClick(this, e);
}
- private void BtnBdll_ItemClick(object sender, ItemClickEventArgs e)
- {
- if (btnBdllClick != null) btnBdllClick(this, e);
- }
+
- private void BtnZanTing_ItemClick(object sender, ItemClickEventArgs e)
+ private void BtnbZhongTai_ItemClick(object sender, ItemClickEventArgs e)
{
- if (btnZanTingClick != null) btnZanTingClick(this, e);
- }
-
- private void BtnDkg_ItemClick(object sender, ItemClickEventArgs e)
- {
- if (btnBtnDkgClick != null) btnBtnDkgClick(this, e);
+ if (btnZhongTaiClick != null) btnZhongTaiClick(this, e);
}
private void BtnKg_ItemClick(object sender, ItemClickEventArgs e)
@@ -782,23 +732,7 @@
}
return false;
}
-
- private void _ckService(string _ckValue)
- {
- var _obj = new
- {
- guid = guidKey,
- parameter = chkParameter,
- ckValue = _ckValue
- };
- var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData["outMsg"].ToString());
- if (_rtn.rtnCode > 0)
- {
- }
- }
+
#region 鍏叡浜嬩欢
@@ -933,31 +867,18 @@
/// 閫氱煡澶囨枡
/// </summary>
public event EventHandler btnTzblClick;
-
+
/// <summary>
- /// 寰呭紑宸�
+ /// 鐘舵��
/// </summary>
- public event EventHandler btnBtnDkgClick;
-
- /// <summary>
- /// 宸ュ崟鏆傚仠
- /// </summary>
- public event EventHandler btnZanTingClick;
-
- /// <summary>
- /// 澶囧崟棰嗘枡
- /// </summary>
- public event EventHandler btnBdllClick;
-
+ public event EventHandler btnZhongTaiClick;
+
/// <summary>
/// 鎵嬪姩瀹屽伐
/// </summary>
public event EventHandler btnWgClick;
- /// <summary>
- /// 鍙嶉�氱煡澶囨枡
- /// </summary>
- public event EventHandler btnFtzblClick;
+
#endregion
#region 鍏叡灞炴��
--
Gitblit v1.9.3