添加详情页面远程
This commit is contained in:
commit
cfc64511f8
2 files changed
+32
-12
No files matched your search
@@ -5,7 +5,8 @@
|
|||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.View"
|
xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_.View"
|
||||||
xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties"
|
xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties"
|
||||||
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
|
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
|
||||||
|
xmlns:rdp="clr-namespace:VncSharpWpf;assembly=VncSharpWpf"
|
||||||
xmlns:viewmodel="clr-namespace:SunlightCentralizedControlManagement_SCCM_.ViewModel"
|
xmlns:viewmodel="clr-namespace:SunlightCentralizedControlManagement_SCCM_.ViewModel"
|
||||||
xmlns:ConvertMoels="clr-namespace:SunlightCentralizedControlManagement_SCCM_.ConvertMoels"
|
xmlns:ConvertMoels="clr-namespace:SunlightCentralizedControlManagement_SCCM_.ConvertMoels"
|
||||||
d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}"
|
d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}"
|
||||||
@@ -148,7 +149,10 @@
|
|||||||
</DataGrid>
|
</DataGrid>
|
||||||
<TextBlock Grid.Column="0" x:Name="machin_LOG" TextWrapping="Wrap" FontSize="27" VerticalAlignment="Top" Height="40" Background="#FF2793FF" Foreground="White" FontWeight="Bold"/>
|
<TextBlock Grid.Column="0" x:Name="machin_LOG" TextWrapping="Wrap" FontSize="27" VerticalAlignment="Top" Height="40" Background="#FF2793FF" Foreground="White" FontWeight="Bold"/>
|
||||||
<TextBlock Grid.Column="0" x:Name="log" Text="{Binding Sys_machine}" TextWrapping="Wrap" FontSize="25" Background="White" Margin="0,40,0,0" Grid.ColumnSpan="2"/>
|
<TextBlock Grid.Column="0" x:Name="log" Text="{Binding Sys_machine}" TextWrapping="Wrap" FontSize="25" Background="White" Margin="0,40,0,0" Grid.ColumnSpan="2"/>
|
||||||
<ContentControl Grid.Column="0" x:Name="Picture" Background="White" Margin="0,40,0,0" Grid.ColumnSpan="2"/>
|
<Grid Margin="0,40,0,0" Grid.ColumnSpan="2" Grid.Column="0" >
|
||||||
|
<rdp:RemoteDesktopWpf x:Name="rdp" Visibility="Collapsed" />
|
||||||
|
<ContentControl x:Name="Picture" Background="White"/>
|
||||||
|
</Grid>
|
||||||
<GridSplitter Grid.Row="0" Grid.Column="1" Width="5" HorizontalAlignment="Center" Background="#FF00204E"/>
|
<GridSplitter Grid.Row="0" Grid.Column="1" Width="5" HorizontalAlignment="Center" Background="#FF00204E"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
<StackPanel Grid.Row="3" x:Name="mt" VerticalAlignment="Bottom" Height="60" Background="#FF00204E" Orientation="Horizontal" Margin="0,0,0,0" Width="700" HorizontalAlignment="Left">
|
<StackPanel Grid.Row="3" x:Name="mt" VerticalAlignment="Bottom" Height="60" Background="#FF00204E" Orientation="Horizontal" Margin="0,0,0,0" Width="700" HorizontalAlignment="Left">
|
||||||
|
|||||||
+26
-10
@@ -1,4 +1,4 @@
|
|||||||
using SkiaSharp;
|
using SkiaSharp;
|
||||||
using SunlightCentralizedControlManagement_SCCM_.ViewModel;
|
using SunlightCentralizedControlManagement_SCCM_.ViewModel;
|
||||||
using SunlightCentralizedControlManagement_SCCM_.WindowsView;
|
using SunlightCentralizedControlManagement_SCCM_.WindowsView;
|
||||||
using System;
|
using System;
|
||||||
@@ -93,6 +93,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
|
|||||||
{
|
{
|
||||||
machines_info = 0;
|
machines_info = 0;
|
||||||
log.Visibility = Visibility.Visible;
|
log.Visibility = Visibility.Visible;
|
||||||
|
rdp.Visibility = Visibility.Collapsed;
|
||||||
Picture.Visibility = Visibility.Collapsed;
|
Picture.Visibility = Visibility.Collapsed;
|
||||||
}//信息
|
}//信息
|
||||||
|
|
||||||
@@ -118,18 +119,24 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
|
|||||||
}
|
}
|
||||||
private async void ListViewItem_Screen(object sender, MouseButtonEventArgs e)
|
private async void ListViewItem_Screen(object sender, MouseButtonEventArgs e)
|
||||||
{
|
{
|
||||||
machines_info = 1;
|
|
||||||
log.Visibility = Visibility.Visible;
|
|
||||||
Picture.Visibility = Visibility.Collapsed;
|
|
||||||
|
|
||||||
RemoteDesktopWpf remoteDesktopWpf = new RemoteDesktopWpf();
|
|
||||||
Picture.Content = remoteDesktopWpf;
|
|
||||||
|
|
||||||
|
|
||||||
DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
|
DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
|
||||||
string host = drEmployee.Field<string>("IP");
|
string host = drEmployee.Field<string>("IP");
|
||||||
int port = Convert.ToInt16(drEmployee.Field<int>("PORT"));
|
int port = 5900;
|
||||||
string password = "123456";//drEmployee.Field<string>("SYSKEY");
|
string password = "123456";//drEmployee.Field<string>("SYSKEY");
|
||||||
|
// bool Desktop = drEmployee.Field<bool>("Desktop");
|
||||||
|
if (!drEmployee.Field<bool>("Desktop"))
|
||||||
|
{
|
||||||
|
MessageBox.Show(Properties.Resources.Not_a, "Desktop", MessageBoxButton.OK);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
machines_info = 1;
|
||||||
|
log.Visibility = Visibility.Collapsed;
|
||||||
|
Picture.Visibility = Visibility.Collapsed;
|
||||||
|
rdp.Visibility = Visibility.Visible;
|
||||||
|
|
||||||
|
RemoteDesktopWpf remoteDesktopWpf = new RemoteDesktopWpf();
|
||||||
|
Picture.Content = remoteDesktopWpf;
|
||||||
|
|
||||||
if (await PingTest(host))
|
if (await PingTest(host))
|
||||||
{
|
{
|
||||||
@@ -150,8 +157,16 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
|
|||||||
}//远程
|
}//远程
|
||||||
private void ListViewItem_Receipt(object sender, MouseButtonEventArgs e)
|
private void ListViewItem_Receipt(object sender, MouseButtonEventArgs e)
|
||||||
{
|
{
|
||||||
|
DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
|
||||||
|
if (!drEmployee.Field<bool>("Dispense"))
|
||||||
|
{
|
||||||
|
MessageBox.Show(Properties.Resources.Not_a, "Dispense", MessageBoxButton.OK);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
machines_info = 2;
|
machines_info = 2;
|
||||||
log.Visibility = Visibility.Visible;
|
log.Visibility = Visibility.Visible;
|
||||||
|
rdp.Visibility = Visibility.Collapsed;
|
||||||
Picture.Visibility = Visibility.Collapsed;
|
Picture.Visibility = Visibility.Collapsed;
|
||||||
DyelotView dyelotView = new DyelotView();
|
DyelotView dyelotView = new DyelotView();
|
||||||
dyelotView.Dyelot(workOrder);
|
dyelotView.Dyelot(workOrder);
|
||||||
@@ -160,6 +175,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
|
|||||||
private void ListViewItem_Curve(object sender, MouseButtonEventArgs e)
|
private void ListViewItem_Curve(object sender, MouseButtonEventArgs e)
|
||||||
{
|
{
|
||||||
log.Visibility = Visibility.Collapsed;
|
log.Visibility = Visibility.Collapsed;
|
||||||
|
rdp.Visibility = Visibility.Collapsed;
|
||||||
Picture.Visibility = Visibility.Visible;
|
Picture.Visibility = Visibility.Visible;
|
||||||
Picture.Content = new View.CurveDiagram(true, "", "", "", workOrder);
|
Picture.Content = new View.CurveDiagram(true, "", "", "", workOrder);
|
||||||
machines_info = 3;
|
machines_info = 3;
|
||||||
|
|||||||
Reference in new issue
Block a user