界面内容修改

Core/Management.cs

@@ -561,9 +561,9 @@ namespace DefaultEdit.Core
                     ///从扫码枪获取的网板Id
                     new DescriptionItem(){ key="containerId",value=RfidId},
                     //后处理配方（根据设备不同参数也不同，具体需要上传什么参数要具体咨询下现场的工艺人员（程朋））
-                    new DescriptionItem(){ key="CentrifugalTime1",value=""},
-                    new DescriptionItem(){ key="CentrifugalTime2",value=""},
-                    new DescriptionItem(){ key="LightSolidifiedTime",value=""},
+                    new DescriptionItem(){ key="CentrifugalTime1",value="240"},
+                    new DescriptionItem(){ key="CentrifugalTime2",value="240"},
+                    new DescriptionItem(){ key="LightSolidifiedTime",value="240"},
                     }
                 };
                 var recordData = _httpService.PostRecord(rt_ProductionRecord);

Model/CurrConfig.cs

@@ -11,24 +11,21 @@ namespace DefaultEdit.Model
     {
 
         private float _Speed;
+        private TimeSpan _Time;
 
 
-        private TimeSpan _Time;
+        private float _Speed2;
+        private TimeSpan _Time2;
 
         private short _Power1_1;
         private short _Power1_2;
         private short _Power1_3;
         private short _Power1_4;
 
-        private short _Power2_1;
-        private short _Power2_2;
-        private short _Power2_3;
-        private short _Power2_4;
+      
 
         private float _Pressure1;
-        private float _Pressure2;
         private TimeSpan _PTime1;
-        private TimeSpan _PTime2;
         private string _Rfid;
 
 
@@ -38,15 +35,14 @@ namespace DefaultEdit.Model
         public short Power1_2 { get => _Power1_2; set { SetProperty(ref _Power1_2, value); } }
         public short Power1_3 { get => _Power1_3; set { SetProperty(ref _Power1_3, value); } }
         public short Power1_4 { get => _Power1_4; set { SetProperty(ref _Power1_4, value); } }
-        public short Power2_1 { get => _Power2_1; set { SetProperty(ref _Power2_1, value); } }
-        public short Power2_2 { get => _Power2_2; set { SetProperty(ref _Power2_2, value); } }
-        public short Power2_3 { get => _Power2_3; set { SetProperty(ref _Power2_3, value); } }
-        public short Power2_4 { get => _Power2_4; set { SetProperty(ref _Power2_4, value); } }
+       
         public float Pressure1 { get => _Pressure1; set { SetProperty(ref _Pressure1, value); } }
-        public float Pressure2 { get => _Pressure2; set { SetProperty(ref _Pressure2, value); } }
         public TimeSpan PTime1 { get => _PTime1; set { SetProperty(ref _PTime1, value); } }
-        public TimeSpan PTime2 { get => _PTime2; set { SetProperty(ref _PTime2, value); } }
+
 
         public string Rfid { get => _Rfid; set { SetProperty(ref _Rfid, value); } }
+
+        public float Speed2 { get => _Speed2; set { SetProperty(ref _Speed2, value); } }
+        public TimeSpan Time2 { get => _Time2; set { SetProperty(ref _Time2, value); } }
     }
 }

Views/WorkRunView.xaml

@@ -72,7 +72,8 @@
                       Margin="5,5,30,5"
                       Height="300">
                     <scottplot:WpfPlot Name="plot"
-                                       Grid.Column="0" />
+                                       Grid.Column="0"
+                                       Margin="1337,-272,-1337,272" />
                 </Grid>
                 <Grid Grid.Column="2"
                       Margin="0,20,0,0">
@@ -92,72 +93,62 @@
                         <RowDefinition />
                     </Grid.RowDefinitions>
 
-                    <TextBlock Text="离心工位#1"
+                    <TextBlock Text="顶出工位"
                                Margin="0,0,80,0"
                                Grid.Row="0"
                                Grid.Column="0" />
-                    <TextBlock Text="离心工位#2"
+                    <TextBlock Text=""
                                Margin="0,0,80,0"
                                Grid.Row="0"
-                               Grid.Column="1" />
-                    <TextBlock Text="{Binding Management.CurrStationRfid[0]}"
-                               Grid.Row="1"
                                Grid.Column="0" />
-                    <TextBlock Text="{Binding Management.CurrStationRfid[1]}"
-                               Grid.Row="1"
-                               Grid.Column="1" />
 
 
 
-                    <TextBlock Text="离心工位#3"
+
+                    <TextBlock Text="离心工位1-1"
                                Grid.Row="2"
                                Grid.Column="0" />
-                    <TextBlock Text="离心工位#4"
+                    <TextBlock Text="离心工位1-2"
                                Grid.Row="2"
                                Grid.Column="1" />
-                    <TextBlock Text="离心工位#3"
-                               Grid.Row="3"
+                    <TextBlock Text="{Binding Management.CurrStationRfid[0]}"
+                               Grid.Row="1"
                                Grid.Column="0" />
