Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement
This commit is contained in:
commit
68c6401d9f
3 files changed
+6
-12
No files matched your search
@@ -277,6 +277,9 @@
|
||||
<EmbeddedResource Include="Properties\Resources.zh-CN.resx" />
|
||||
<EmbeddedResource Include="Properties\Resources.zh-TW.resx" />
|
||||
<Resource Include="Fonts\FontAwesome.otf" />
|
||||
<None Include="bin\Debug\DataBase\800COMPUTER.db" />
|
||||
<None Include="bin\Debug\DataBase\Chart.db" />
|
||||
<None Include="bin\Debug\DataBase\SCCM.db" />
|
||||
<None Include="Fonts\font-awesome-4.7.0.zip" />
|
||||
<None Include="Fonts\font-awesome-4.7.0\fonts\fontawesome-webfont.eot" />
|
||||
<Resource Include="Fonts\font-awesome-4.7.0\fonts\fontawesome-webfont.ttf" />
|
||||
|
||||
@@ -62,7 +62,7 @@
|
||||
</StackPanel>
|
||||
<StackPanel Grid.Row="1" Height="60" Background="#FF00204E" Orientation="Horizontal" HorizontalAlignment="Right">
|
||||
<ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">
|
||||
<ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_Quit" x:Name="Quit">
|
||||
<ListViewItem Width="150" MouseLeftButtonUp="ListViewItem_New" x:Name="Quit">
|
||||
<StackPanel Orientation="Horizontal" >
|
||||
<materialDesign:PackIcon Kind="NewBox" Width="40" Height="30" Margin="10" VerticalAlignment="Center" Foreground="#FF1368BD"/>
|
||||
<TextBlock Text="{x:Static lang:Resources.New}" VerticalAlignment="Center" Margin="20 10" Foreground="White"/>
|
||||
|
||||
@@ -83,7 +83,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
|
||||
GanttChart.AddGanttTask(row, new GanttTask() { Start = DateTime.Parse("2024-12-30 00:30:00"), End = DateTime.Parse("2024-12-30 01:00:00"), Name = "GanttRow:"+"GanttTask 1", TaskProgressVisibility = System.Windows.Visibility.Hidden });
|
||||
GanttChart.AddGanttTask(row, new GanttTask() { Start = DateTime.Parse("2024-12-30 06:00:00"), End = DateTime.Parse("2024-12-30 07:00:00"), Name = "GanttRow:"+"GanttTask 2" });
|
||||
GanttChart.AddGanttTask(row, new GanttTask() { Start = DateTime.Parse("2024-12-30 10:00:00"), End = DateTime.Parse("2024-12-30 20:00:00"), Name = "GanttRow:"+"GanttTask 3" });
|
||||
}
|
||||
}//创建日程图表
|
||||
private string FormatYear(Period period)
|
||||
{
|
||||
return period.Start.Year.ToString();
|
||||
@@ -111,8 +111,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
|
||||
else
|
||||
return new System.Windows.Media.SolidColorBrush(System.Windows.Media.Colors.Transparent);
|
||||
}
|
||||
|
||||
private void ListViewItem_Quit(object sender, System.Windows.Input.MouseButtonEventArgs e)//退出事件
|
||||
private void ListViewItem_New(object sender, System.Windows.Input.MouseButtonEventArgs e)//新建事件
|
||||
{
|
||||
|
||||
}
|
||||
@@ -126,15 +125,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
|
||||
{
|
||||
}
|
||||
|
||||
private void ListViewItem_Save(object sender, System.Windows.Input.MouseButtonEventArgs e)//保存事件
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void ListViewItem_Delete(object sender, System.Windows.Input.MouseButtonEventArgs e)//删除事件
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void ListViewItem_Before(object sender, MouseButtonEventArgs e)//前一天
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user