Sic-Software
/
Sic08
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Activity

行星转盘，初步整理优化界面

This commit is contained in:
Han Qiang Qiang 2024-05-16 09:02:40 +08:00
parent a0655a1f02
commit 7a41efbd71
3 changed files with 43 additions and 420 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
SicRT/Config/Menu.xml
View File

@ -1,17 +1,30 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu> <menu>
<menuItem id="Operation" resKey="Operation"> <!--<menuItem id="Operation" resKey="Operation">
<menuItem id="Overview" resKey="Overview" viewmodel="SicUI.Models.Operations.Overviews.OverViewViewModel,SicUI" /> <menuItem id="Overview" resKey="Overview" viewmodel="SicUI.Models.Operations.Overviews.OverViewViewModel,SicUI" />
<menuItem id="Coating" resKey="Coating" viewmodel="MECF.Framework.UI.Client.TrayThickness.HistoryData.HistoryDataViewModel,MECF.Framework.UI.Client" /> <menuItem id="Coating" resKey="Coating" viewmodel="MECF.Framework.UI.Client.TrayThickness.HistoryData.HistoryDataViewModel,MECF.Framework.UI.Client" />
</menuItem> </menuItem>-->
<menuItem id="Platform" resKey="Platform"> <!--<menuItem id="Platform" resKey="Platform">
<menuItem id="TM" resKey="Mainframe" viewmodel="SicUI.Client.Models.Platform.TM.TMViewModel,SicUI" /> <menuItem id="TM" resKey="Mainframe" viewmodel="SicUI.Client.Models.Platform.TM.TMViewModel,SicUI" />
<!--<menuItem id="EFEM" resKey="EFEM" viewmodel="SicUI.Client.Models.Platform.TM.EFEMViewModel,SicUI" />--> --><!--<menuItem id="EFEM" resKey="EFEM" viewmodel="SicUI.Client.Models.Platform.TM.EFEMViewModel,SicUI" />--><!--
<menuItem id="EFEM" resKey="EFEM" viewmodel="SicUI.Models.Maintenances.TM.EFEMViewModel,SicUI" /> <menuItem id="EFEM" resKey="EFEM" viewmodel="SicUI.Models.Maintenances.TM.EFEMViewModel,SicUI" />
<menuItem id="Device" resKey="Device" viewmodel="SicUI.Client.Models.Platform.TM.DeviceViewModel,SicUI" /> <menuItem id="Device" resKey="Device" viewmodel="SicUI.Client.Models.Platform.TM.DeviceViewModel,SicUI" />
<menuItem id="ioPlatform" resKey="Platform IO" System="TM.io" viewmodel="MECF.Framework.UI.Client.CenterViews.Maitenances.IO3.IO3ViewModel,MECF.Framework.UI.Client" /> <menuItem id="ioPlatform" resKey="Platform IO" System="TM.io" viewmodel="MECF.Framework.UI.Client.CenterViews.Maitenances.IO3.IO3ViewModel,MECF.Framework.UI.Client" />
<menuItem id="LeakCheck" resKey="LeakCheck" viewmodel="SicUI.Client.Models.Platform.LeakCheck.TMLeakCheckViewModel,SicUI" /> <menuItem id="LeakCheck" resKey="LeakCheck" viewmodel="SicUI.Client.Models.Platform.LeakCheck.TMLeakCheckViewModel,SicUI" />
</menuItem>-->
<menuItem id="PM1" resKey="PM1" System="PM1">
<menuItem id="mainPM1" resKey="Main" System="PM1" viewmodel="SicUI.Models.PMs.PMOperationViewModel,SicUI" />
<menuItem id="processPM1" resKey="Process" System="PM1" viewmodel="MECF.Framework.UI.Client.CenterViews.Modules.PM.PMProcessViewModel,MECF.Framework.UI.Client" />
<menuItem id="ioPM1" resKey="IO" System="PM1.io" viewmodel="MECF.Framework.UI.Client.CenterViews.Maitenances.IO3.IO3ViewModel,MECF.Framework.UI.Client" />
<menuItem id="motionPM1" resKey="Motion" System="PM1" viewmodel="SicUI.Models.PMs.PMMotionViewModel,SicUI" />
<menuItem id="heaterPM1" resKey="Heater" System="PM1" viewmodel="MECF.Framework.UI.Client.CenterViews.Modules.PM.PMHeaterViewModel,MECF.Framework.UI.Client" />
<menuItem id="alarmPM1" resKey="Alarm" System="PM1" viewmodel="SicUI.Models.PMs.PMAlarmViewModel,SicUI" />
<!--<menuItem id="linkedDevicePM1" resKey="Linked Device" System="PM1" viewmodel="SicUI.Models.PMs.PMLinkedDeviceViewModel,SicUI" />-->
<menuItem id="MFCFlowPM1" resKey="MFCFlow" System="PM1" viewmodel="SicUI.Models.PMs.PMMfcDynamicFlowViewModel,SicUI" />
<menuItem id="MfcRorPM1" resKey="MfcRor" System="PM1" viewmodel="SicUI.Models.PMs.PMMfcRorViewModel,SicUI" />
<menuItem id="MfcTestPM1" resKey="GasBoxTest" System="PM1" viewmodel="SicUI.Models.PMs.PMMfcTestViewModel,SicUI" />
</menuItem> </menuItem>
<menuItem id="Editor" resKey="Editor"> <menuItem id="Editor" resKey="Editor">
@ -44,27 +57,16 @@
<menuItem id="EventDiagnosis" resKey="Event Diagnosis" viewmodel="MECF.Framework.UI.Client.CenterViews.Diagnosis.EventGeneratorViewModel,MECF.Framework.UI.Client" /> <menuItem id="EventDiagnosis" resKey="Event Diagnosis" viewmodel="MECF.Framework.UI.Client.CenterViews.Diagnosis.EventGeneratorViewModel,MECF.Framework.UI.Client" />
</menuItem> </menuItem>
<menuItem id="PM1" resKey="PM1" System="PM1">
<menuItem id="mainPM1" resKey="Main" System="PM1" viewmodel="SicUI.Models.PMs.PMOperationViewModel,SicUI" />
<menuItem id="processPM1" resKey="Process" System="PM1" viewmodel="MECF.Framework.UI.Client.CenterViews.Modules.PM.PMProcessViewModel,MECF.Framework.UI.Client" />
<menuItem id="ioPM1" resKey="IO" System="PM1.io" viewmodel="MECF.Framework.UI.Client.CenterViews.Maitenances.IO3.IO3ViewModel,MECF.Framework.UI.Client" />
<menuItem id="motionPM1" resKey="Motion" System="PM1" viewmodel="SicUI.Models.PMs.PMMotionViewModel,SicUI" />
<menuItem id="heaterPM1" resKey="Heater" System="PM1" viewmodel="MECF.Framework.UI.Client.CenterViews.Modules.PM.PMHeaterViewModel,MECF.Framework.UI.Client" />
<menuItem id="alarmPM1" resKey="Alarm" System="PM1" viewmodel="SicUI.Models.PMs.PMAlarmViewModel,SicUI" />
<!--<menuItem id="linkedDevicePM1" resKey="Linked Device" System="PM1" viewmodel="SicUI.Models.PMs.PMLinkedDeviceViewModel,SicUI" />-->
<menuItem id="MFCFlowPM1" resKey="MFCFlow" System="PM1" viewmodel="SicUI.Models.PMs.PMMfcDynamicFlowViewModel,SicUI" />
<menuItem id="MfcRorPM1" resKey="MfcRor" System="PM1" viewmodel="SicUI.Models.PMs.PMMfcRorViewModel,SicUI" />
<menuItem id="MfcTestPM1" resKey="GasBoxTest" System="PM1" viewmodel="SicUI.Models.PMs.PMMfcTestViewModel,SicUI" />
</menuItem>
<menuItem id="PM2" resKey="PM2" System="PM2"> <!--<menuItem id="PM2" resKey="PM2" System="PM2">
<menuItem id="mainPM2" resKey="Main" System="PM2" viewmodel="SicUI.Models.PMs.PMOperationViewModel,SicUI" /> <menuItem id="mainPM2" resKey="Main" System="PM2" viewmodel="SicUI.Models.PMs.PMOperationViewModel,SicUI" />
<menuItem id="processPM2" resKey="Process" System="PM2" viewmodel="MECF.Framework.UI.Client.CenterViews.Modules.PM.PMProcessViewModel,MECF.Framework.UI.Client" /> <menuItem id="processPM2" resKey="Process" System="PM2" viewmodel="MECF.Framework.UI.Client.CenterViews.Modules.PM.PMProcessViewModel,MECF.Framework.UI.Client" />
<menuItem id="ioPM2" resKey="IO" System="PM2.io" viewmodel="MECF.Framework.UI.Client.CenterViews.Maitenances.IO3.IO3ViewModel,MECF.Framework.UI.Client" /> <menuItem id="ioPM2" resKey="IO" System="PM2.io" viewmodel="MECF.Framework.UI.Client.CenterViews.Maitenances.IO3.IO3ViewModel,MECF.Framework.UI.Client" />
<menuItem id="motionPM2" resKey="Motion" System="PM2" viewmodel="SicUI.Models.PMs.PMMotionViewModel,SicUI" /> <menuItem id="motionPM2" resKey="Motion" System="PM2" viewmodel="SicUI.Models.PMs.PMMotionViewModel,SicUI" />
<menuItem id="heaterPM2" resKey="Heater" System="PM2" viewmodel="MECF.Framework.UI.Client.CenterViews.Modules.PM.PMHeaterViewModel,MECF.Framework.UI.Client" /> <menuItem id="heaterPM2" resKey="Heater" System="PM2" viewmodel="MECF.Framework.UI.Client.CenterViews.Modules.PM.PMHeaterViewModel,MECF.Framework.UI.Client" />
<menuItem id="alarmPM2" resKey="Alarm" System="PM2" viewmodel="SicUI.Models.PMs.PMAlarmViewModel,SicUI" /> <menuItem id="alarmPM2" resKey="Alarm" System="PM2" viewmodel="SicUI.Models.PMs.PMAlarmViewModel,SicUI" />
<!--<menuItem id="linkedDevicePM2" resKey="Linked Device" System="PM2" viewmodel="SicUI.Models.PMs.PMLinkedDeviceViewModel,SicUI" />--> --><!--<menuItem id="linkedDevicePM2" resKey="Linked Device" System="PM2" viewmodel="SicUI.Models.PMs.PMLinkedDeviceViewModel,SicUI" />--><!--
<menuItem id="MFCFlowPM2" resKey="MFCFlow" System="PM2" viewmodel="SicUI.Models.PMs.PMMfcDynamicFlowViewModel,SicUI" /> <menuItem id="MFCFlowPM2" resKey="MFCFlow" System="PM2" viewmodel="SicUI.Models.PMs.PMMfcDynamicFlowViewModel,SicUI" />
<menuItem id="MfcRorPM2" resKey="MfcRor" System="PM2" viewmodel="SicUI.Models.PMs.PMMfcRorViewModel,SicUI" /> <menuItem id="MfcRorPM2" resKey="MfcRor" System="PM2" viewmodel="SicUI.Models.PMs.PMMfcRorViewModel,SicUI" />
<menuItem id="MfcTestPM2" resKey="GasBoxTest" System="PM2" viewmodel="SicUI.Models.PMs.PMMfcTestViewModel,SicUI" /> <menuItem id="MfcTestPM2" resKey="GasBoxTest" System="PM2" viewmodel="SicUI.Models.PMs.PMMfcTestViewModel,SicUI" />
@ -77,5 +79,5 @@
<menuItem id="Annual" resKey="Annual" viewmodel="MECF.Framework.UI.Client.CenterViews.Maintain.ViewModels.MaintainViewModel,MECF.Framework.UI.Client" /> <menuItem id="Annual" resKey="Annual" viewmodel="MECF.Framework.UI.Client.CenterViews.Maintain.ViewModels.MaintainViewModel,MECF.Framework.UI.Client" />
<menuItem id="MaintainConfig" resKey="Config" viewmodel="MECF.Framework.UI.Client.CenterViews.Maintain.ViewModels.MaintainConfigViewModel,MECF.Framework.UI.Client" /> <menuItem id="MaintainConfig" resKey="Config" viewmodel="MECF.Framework.UI.Client.CenterViews.Maintain.ViewModels.MaintainConfigViewModel,MECF.Framework.UI.Client" />
<menuItem id="MaintainEvent" resKey="Maintain Event" viewmodel="MECF.Framework.UI.Client.CenterViews.Maintain.ViewModels.MaintainEventViewModel,MECF.Framework.UI.Client" /> <menuItem id="MaintainEvent" resKey="Maintain Event" viewmodel="MECF.Framework.UI.Client.CenterViews.Maintain.ViewModels.MaintainEventViewModel,MECF.Framework.UI.Client" />
</menuItem> </menuItem>-->
</menu> </menu>

