yangw
/
lj_plc
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 界面美化

Browse Source
dep_nodyang
wangsr 1 year ago
parent f926545355
commit 3cda278e1d
3 changed files with 67 additions and 56 deletions
Show Stats Download Patch File Download Diff File

4
Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj
Unescape Escape View File

@ -366,9 +366,13 @@
<Compile Include="WayValve.Designer.cs">
<DependentUpon>WayValve.cs</DependentUpon>
</Compile>
<<<<<<< Updated upstream
<Compile Include="Chuiqizhi.cs">
<SubType>UserControl</SubType>
</Compile>
=======
<Compile Include="Chuiqizhi.cs" />
>>>>>>> Stashed changes
<Compile Include="Chuiqizhi.Designer.cs">
<DependentUpon>Chuiqizhi.cs</DependentUpon>
</Compile>

73
Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml
Unescape Escape View File

@ -1,6 +1,13 @@
<Object type="Mesnac.Gui.Common.FrmRunTemplate, Mesnac.Gui.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="FormDeviceDetail2" children="Controls">
<Object type="System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="Panel1" children="Controls">
<Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjSwith215" children="Controls">
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BU4BLT07_Alarm</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BU4BLT07_Set</Property>
<Property name="Location">561, 261</Property>
<Property name="Name">LjSwith215</Property>
<Property name="Size">14, 13</Property>
</Object>
<Object type="Mesnac.Controls.ChemicalWeighing.SwitchLight, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="SwitchLight65" children="Controls">
<Property name="StatusName" />
<Property name="Location">1790, 494</Property>
@ -154,113 +161,113 @@
<Property name="Size">14, 13</Property>
</Object>
<Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjSwith224" children="Controls">
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BUWeter2_Set</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BUWeter2_Alarm</Property>
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BUWeter2_Alarm</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BUWeter2_Set</Property>
<Property name="Location">939, 559</Property>
<Property name="Name">LjSwith224</Property>
<Property name="Size">14, 13</Property>
</Object>
<Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjSwith225" children="Controls">
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BUWeter3_Set</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BUWeter3_Alarm</Property>
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BUWeter3_Alarm</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BUWeter3_Set</Property>
<Property name="Location">1170, 559</Property>
<Property name="Name">LjSwith225</Property>
<Property name="Size">14, 13</Property>
</Object>
<Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjSwith226" children="Controls">
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BUWeter4_Set</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BUWeter4_Alarm</Property>
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BUWeter4_Alarm</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BUWeter4_Set</Property>
<Property name="Location">1246, 559</Property>
<Property name="Name">LjSwith226</Property>
<Property name="Size">14, 13</Property>
</Object>
<Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjSwith227" children="Controls">
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BUWeter5_Set</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BUWeter5_Alarm</Property>
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BUWeter5_Alarm</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BUWeter5_Set</Property>
<Property name="Location">1411, 559</Property>
<Property name="Name">LjSwith227</Property>
<Property name="Size">14, 13</Property>
</Object>
<Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjSwith228" children="Controls">
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BUWeter6_Set</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BUWeter6_Alarm</Property>
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BUWeter6_Alarm</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BUWeter6_Set</Property>
<Property name="Location">1485, 559</Property>
<Property name="Name">LjSwith228</Property>
<Property name="Size">14, 13</Property>
</Object>
<Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjSwith229" children="Controls">
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BUWeter7_Set</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BUWeter7_Alarm</Property>
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BUWeter7_Alarm</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BUWeter7_Set</Property>
<Property name="Location">1724, 559</Property>
<Property name="Name">LjSwith229</Property>
<Property name="Size">14, 13</Property>
</Object>
<Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjSwith230" children="Controls">
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BUWeter8_Set</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BUWeter8_Alarm</Property>
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BUWeter8_Alarm</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BUWeter8_Set</Property>
<Property name="Location">1801, 559</Property>
<Property name="Name">LjSwith230</Property>
<Property name="Size">14, 13</Property>
</Object>
<Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjSwith231" children="Controls">
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BU1GEB01_Set</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BU1GEB01_Alarm</Property>
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BU1GEB01_Alarm</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BU1GEB01_Set</Property>
<Property name="Location">838, 455</Property>
<Property name="Name">LjSwith231</Property>
<Property name="Size">14, 13</Property>
</Object>
<Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjSwith232" children="Controls">
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BU2GEB01_Set</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BU2GEB01_Alarm</Property>
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BU2GEB01_Alarm</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BU2GEB01_Set</Property>
<Property name="Location">967, 455</Property>
<Property name="Name">LjSwith232</Property>
<Property name="Size">14, 13</Property>
</Object>
<Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjSwith233" children="Controls">
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BU6GEB01_Set</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BU6GEB01_Alarm</Property>
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BU6GEB01_Alarm</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BU6GEB01_Set</Property>
<Property name="Location">1514, 455</Property>
<Property name="Name">LjSwith233</Property>
<Property name="Size">14, 13</Property>
</Object>
<Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjSwith234" children="Controls">
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BU7GEB01_Set</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BU7GEB01_Alarm</Property>
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BU7GEB01_Alarm</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BU7GEB01_Set</Property>
<Property name="Location">1703, 455</Property>
<Property name="Name">LjSwith234</Property>
<Property name="Size">14, 13</Property>
</Object>
<Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjSwith235" children="Controls">
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BU8GEB01_Set</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BU8GEB01_Alarm</Property>
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BU8GEB01_Alarm</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BU8GEB01_Set</Property>
<Property name="Location">1827, 455</Property>
<Property name="Name">LjSwith235</Property>
<Property name="Size">14, 13</Property>
</Object>
<Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjSwith236" children="Controls">
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BUWeter1_Set</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BUWeter1_Alarm</Property>
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BUWeter1_Alarm</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BUWeter1_Set</Property>
<Property name="Location">861, 559</Property>
<Property name="Name">LjSwith236</Property>
<Property name="Size">14, 13</Property>
</Object>
<Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjSwith237" children="Controls">
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BU5GEB01_Set</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BU5GEB01_Alarm</Property>
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BU5GEB01_Alarm</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BU5GEB01_Set</Property>
<Property name="Location">1393, 455</Property>
<Property name="Name">LjSwith237</Property>
<Property name="Size">14, 13</Property>
</Object>
<Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjSwith238" children="Controls">
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BU4GEB01_Set</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BU4GEB01_Alarm</Property>
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BU4GEB01_Alarm</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BU4GEB01_Set</Property>
<Property name="Location">1269, 455</Property>
<Property name="Name">LjSwith238</Property>
<Property name="Size">14, 13</Property>
</Object>
<Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjSwith239" children="Controls">
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BU3GEB01_Set</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BU3GEB01_Alarm</Property>
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BU3GEB01_Alarm</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BU3GEB01_Set</Property>
<Property name="Location">1148, 455</Property>
<Property name="Name">LjSwith239</Property>
<Property name="Size">14, 13</Property>
@ -8222,7 +8229,7 @@
<Object type="Mesnac.Controls.ChemicalWeighing.LjSwith, Mesnac.Controls.ChemicalWeighing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="LjSwith247" children="Controls">
<Property name="AlarmName">ParametersWithPc.DB2102-valveInitDB.BU4BLT07_Alarm</Property>
<Property name="SetName">ParametersWithPc.DB2102-valveInitDB.BU4BLT07_Set</Property>
<Property name="Location">560, 261</Property>
<Property name="Location">591, 416</Property>
<Property name="Name">LjSwith247</Property>
<Property name="Size">14, 13</Property>
</Object>