-                    <TextBlock Text="离心工位#4"
-                               Grid.Row="3"
+                    <TextBlock Text="{Binding Management.CurrStationRfid[1]}"
+                               Grid.Row="1"
                                Grid.Column="1" />
 
 
-                    <TextBlock Text="#1固化工位#1"
+                    <TextBlock Text="离心工位1-1"
                                Grid.Row="4"
                                Grid.Column="0" />
-                    <TextBlock Text="#1固化工位#2"
+                    <TextBlock Text="离心工位1-2"
                                Grid.Row="4"
                                Grid.Column="1" />
-                    <TextBlock Text="#1固化工位#2"
+                    <TextBlock Text="{Binding Management.CurrStationRfid[0]}"
                                Grid.Row="5"
                                Grid.Column="0" />
-                    <TextBlock Text="#1固化工位#2"
+                    <TextBlock Text="{Binding Management.CurrStationRfid[1]}"
                                Grid.Row="5"
                                Grid.Column="1" />
 
 
-
-                    <TextBlock Text="#2固化工位#1"
+                    <TextBlock Text="#1固化工位1"
                                Grid.Row="6"
                                Grid.Column="0" />
-                    <TextBlock Text="#2固化工位#2"
+                    <TextBlock Text="#1固化工位#2"
                                Grid.Row="6"
                                Grid.Column="1" />
-                    <TextBlock Text="#2固化工位#1"
+                    <TextBlock Text=""
                                Grid.Row="7"
                                Grid.Column="0" />
-                    <TextBlock Text="#2固化工位#2"
+                    <TextBlock Text=""
                                Grid.Row="7"
                                Grid.Column="1" />
 
 
-                    <TextBlock Text="顶出工位"
-                               Grid.Row="2"
-                               Grid.Column="2" />
-                    <TextBlock Text="顶出工位"
-                               Grid.Row="3"
-                               Grid.Column="2" />
+
+                    
 
                 </Grid>
             </Grid>
@@ -203,14 +194,14 @@
                     </Grid.ColumnDefinitions>
                     <StackPanel   Grid.Row="0"
                                   Grid.Column="0">
-                        <TextBlock Text="离心转速"
+                        <TextBlock Text="离心1转速"
                                    Margin="0,0,80,0" />
                         <TextBlock Text="{Binding Management.CurrConfig.Speed}"
                                    Margin="0,0,80,0" />
                     </StackPanel>
                     <StackPanel   Grid.Row="0"
                                   Grid.Column="1">
-                        <TextBlock Text="离心时间"
+                        <TextBlock Text="离心1时间"
                                    Margin="0,0,80,0" />
                         <TextBlock Text="{Binding Management.CurrConfig.Time,StringFormat=hh\\:mm\\:ss}"
                                    Margin="0,0,80,0" />
@@ -218,7 +209,7 @@
 
                     <StackPanel   Grid.Row="0"
                                   Grid.Column="2">
-                        <TextBlock Text="离心转速"
+                        <TextBlock Text="离心2转速"
                                    Margin="0,0,80,0" />
                         <TextBlock Text="{Binding Management.CurrConfig.Power1_1}"
                                    Margin="0,0,80,0" />
@@ -226,7 +217,7 @@
 
                     <StackPanel   Grid.Row="0"
                                   Grid.Column="3">
-                        <TextBlock Text="离心时间"
+                        <TextBlock Text="离心2时间"
                                    Margin="0,0,80,0" />
                         <TextBlock Text="{Binding Management.CurrConfig.Power1_2}"
                                    Margin="0,0,80,0" />
@@ -235,14 +226,14 @@
 
                     <StackPanel   Grid.Row="1"
                                   Grid.Column="0">
-                        <TextBlock Text="#1光固化时间"
+                        <TextBlock Text="固化箱压力"
                                    Margin="0,0,80,0" />
                         <TextBlock Text="{Binding Management.CurrConfig.PTime1}"
                                    Margin="0,0,80,0" />
                     </StackPanel>
                     <StackPanel   Grid.Row="1"
                                   Grid.Column="1">
-                        <TextBlock Text="#2光固化时间"
+                        <TextBlock Text="光固化时间"
                                    Margin="0,0,80,0" />
                         <TextBlock Text="{Binding Management.CurrConfig.PTime2}"
                                    Margin="0,0,80,0" />
@@ -322,18 +313,13 @@
                         <TextBlock Text="180"
                                    Grid.Row="4"
                                    Grid.Column="1" />
-                        <TextBlock Text="离心温度"
+                        
+                        <TextBlock Text="光固化时间"
                                    Grid.Row="5"
                                    Grid.Column="0" />
                         <TextBlock Text="180"
                                    Grid.Row="5"
                                    Grid.Column="1" />
-                        <TextBlock Text="光固化时间"
-                                   Grid.Row="6"
-                                   Grid.Column="0" />
-                        <TextBlock Text="180"
-                                   Grid.Row="6"
-                                   Grid.Column="1" />
                     </Grid>
                 </Border>
             </Grid>