Browse Source

界面修改

谢翼翔 1 year ago
parent
commit
a5c5a3bbfe

+ 2 - 2
skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ/Customer/Views/Dashboard/LaserAndDigitalPunchingEquipmentWidget.xaml.cs

@@ -53,7 +53,7 @@ namespace SCADA_DAQ.Customer.Views.Dashboard
 
             var laserRepairTime = "倒计时" + DeviceRepairTime("激光机").ToString() + "天";//激光机设备保养信息
             var siemensRepairTime = "倒计时" + DeviceRepairTime("西门子840D数冲").ToString() + "天";//西门子设备保养信息
-            var behwifRepairTime = "倒计时" + DeviceRepairTime("倍福数冲").ToString() + "天";//倍福数冲设备保养信息
+            var behwifRepairTime = "倒计时" + DeviceRepairTime("倍福数冲").ToString() + "天";//倍福数冲设备保养信息
 
             var laserArlamString = Convert.ToString(DevicMainTableTime("激光机")
                 + TimeSpan.FromSeconds(DeviceTimeValue("激光机", "维修时间")) + TimeSpan.FromSeconds(DeviceAlarmTime("激光机")));
@@ -334,7 +334,7 @@ namespace SCADA_DAQ.Customer.Views.Dashboard
 
                     var laserRepairTime = "倒计时" + DeviceRepairTime("激光机").ToString() + "天";//激光机设备保养信息
                     var siemensRepairTime = "倒计时" + DeviceRepairTime("西门子840D数冲").ToString() + "天";//西门子设备保养信息
-                    var behwifRepairTime = "倒计时" + DeviceRepairTime("倍福数冲").ToString() + "天";//倍福数冲设备保养信息
+                    var behwifRepairTime = "倒计时" + DeviceRepairTime("倍福数冲").ToString() + "天";//倍福数冲设备保养信息
 
                     var laserArlamString = Convert.ToString(DevicMainTableTime("激光机")
                         + TimeSpan.FromSeconds(DeviceTimeValue("激光机", "维修时间")) + TimeSpan.FromSeconds(DeviceAlarmTime("激光机")));

+ 1 - 1
skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ/Customer/Views/Uct/UctDeviceInformationControlsSencd.xaml

@@ -9,7 +9,7 @@
               d:DesignHeight="450" d:DesignWidth="800">
   
     <Grid >
-        <dashboard:DashboardCard Margin="8.8"/>
+        <dashboard:DashboardCard Margin="2"/>
         <Grid>
              <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>