13
SicUI/MainView.xaml
View File

@ -468,6 +468,15 @@
</Style> </Style>
</Grid.Resources> </Grid.Resources>
<controls:ModuleStatusIndicator <controls:ModuleStatusIndicator
cal:Message.Attach="[SetOnline] = [Action SetModuleOnline($source, $eventArgs)];[SetOffline] = [Action SetModuleOffline($source, $eventArgs)]"
Caption="PM1"
HasWarning="{Binding IsPM1Warning}"
IsOnline="{Binding IsOnlinePM1}"
ModuleDescription="PM1"
ModuleName="PM1"
Status="{Binding PM1Status}"
WarningTip="{Binding PM1WarningMessage}" />
<!--<controls:ModuleStatusIndicator
Grid.Row="0" Grid.Row="0"
Grid.Column="0" Grid.Column="0"
cal:Message.Attach="[SetOnline] = [Action SetModuleOnline($source, $eventArgs)];[SetOffline] = [Action SetModuleOffline($source, $eventArgs)]" cal:Message.Attach="[SetOnline] = [Action SetModuleOnline($source, $eventArgs)];[SetOffline] = [Action SetModuleOffline($source, $eventArgs)]"
@ -600,10 +609,10 @@
IsOnline="{Binding IsOnlineTrayRobot}" IsOnline="{Binding IsOnlineTrayRobot}"
ModuleDescription="TrayRobot" ModuleDescription="TrayRobot"
ModuleName="TrayRobot" ModuleName="TrayRobot"
Status="{Binding TrayRobotStatus}" /> Status="{Binding TrayRobotStatus}" />-->
<Grid <Grid
Grid.Row="2" Grid.Row="1"
Grid.Column="0" Grid.Column="0"
Grid.ColumnSpan="7" Grid.ColumnSpan="7"
Margin="0,2"> Margin="0,2">

