From e72209e7deabcea4545e374e2b9335566650aa74 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 18 九月 2025 16:18:53 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Program.cs | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index e41d69f..e0e4483 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -1,11 +1,14 @@
锘縰sing CefSharp;
using CefSharp.WinForms;
using Gs.DevApp.DevFrm;
+using Gs.DevApp.DevFrm.QC;
+using Gs.DevApp.DevFrm.Work;
+using Gs.DevApp.Properties;
+using Gs.DevApp.ToolBox;
using System;
using System.Diagnostics;
using System.IO;
using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.ExplorerBar;
namespace Gs.DevApp
{
@@ -41,11 +44,6 @@
{
//Application.Run(new XtraForm1());
//return;
- //barMenu.ItemClick += (s, e) =>
- //{
- // Gs.DevApp.DevFrm.User.SysMenu frm = new SysMenu();
- // frm.ShowDialog();
- //};
CefSettings settings = new CefSettings();
settings.Locale = "zh-CN";
Cef.Initialize(settings);
@@ -54,7 +52,11 @@
{
fmLogin.ShowDialog();
if (fmLogin.DialogResult == DialogResult.OK)
+ {
+ //Application.Run(new DevFrm.User.SysMenu());
+ //return;
Application.Run(new FrmMain());
+ }
}
else
{
--
Gitblit v1.9.3