sc
/
DyeingComputer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

master
sc 1 year ago
parent
09063c81de 6750c4404c
commit
975d1ba4d2
10 changed files with 10 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      View/CurveDiagramView.xaml
  2. 2
      View/EngineerSetView.xaml
  3. 2
      View/EquipmentSimulationView.xaml
  4. 2
      View/HistoryRecordsView.xaml
  5. 2
      View/InOutView.xaml
  6. 2
      View/ParameterSetView.xaml
  7. 2
      View/ProgramgroupView.xaml
  8. 2
      View/SysSetView.xaml
  9. 2
      View/TechnologicalProcessView.xaml
  10. 5
      ViewModel/WorkOrderViewModel.cs

2
View/CurveDiagramView.xaml
View File

@ -5,7 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:DyeingComputer.View" xmlns:local="clr-namespace:DyeingComputer.View"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
<Grid> <Grid>
</Grid> </Grid>

2
View/EngineerSetView.xaml
View File

@ -5,7 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:DyeingComputer.View" xmlns:local="clr-namespace:DyeingComputer.View"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
<Grid> <Grid>
</Grid> </Grid>

2
View/EquipmentSimulationView.xaml
View File

@ -5,7 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:DyeingComputer.View" xmlns:local="clr-namespace:DyeingComputer.View"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
<Grid> <Grid>
</Grid> </Grid>

2
View/HistoryRecordsView.xaml
View File

@ -5,7 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:DyeingComputer.View" xmlns:local="clr-namespace:DyeingComputer.View"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
<Grid> <Grid>
</Grid> </Grid>

2
View/InOutView.xaml
View File

@ -5,7 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:DyeingComputer.View" xmlns:local="clr-namespace:DyeingComputer.View"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
<Grid> <Grid>
</Grid> </Grid>

2
View/ParameterSetView.xaml
View File

@ -5,7 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:DyeingComputer.View" xmlns:local="clr-namespace:DyeingComputer.View"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
<Grid> <Grid>
</Grid> </Grid>

2
View/ProgramgroupView.xaml
View File

@ -5,7 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:DyeingComputer.View" xmlns:local="clr-namespace:DyeingComputer.View"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
<Grid> <Grid>
</Grid> </Grid>

2
View/SysSetView.xaml
View File

@ -5,7 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:DyeingComputer.View" xmlns:local="clr-namespace:DyeingComputer.View"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
<Grid> <Grid>
</Grid> </Grid>

2
View/TechnologicalProcessView.xaml
View File

@ -5,7 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:DyeingComputer.View" xmlns:local="clr-namespace:DyeingComputer.View"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
<Grid> <Grid>
</Grid> </Grid>

5
ViewModel/WorkOrderViewModel.cs
View File

@ -12,15 +12,12 @@ namespace DyeingComputer.ViewModel
{ {
public class WorkOrderViewModel : ViewModelBase public class WorkOrderViewModel : ViewModelBase
{ {
public WorkOrderViewModel() public WorkOrderViewModel()
{ {
} }
} }
} }

Write Preview
Loading…
Cancel
Save