状态图标添加
This commit is contained in:
commit
d2cbf4c7d1
8 files changed
+11
-5
No files matched your search
@@ -413,6 +413,10 @@
|
|||||||
<Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.css" />
|
<Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.css" />
|
||||||
<Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.min.css" />
|
<Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.min.css" />
|
||||||
<Content Include="Fonts\font-awesome-4.7.0\fonts\fontawesome-webfont.svg" />
|
<Content Include="Fonts\font-awesome-4.7.0\fonts\fontawesome-webfont.svg" />
|
||||||
|
<Resource Include="link.png" />
|
||||||
|
<Resource Include="Fonts\link.png" />
|
||||||
|
<Resource Include="LOCK.png" />
|
||||||
|
<Resource Include="Fonts\LOCK.png" />
|
||||||
<Resource Include="Lmage\inf.png" />
|
<Resource Include="Lmage\inf.png" />
|
||||||
<Resource Include="Lmage\start2.png" />
|
<Resource Include="Lmage\start2.png" />
|
||||||
<Resource Include="Lmage\start3.png" />
|
<Resource Include="Lmage\start3.png" />
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 6.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.7 KiB |
+3
-2
@@ -92,16 +92,17 @@
|
|||||||
TextWrapping="Wrap" VerticalAlignment="Top" Width="200" FontSize="20"
|
TextWrapping="Wrap" VerticalAlignment="Top" Width="200" FontSize="20"
|
||||||
Background="{x:Null}" BorderBrush="{x:Null}" SelectionBrush="{x:Null}"
|
Background="{x:Null}" BorderBrush="{x:Null}" SelectionBrush="{x:Null}"
|
||||||
IsReadOnly="True" IsUndoEnabled="False" MaxLines="1" IsEnabled="False"/>
|
IsReadOnly="True" IsUndoEnabled="False" MaxLines="1" IsEnabled="False"/>
|
||||||
|
|
||||||
<TextBox Text="{Binding Status_Str}" HorizontalAlignment="Center" Height="50" Margin="0,0,0,0"
|
<TextBox Text="{Binding Status_Str}" HorizontalAlignment="Center" Height="50" Margin="0,0,0,0"
|
||||||
TextWrapping="Wrap" VerticalAlignment="Top" Width="700" FontSize="35"
|
TextWrapping="Wrap" VerticalAlignment="Top" Width="700" FontSize="35"
|
||||||
Background="{x:Null}" BorderBrush="{x:Null}" SelectionBrush="{x:Null}"
|
Background="{x:Null}" BorderBrush="{x:Null}" SelectionBrush="{x:Null}"
|
||||||
IsReadOnly="True" IsUndoEnabled="False" MaxLines="1" IsEnabled="False"/>
|
IsReadOnly="True" IsUndoEnabled="False" MaxLines="1" IsEnabled="False"/>
|
||||||
|
|
||||||
<TextBox Text="{Binding Sys_Time}" HorizontalAlignment="Right" Height="50" Margin="0,0,5,0"
|
<TextBox Text="{Binding Sys_Time}" HorizontalAlignment="Right" Height="50" Margin="0,0,5,0"
|
||||||
TextWrapping="Wrap" VerticalAlignment="Top" Width="150" FontSize="20"
|
TextWrapping="Wrap" VerticalAlignment="Top" Width="150" FontSize="20"
|
||||||
Background="{x:Null}" BorderBrush="{x:Null}" SelectionBrush="{x:Null}"
|
Background="{x:Null}" BorderBrush="{x:Null}" SelectionBrush="{x:Null}"
|
||||||
IsReadOnly="True" IsUndoEnabled="False" MaxLines="1" IsEnabled="False"/>
|
IsReadOnly="True" IsUndoEnabled="False" MaxLines="1" IsEnabled="False"/>
|
||||||
|
<Image HorizontalAlignment="Right" Height="40" VerticalAlignment="Top" Width="40" Margin="0,5,220,5" Source="/link.png"/>
|
||||||
|
<Image HorizontalAlignment="Right" Height="40" VerticalAlignment="Top" Width="40" Margin="0,5,270,5" Source="/LOCK.png"/>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
@@ -538,9 +538,9 @@
|
|||||||
<value>故障</value>
|
<value>故障</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Process_lock" xml:space="preserve">
|
<data name="Process_lock" xml:space="preserve">
|
||||||
<value />
|
<value>製程已鎖定</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="refuse" xml:space="preserve">
|
<data name="refuse" xml:space="preserve">
|
||||||
<value />
|
<value>拒絕</value>
|
||||||
</data>
|
</data>
|
||||||
</root>
|
</root>
|
||||||
@@ -251,7 +251,8 @@ namespace DyeingComputer.ViewModel
|
|||||||
{
|
{
|
||||||
UserButton = false;
|
UserButton = false;
|
||||||
IsInteractive = false;
|
IsInteractive = false;
|
||||||
WORK_RUN = 2;// 运行时停止键为
|
WORK_RUN = 2;//
|
||||||
|
SETP_runtime = true;
|
||||||
APILog.LOGlog(WorkNumder.ToString(), "UserActions", "WORK_RUN = RUN", WORK_RUN.ToString());
|
APILog.LOGlog(WorkNumder.ToString(), "UserActions", "WORK_RUN = RUN", WORK_RUN.ToString());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user