Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement

ConvertMoels/StateToColorConvert.cs

@@ -19,7 +19,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.ConvertMoels
             }
             else
             {
-                string Staten = null;
                 string i = value.ToString();
 
                 if (i == "101") return "Gray";

Properties/Resources.zh-TW.resx

@@ -915,4 +915,13 @@
   <data name="Group" xml:space="preserve">
     <value>組</value>
   </data>
+  <data name="DayAfter" xml:space="preserve">
+    <value>後一天</value>
+  </data>
+  <data name="Before" xml:space="preserve">
+    <value>前一天</value>
+  </data>
+  <data name="Today" xml:space="preserve">
+    <value>今天</value>
+  </data>
 </root>

SunlightCentralizedControlManagement_SCCM_.csproj

@@ -289,6 +289,9 @@
     <PackageReference Include="System.Management">
       <Version>8.0.0</Version>
     </PackageReference>
+    <PackageReference Include="System.ObjectModel">
+      <Version>4.3.0</Version>
+    </PackageReference>
     <PackageReference Include="TouchSocket">
       <Version>2.1.10</Version>
     </PackageReference>

View/CurveView.xaml

@@ -107,16 +107,9 @@
                 <DataGridTextColumn Header="{x:Static lang:Resources.Remark}" Binding="{Binding Remark}" Width="500" IsReadOnly="True"/>
             </DataGrid.Columns>
         </DataGrid>
-        
+
-        <lvc:CartesianChart x:Name="OscChart" MinWidth="400" MinHeight="300" EasingFunction="{x:Null}"                   
+        <lvc:CartesianChart x:Name="OscChart" MinWidth="400" MinHeight="300" EasingFunction="{x:Null}" ZoomMode="X"                  
-                            Series="{Binding Series}" YAxes="{Binding YAxes}" XAxes="{Binding XAxes}" Margin="0,500,300,60">
+                            Series="{Binding Series}" YAxes="{Binding YAxes}" XAxes="{Binding XAxes}" Margin="0,500,300,60"/>
-            <lvc:CartesianChart.Style>
-                <Style TargetType="{x:Type lvc:CartesianChart}">
-                    <Setter Property="ZoomMode" Value="PanX"/>
-                    <Setter Property="ZoomMode" Value="ZoomX"/>
-                </Style>
-            </lvc:CartesianChart.Style>
-        </lvc:CartesianChart>
 
         <StackPanel x:Name="s1cr" VerticalAlignment="Bottom" Height="60" Background="#FF00204E" Orientation="Horizontal">
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">

View/CurveView.xaml.cs

@@ -65,6 +65,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             Griddata.ItemsSource = MainWindowViewModel.Machines.DefaultView;
 
             Sdatepicker.Text = DateTime.Now.ToString("yyyy/MM/dd");
+
+            CurveDiagramViewModel.Curve("738891980000");
         }
 
         private void WorkOrderNumder_Click(object sender, RoutedEventArgs e)

ViewModel/CurveDiagramViewModel.cs

@@ -25,30 +25,14 @@ using static SunlightCentralizedControlManagement_SCCM_.UserClass.SqliteHelper;
 using TouchSocket.Core;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
+using System.Windows;
 
 namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
-{
+{   
-    public class NotifyPropertyBase : INotifyPropertyChanged
-    {
-        public event PropertyChangedEventHandler PropertyChanged;
-        public void Notify([CallerMemberName] string propName = "")
-        {
-            if (PropertyChanged != null)
-                PropertyChanged(this, new PropertyChangedEventArgs(propName));
-        }
-
-        protected void SetProperty<T>(ref T prop, T value, [CallerMemberName] string propertyName = null)
-        {
-            if (EqualityComparer<T>.Default.Equals(prop, value) == false)
-            {
-                prop = value;
-                Notify(propertyName);
-            }
-        }
-    }
     public partial class CurveDiagramViewModel : ObservableObject//ViewModelBase
     {      
         public static ISeries[] Series { get; set; }
+        public static ObservableCollection<ObservableValue> ObservableValues { get; set; }
         //x轴时间格式
         public Axis[] XAxes { get; set; } =
         { 
@@ -144,7 +128,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
 
         public CurveDiagramViewModel()
         {
-
             Curve("");
         }
         public static void Curve(string SYSWorkNumder)        
@@ -213,9 +196,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
                     STTC_values = new ObservableCollection<DateTimePoint>(STTC_items);
                     STLC_values = new ObservableCollection<DateTimePoint>(STLC_items);
                 }
+
+      
+
+
                 Series = new ISeries[]
                 {
-                    new LineSeries<DateTimePoint>
+                     new LineSeries<DateTimePoint>
                     {
                         Name = Properties.Resources.MasterCylinder +"PH",
                         Values = MTH_values,
@@ -337,7 +324,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
                         ScalesYAt = 1,
                     },   //附缸3 液位 
                 };
-            }
+               
+            }    
         }
     }
 }