46
Main/MCEdit/Data/MCProject/nodeForm/FormLJRecipeData.xml
Unescape Escape View File

@ -86,7 +86,7 @@
<Property name="Dock">Fill</Property>
<Property name="Location">0, 0</Property>
<Property name="Name">MCDataGridView16</Property>
<Property name="Size">543, 74</Property>
<Property name="Size">541, 143</Property>
<Property name="TabIndex">13</Property>
</Object>
<Property name="Text">湿混机(#A)</Property>
@ -129,9 +129,9 @@
<Property name="Text">湿混机(#B)</Property>
<Property name="Name">TabPage8</Property>
</Object>
<Property name="Location">515, 345</Property>
<Property name="Location">539, 325</Property>
<Property name="Name">TabControl4</Property>
<Property name="Size">551, 100</Property>
<Property name="Size">549, 169</Property>
</Object>
<Object type="System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="TabControl3" children="Controls">
<Object type="System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="TabPage5" children="Controls">
@ -165,7 +165,7 @@
<Property name="Dock">Fill</Property>
<Property name="Location">0, 0</Property>
<Property name="Name">MCDataGridView13</Property>
<Property name="Size">380, 145</Property>
<Property name="Size">541, 140</Property>
<Property name="TabIndex">5</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCDataGridView, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDataGridView14" children="Controls">
@ -198,7 +198,7 @@
<Property name="Dock">Fill</Property>
<Property name="Location">0, 0</Property>
<Property name="Name">MCDataGridView14</Property>
<Property name="Size">380, 145</Property>
<Property name="Size">541, 140</Property>
<Property name="TabIndex">4</Property>
</Object>
<Property name="Text">糊化机(#A)</Property>
@ -241,9 +241,9 @@
<Property name="Text">糊化机(#B)</Property>
<Property name="Name">TabPage6</Property>
</Object>
<Property name="Location">511, 168</Property>
<Property name="Location">539, 153</Property>
<Property name="Name">TabControl3</Property>
<Property name="Size">388, 171</Property>
<Property name="Size">549, 166</Property>
</Object>
<Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox4" children="Controls">
<Object type="Mesnac.Controls.Default.MCDataGridView, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDataGridView2" children="Controls">
@ -276,14 +276,14 @@
<Property name="Dock">Fill</Property>
<Property name="Location">3, 17</Property>
<Property name="Name">MCDataGridView2</Property>
<Property name="Size">373, 107</Property>
<Property name="Size">524, 107</Property>
<Property name="TabIndex">3</Property>
</Object>
<Property name="TabStop">False</Property>
<Property name="Text">干混机称量配方</Property>
<Property name="Location">24, 38</Property>
<Property name="Location">6, 20</Property>
<Property name="Name">GroupBox4</Property>
<Property name="Size">379, 127</Property>
<Property name="Size">530, 127</Property>
<Property name="TabIndex">4</Property>
</Object>
<Object type="System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="GroupBox3" children="Controls">
@ -317,7 +317,7 @@
<Property name="Dock">Fill</Property>
<Property name="Location">3, 17</Property>
<Property name="Name">MCDataGridView8</Property>
<Property name="Size">373, 107</Property>
<Property name="Size">543, 107</Property>
<Property name="TabIndex">3</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCDataGridView, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDataGridView9" children="Controls">
@ -350,14 +350,14 @@
<Property name="Dock">Fill</Property>
<Property name="Location">3, 17</Property>
<Property name="Name">MCDataGridView9</Property>
<Property name="Size">373, 107</Property>
<Property name="Size">543, 107</Property>
<Property name="TabIndex">2</Property>
</Object>
<Property name="TabStop">False</Property>
<Property name="Text">干混机混合配方</Property>
<Property name="Location">508, 21</Property>
<Property name="Location">539, 20</Property>
<Property name="Name">GroupBox3</Property>
<Property name="Size">379, 127</Property>
<Property name="Size">549, 127</Property>
<Property name="TabIndex">1</Property>
</Object>
<Object type="System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" name="TabControl1" children="Controls">
@ -389,9 +389,9 @@
<Property name="MCEnabled">True</Property>
<Property name="AutoGenerateColumns">False</Property>
<Property name="MultiSelect">False</Property>
<Property name="Location">4, 117</Property>
<Property name="Location">4, 158</Property>
<Property name="Name">MCDataGridView5</Property>
<Property name="Size">373, 113</Property>
<Property name="Size">516, 155</Property>
<Property name="TabIndex">4</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCDataGridView, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDataGridView1" children="Controls">
@ -423,7 +423,7 @@
<Property name="MultiSelect">False</Property>
<Property name="Location">4, 3</Property>
<Property name="Name">MCDataGridView1</Property>
<Property name="Size">373, 113</Property>
<Property name="Size">516, 149</Property>
<Property name="TabIndex">3</Property>
</Object>
<Property name="Text">糊化机(#A)</Property>
@ -457,9 +457,9 @@
<Property name="MCEnabled">True</Property>
<Property name="AutoGenerateColumns">False</Property>
<Property name="MultiSelect">False</Property>
<Property name="Location">4, 119</Property>
<Property name="Location">4, 158</Property>
<Property name="Name">MCDataGridView6</Property>
<Property name="Size">373, 113</Property>
<Property name="Size">516, 155</Property>
<Property name="TabIndex">6</Property>
</Object>
<Object type="Mesnac.Controls.Default.MCDataGridView, Mesnac.Controls.Default, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="MCDataGridView7" children="Controls">
@ -489,17 +489,17 @@
<Property name="MCEnabled">True</Property>
<Property name="AutoGenerateColumns">False</Property>
<Property name="MultiSelect">False</Property>
<Property name="Location">4, 5</Property>
<Property name="Location">4, 3</Property>
<Property name="Name">MCDataGridView7</Property>
<Property name="Size">373, 113</Property>
<Property name="Size">516, 149</Property>
<Property name="TabIndex">5</Property>
</Object>
<Property name="Text">糊化机(#B)</Property>
<Property name="Name">TabPage2</Property>
</Object>
<Property name="Location">27, 168</Property>
<Property name="Location">6, 150</Property>
<Property name="Name">TabControl1</Property>
<Property name="Size">388, 262</Property>
<Property name="Size">531, 344</Property>
</Object>
<Property name="TabStop">False</Property>
<Property name="Text">明细</Property>

Write Preview
Loading…
Cancel
Save