diff --git a/VPet-Simulator.Windows.Interface/ScheduleItemBase.cs b/VPet-Simulator.Windows.Interface/ScheduleItemBase.cs
new file mode 100644
index 0000000..5674baf
--- /dev/null
+++ b/VPet-Simulator.Windows.Interface/ScheduleItemBase.cs
@@ -0,0 +1,61 @@
+using Panuon.WPF;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media;
+using static VPet_Simulator.Core.GraphHelper;
+
+namespace VPet_Simulator.Windows.Interface;
+///
+/// 日程表基础
+///
+public class ScheduleItemBase : NotifyPropertyChangedBase
+{
+ ///
+ /// 工作日程表
+ ///
+ public class WorkScheduleItem
+ : ScheduleItemBase
+ {
+ public Work work { get; set; }
+ public WorkScheduleItem()
+ {
+ }
+
+ public WorkScheduleItem(ImageSource image,
+ string workName,
+ int workTime)
+ {
+ Image = image;
+ WorkName = workName;
+ WorkTime = workTime;
+ }
+
+ public ImageSource Image { get; set; }
+
+ public string WorkName { get; set; }
+
+ public int WorkTime { get; set; }
+
+ public bool IsPreviousIsRest { get => _isPreviousIsRest; set => Set(ref _isPreviousIsRest, value); }
+ private bool _isPreviousIsRest;
+ }
+
+ public class RestScheduleItem
+ : ScheduleItemBase
+ {
+ public RestScheduleItem()
+ {
+ }
+
+ public RestScheduleItem(int restTime)
+ {
+ RestTime = restTime;
+ }
+
+ public int RestTime { get => _restTime; set => Set(ref _restTime, value); }
+ private int _restTime;
+ }
+}
diff --git a/VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml b/VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml
index 75cb7a6..71af354 100644
--- a/VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml
+++ b/VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml
@@ -136,7 +136,7 @@
+ Click="btnStart_Click" Margin="5" Height="25" Visibility="Collapsed" />
@@ -150,7 +150,7 @@
pu:TabControlHelper.ItemsSelectedForeground="{DynamicResource DARKPrimaryText}"
Background="Transparent" BorderThickness="0" Foreground="{DynamicResource PrimaryText}"
SelectedIndex="0">
-
+
@@ -180,34 +180,33 @@
-
-
+
+
当前套餐
-
+
-
-
+
+
@@ -216,37 +215,23 @@
-
-
-
+
+
+
-
+
-
-
+
@@ -260,60 +245,37 @@
抽成
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
-
-
-
+
+
+
@@ -326,41 +288,26 @@
- 抽成
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
@@ -373,7 +320,7 @@
-
+
- 工作内容
+
- 持续时间
+
- 分钟
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 休息
-
+
分钟
+ FontSize="16" Text="{ll:Str '分钟'}" />