Merge branch 'master' of http://www.scserverddns.top:13000/sc/ProcessManageUI
This commit is contained in:
commit
79cb7ef123
3 files changed
+13
-6
No files matched your search
@@ -5,6 +5,7 @@
|
|||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:local="clr-namespace:ProcessManageUI"
|
xmlns:local="clr-namespace:ProcessManageUI"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
|
Loaded="Window_Loaded"
|
||||||
ResizeMode="NoResize"
|
ResizeMode="NoResize"
|
||||||
Title="ProcessManage" Height="450" Width="800" >
|
Title="ProcessManage" Height="450" Width="800" >
|
||||||
<Grid>
|
<Grid>
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ using System.Windows;
|
|||||||
using System.Windows.Controls;
|
using System.Windows.Controls;
|
||||||
using System.Windows.Data;
|
using System.Windows.Data;
|
||||||
using System.Windows.Documents;
|
using System.Windows.Documents;
|
||||||
using System.Windows.Forms;
|
|
||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using System.Windows.Media.Animation;
|
using System.Windows.Media.Animation;
|
||||||
@@ -23,7 +22,6 @@ using System.Windows.Shapes;
|
|||||||
using System.Windows.Threading;
|
using System.Windows.Threading;
|
||||||
using System.Xml.Linq;
|
using System.Xml.Linq;
|
||||||
using static ProcessManageUI.SqliteHelper;
|
using static ProcessManageUI.SqliteHelper;
|
||||||
using static System.Net.WebRequestMethods;
|
|
||||||
|
|
||||||
namespace ProcessManageUI
|
namespace ProcessManageUI
|
||||||
{
|
{
|
||||||
@@ -71,7 +69,7 @@ namespace ProcessManageUI
|
|||||||
base.OnClosing(e);
|
base.OnClosing(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static IniFile.IniFiles Configini = new IniFile.IniFiles(Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "ProcessManageConfigini.ini");
|
private static IniFile.IniFiles Configini = new IniFile.IniFiles(Environment.CurrentDirectory + "\\ProcessManageConfigini.ini");
|
||||||
private static string SQLIP = Configini.IniReadvalue("SQL_SERVER", "SQL1"); //读配置文件
|
private static string SQLIP = Configini.IniReadvalue("SQL_SERVER", "SQL1"); //读配置文件
|
||||||
private static string SQLNAME = Configini.IniReadvalue("SQL_SERVER", "SQL2");
|
private static string SQLNAME = Configini.IniReadvalue("SQL_SERVER", "SQL2");
|
||||||
private static string SQMOD = Configini.IniReadvalue("SQL_SERVER", "SQL3");
|
private static string SQMOD = Configini.IniReadvalue("SQL_SERVER", "SQL3");
|
||||||
@@ -94,8 +92,10 @@ namespace ProcessManageUI
|
|||||||
public MainWindow()
|
public MainWindow()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
DataContext = this;
|
||||||
// 程序默认启动时隐藏窗体
|
}
|
||||||
|
private void Window_Loaded(object sender, RoutedEventArgs e)
|
||||||
|
{ // 程序默认启动时隐藏窗体
|
||||||
Hide();
|
Hide();
|
||||||
|
|
||||||
IP.Text = SQLIP;
|
IP.Text = SQLIP;
|
||||||
@@ -288,5 +288,7 @@ namespace ProcessManageUI
|
|||||||
data_Grid.Visibility=Visibility.Collapsed;
|
data_Grid.Visibility=Visibility.Collapsed;
|
||||||
disTimer.Start();//计时
|
disTimer.Start();//计时
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
<Deterministic>true</Deterministic>
|
<Deterministic>true</Deterministic>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
<PlatformTarget>x64</PlatformTarget>
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<DebugSymbols>true</DebugSymbols>
|
||||||
<DebugType>full</DebugType>
|
<DebugType>full</DebugType>
|
||||||
<Optimize>false</Optimize>
|
<Optimize>false</Optimize>
|
||||||
@@ -24,6 +24,7 @@
|
|||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
@@ -37,6 +38,9 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ApplicationIcon>sunlight_logo.ico</ApplicationIcon>
|
<ApplicationIcon>sunlight_logo.ico</ApplicationIcon>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<PropertyGroup>
|
||||||
|
<StartupObject>ProcessManageUI.App</StartupObject>
|
||||||
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Data" />
|
<Reference Include="System.Data" />
|
||||||
|
|||||||
Reference in new issue
Block a user