410
SicUI/Models/PMs/PMOperationViewModel.cs
View File

@ -625,400 +625,16 @@ namespace SicUI.Models.PMs
#region MoveSpeed #region MoveSpeed
private const double movespeed = 0; private const double movespeed = 0;
public double V31MoveSpeed
{ //public double V54MoveSpeed
get //{
{ // get
if (V31.Feedback) return movespeed; // {
else return 0; // if (V54.Feedback) return movespeed;
} // else return 0;
} // }
public double V32MoveSpeed //}
{
get
{
if (V32.Feedback) return movespeed;
else return 0;
}
}
public double V33MoveSpeed
{
get
{
if (V33.Feedback) return movespeed;
else return 0;
}
}
public double V33sMoveSpeed
{
get
{
if (V33s.Feedback) return movespeed;
else return 0;
}
}
public double V35MoveSpeed
{
get
{
if (V35.Feedback) return movespeed;
else return 0;
}
}
public double V36MoveSpeed
{
get
{
if (V36.Feedback) return movespeed;
else return 0;
}
}
public double V37sMoveSpeed
{
get
{
if (V37s.Feedback) return movespeed;
else return 0;
}
}
public double V37MoveSpeed
{
get
{
if (V37.Feedback) return movespeed;
else return 0;
}
}
public double V43MoveSpeed
{
get
{
if (V43.Feedback) return movespeed;
else return 0;
}
}
public double V45MoveSpeed
{
get
{
if (V45.Feedback) return movespeed;
else return 0;
}
}
public double V46MoveSpeed
{
get
{
if (V46.Feedback) return movespeed;
else return 0;
}
}
public double V46sMoveSpeed
{
get
{
if (V46s.Feedback) return movespeed;
else return 0;
}
}
public double V46_46sMoveSpeed
{
get
{
if (V46.Feedback || V46s.Feedback) return movespeed;
else return 0;
}
}
public double V43sMoveSpeed
{
get
{
if (V43s.Feedback) return movespeed;
else return 0;
}
}
public double V48MoveSpeed
{
get
{
if (V48.Feedback) return movespeed;
else return 0;
}
}
public double V50MoveSpeed
{
get
{
if (V50.Feedback) return movespeed;
else return 0;
}
}
public double V50sMoveSpeed
{
get
{
if (V50s.Feedback) return movespeed;
else return 0;
}
}
public double V50_50sMoveSpeed
{
get
{
if (V50.Feedback || V50s.Feedback) return movespeed;
else return 0;
}
}
public double V49MoveSpeed
{
get
{
if (V49.Feedback) return movespeed;
else return 0;
}
}
public double V48sMoveSpeed
{
get
{
if (V48s.Feedback) return movespeed;
else return 0;
}
}
public double V51MoveSpeed
{
get
{
if (V51.Feedback) return movespeed;
else return 0;
}
}
public double V51sMoveSpeed
{
get
{
if (V51s.Feedback) return movespeed;
else return 0;
}
}
public double V51_51sMoveSpeed
{
get
{
if (V51.Feedback || V51s.Feedback) return movespeed;
else return 0;
}
}
public double V52MoveSpeed
{
get
{
if (V52.Feedback) return movespeed;
else return 0;
}
}
public double V52sMoveSpeed
{
get
{
if (V52s.Feedback) return movespeed;
else return 0;
}
}
public double V52_52sMoveSpeed
{
get
{
if (V52.Feedback || V52s.Feedback) return movespeed;
else return 0;
}
}
public double V58MoveSpeed
{
get
{
if (V58.Feedback) return movespeed;
else return 0;
}
}
public double V58sMoveSpeed
{
get
{
if (V58s.Feedback) return movespeed;
else return 0;
}
}
public double V58_58sMoveSpeed
{
get
{
if (V58.Feedback || V58s.Feedback) return movespeed;
else return 0;
}
}
public double V53sMoveSpeed
{
get
{
if (V53s.Feedback) return movespeed;
else return 0;
}
}
public double V54sMoveSpeed
{
get
{
if (V54s.Feedback) return movespeed;
else return 0;
}
}
public double V56MoveSpeed
{
get
{
if (V56.Feedback) return movespeed;
else return 0;
}
}
public double V60MoveSpeed
{
get
{
if (V60.Feedback) return movespeed;
else return 0;
}
}
public double V59MoveSpeed
{
get
{
if (V59.Feedback) return movespeed;
else return 0;
}
}
public double V53MoveSpeed
{
get
{
if (V53.Feedback) return movespeed;
else return 0;
}
}
public double V54MoveSpeed
{
get
{
if (V54.Feedback) return movespeed;
else return 0;
}
}
public double V55MoveSpeed
{
get
{
if (V55.Feedback) return movespeed;
else return 0;
}
}
public double V61MoveSpeed
{
get
{
if (V61.Feedback) return movespeed;
else return 0;
}
}
public double V62MoveSpeed
{
get
{
if (V62.Feedback) return movespeed;
else return 0;
}
}
public double V63MoveSpeed
{
get
{
if (V63.Feedback) return movespeed;
else return 0;
}
}
public double V62_63MoveSpeed
{
get
{
if (V62.Feedback || V63.Feedback) return movespeed;
else return 0;
}
}
public double V68MoveSpeed
{
get
{
if (V68.Feedback) return movespeed;
else return 0;
}
}
public double V69MoveSpeed
{
get
{
if (V69.Feedback) return movespeed;
else return 0;
}
}
public double V70MoveSpeed
{
get
{
if (V70.Feedback) return movespeed;
else return 0;
}
}
public double V72MoveSpeed
{
get
{
if (V72.Feedback) return movespeed;
else return 0;
}
}
public double V73MoveSpeed
{
get
{
if (V73.Feedback) return movespeed;
else return 0;
}
}
public double V74MoveSpeed
{
get
{
if (V74.Feedback) return movespeed;
else return 0;
}
}
public double V75MoveSpeed
{
get
{
if (V75.Feedback) return movespeed;
else return 0;
}
}
public double V76MoveSpeed
{
get
{
if (V76.Feedback) return movespeed;
else return 0;
}
}
#endregion #endregion
@ -1445,11 +1061,7 @@ namespace SicUI.Models.PMs
return; return;
} }
if (!V94.SetPoint || !V96.SetPoint)
{
ShowChoosenDialog("Final valve not full open, please perform ATM Idle");
return;
}
} }
if (strPMOP.Contains("TMA")) if (strPMOP.Contains("TMA"))