From 9218e2c6118ac7f2112c9d9228cb1cfe5e38c040 Mon Sep 17 00:00:00 2001 From: wenjy Date: Wed, 27 Nov 2024 15:04:34 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E7=95=8C=E9=9D=A2=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SlnMesnac.Business/base/BaseBusiness.cs | 6 +- SlnMesnac.WPF/MainWindow.xaml | 2 +- SlnMesnac.WPF/Page/IndexControl.xaml | 125 +++++++++++++---- SlnMesnac.WPF/Page/IndexControl.xaml.cs | 130 +++++++++++++++++- .../ViewModel/IndexControlViewModel.cs | 8 ++ .../ViewModel/MainWindowViewModel.cs | 23 ++++ SlnMesnac.WPF/appsettings.json | 72 +++++----- 7 files changed, 295 insertions(+), 71 deletions(-) diff --git a/SlnMesnac.Business/base/BaseBusiness.cs b/SlnMesnac.Business/base/BaseBusiness.cs index 4d8fe61..5b1c2a6 100644 --- a/SlnMesnac.Business/base/BaseBusiness.cs +++ b/SlnMesnac.Business/base/BaseBusiness.cs @@ -95,13 +95,13 @@ namespace SlnMesnac.Business.@base { cabinetInfos = _ibase_Cabinet_InfoServices.Query(x=>x.isChecked == 1 && x.isFlag == 1).ToList(); - if (equipAddr == 1) //左侧原点,正序巡检 + if (equipAddr > 20) //20 号柜子之后倒叙巡检 { - cabinetInfos.OrderBy(x => x.cabinetCode); + cabinetInfos.OrderByDescending(x => x.cabinetCode); } else //右侧原点,倒序巡检 { - cabinetInfos.OrderByDescending(x => x.cabinetCode); + cabinetInfos.OrderBy(x => x.cabinetCode); } } diff --git a/SlnMesnac.WPF/MainWindow.xaml b/SlnMesnac.WPF/MainWindow.xaml index 09a4ca1..89ebda8 100644 --- a/SlnMesnac.WPF/MainWindow.xaml +++ b/SlnMesnac.WPF/MainWindow.xaml @@ -35,7 +35,7 @@