From 12e606635c42ea20f4b7c2bdda5204237a4b4c96 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 02 三月 2026 16:14:49 +0800
Subject: [PATCH] 优化
---
Plugin.TsExecution/SingleControl.xaml.cs | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/Plugin.TsExecution/SingleControl.xaml.cs b/Plugin.TsExecution/SingleControl.xaml.cs
index 293f3f6..e0bbebe 100644
--- a/Plugin.TsExecution/SingleControl.xaml.cs
+++ b/Plugin.TsExecution/SingleControl.xaml.cs
@@ -11,7 +11,6 @@
using System.Timers;
using System.Windows;
using System.Windows.Controls;
-using System.Windows.Media;
namespace Plugin.TsExecution
{
@@ -25,7 +24,6 @@
protected void Set([CallerMemberName] string name = null)
{
-
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
}
@@ -101,6 +99,13 @@
set { Set(ref barcode, value); }
}
+ private string model = string.Empty;
+ public string Model
+ {
+ get { return model; }
+ set { Set(ref model, value); }
+ }
+
private string elapseTime = "00:00:00";
public string ElapseTime
{
@@ -141,7 +146,7 @@
private System.Timers.Timer refreshTimer;
- private string currentStep = "绛夊緟鎵爜";
+ private string currentStep = "";
public string CurrentStep
{
get => currentStep;
@@ -214,8 +219,8 @@
public SingleControl(int Index, string CountIniPath, int probeWarn)
{
- this.CountIniPath = CountIniPath;
DataContext = this;
+ this.CountIniPath = CountIniPath;
this.index = Index;
ProbeWarn = probeWarn;
@@ -302,7 +307,7 @@
var now = DateTime.Now;
var span = now - StepStartTime;
StepStartTime = now;
- data.ConsumeTime = $"{span.Seconds}s";
+ data.ConsumeTime = $"{(span.TotalMilliseconds / 1000d).ToString("F2")}s";
Datasource.Add(data);
table.ScrollIntoView(data);
}));
@@ -543,14 +548,6 @@
//var modal = scannerVisualModal;
//Canvas.SetLeft(modal, (scannerPanel.ActualWidth - scannerVisualModal.ActualWidth) / 2);
//Canvas.SetTop(modal, (scannerPanel.ActualHeight - scannerVisualModal.ActualHeight) / 2);
- }
- }
-
- private void TextBlock_MouseDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
- {
- DependencyObject parent = VisualTreeHelper.GetParent((DependencyObject)sender);
- while (parent != null) {
- parent = VisualTreeHelper.GetParent(parent);
}
}
}
--
Gitblit v1.9.1